wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity
1,663 Commits 7 Branches 12 Tags 640 MiB
Commit Graph

1280 Commits

Author SHA1 Message Date
a0049873 fbcd40f2a6 BUG修改 2022-10-27 18:05:28 +08:00
wuhongjian 9a2c2c07d1 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-27 15:48:26 +08:00
wuhongjian 09d56091fa 测试问题修复 2022-10-27 15:48:24 +08:00
guoyue c1da555ceb 西海岸：摄像头提示文字预览视频更改为观看视频 2022-10-27 15:04:49 +08:00
guoyue 3e310fb7ea 合并 2022-10-27 14:40:35 +08:00
guoyue e29e0f0526 算法广场和能力广场容错处理pic为空 2022-10-27 13:50:29 +08:00
guoyue 3e1b6b8a22 修复 需求中心：需求申请时，应用领域无法进行选择 2022-10-27 13:47:19 +08:00
a0049873 f36e2bbffc BUG修改 2022-10-27 11:44:25 +08:00
a0049873 4930027d67 能力上架 新增转办功能 2022-10-27 10:50:09 +08:00
guoyue 46ad5e747d 算法广场和gis广场 传参参数更改 2022-10-26 20:28:58 +08:00
guoyue 5132d3ec60 算法广场兼容 2022-10-26 20:10:06 +08:00
guoyue b61722857d Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-26 19:40:10 +08:00
guoyue 355ee77e79 fix：算法广场和GIS广场图片bug 2022-10-26 17:10:15 +08:00
guoyue fef67d9cc4 门户：新手指引：能力下架，跳转页面不对，应该跳转到我的申请-上架能力页面 2022-10-26 16:25:44 +08:00
a0049873 1e3b315d35 BUg修改 2022-10-26 15:04:55 +08:00
guoyue 82718e3d02 合并 2022-10-26 15:03:29 +08:00
guoyue d28628f35a fix：消息跳转获取列表bug 2022-10-26 15:01:54 +08:00
a0049873 3ef7da2d6c 金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页 2022-10-26 14:49:00 +08:00
a0049873 94a940a1ab 金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页 2022-10-26 14:48:37 +08:00
a0049873 330f8de5e4 全局搜索 搜索逻辑修改 2022-10-26 10:39:32 +08:00
a0049873 d8a08c6470 基础设施 去表格 2022-10-26 09:56:05 +08:00
wuhongjian 00e4e9671b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-26 09:38:13 +08:00
wuhongjian c634d85688 去掉视频资源列表 2022-10-26 09:38:11 +08:00
a0049873 1f727a6cbd 修改会议室默认图片 2022-10-26 09:37:47 +08:00
a0049873 b600caa357 添加admin权限 2022-10-26 09:19:01 +08:00
guoyue 5fea910701 合并 2022-10-25 18:00:40 +08:00
guoyue 05899ab616 能力分类进入能力集市，应用领域有选中时，展开 2022-10-25 17:53:17 +08:00
guoyue b561eff3ea 查看详情按钮样式更改 2022-10-25 17:52:39 +08:00
guoyue 24dc1d09cd 更改气泡提示框按钮样式居中显示（全局更改） 2022-10-25 17:52:04 +08:00
guoyue 7ff2d13afe 算法广场，GIS广场接口里联调 2022-10-25 17:51:39 +08:00
a0049873 983b2c0534 更改头部样式 2022-10-25 15:11:47 +08:00
wuhongjian 8f33c9f375 bug修复 2022-10-25 11:30:05 +08:00
a0049873 5cbeba19b8 会议室列表 2022-10-25 10:58:25 +08:00
a0049873 b30a72555f 判断用户后台权限 2022-10-25 09:48:40 +08:00
wuhongjian 11b42afde3 一键组会内容添加 2022-10-25 09:21:38 +08:00
guoyue 79ee811854 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-24 17:44:26 +08:00
guoyue 1a40a09286 算法广场和GIS广场增加区域筛选，api待联调 2022-10-24 17:44:10 +08:00
a0049873 0726f4a927 添加角色控制 2022-10-24 15:20:58 +08:00
a0049873 8a31a4e285 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-24 14:54:14 +08:00
a0049873 314b68b3a3 静态数据 2022-10-24 14:54:03 +08:00
wuhongjian 84f1b03c42 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-24 14:26:25 +08:00
wuhongjian aaa16a1105 bug修复 2022-10-24 14:26:22 +08:00
a0049873 e1a805d4bd 客户端下载 2022-10-24 14:12:35 +08:00
a0049873 98a420f0c3 接口文件 2022-10-24 13:50:23 +08:00
a0049873 52be0acd83 一键组会 2022-10-24 11:28:37 +08:00
wuhongjian a8aba6b4f1 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-24 09:51:40 +08:00
wuhongjian e0481ba5a5 配置更新 2022-10-24 09:51:37 +08:00
gongjiale 70a015cb01 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-22 15:29:52 +08:00
gongjiale 1427424073 pageWithAttrs 2022-10-22 15:29:21 +08:00
guoyue 6b1fc28b4b Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-22 14:29:55 +08:00
guoyue b226e777f7 西海岸：增加我的发布侧边栏 2022-10-22 14:29:18 +08:00
a0049873 30328e575d 视频会议 2022-10-22 11:08:52 +08:00
a0049873 a296f5a0d6 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-21 17:32:59 +08:00
a0049873 7e9108e7d6 BUG修改 2022-10-21 17:32:45 +08:00
guoyue 0461d44c85 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-21 17:00:22 +08:00
guoyue f4a53c91b1 修复首页点击能力集市，搜索，基础设施进入能力集市，页面不显示bug 2022-10-21 17:00:09 +08:00
wuhongjian 67574732c7 bug修复 2022-10-21 16:45:53 +08:00
unknown 44da94a71e 所属部门自动搜索 2022-10-21 16:35:26 +08:00
guoyue b5f9531943 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-21 11:47:38 +08:00
guoyue 549dda54b3 消息通知：跳转逻辑更改 2022-10-21 11:47:28 +08:00
a0049873 672e6164ba 平均分改评分 2022-10-21 10:09:59 +08:00
wuhongjian 1a96e4e6a2 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-20 16:16:44 +08:00
wuhongjian 1f3116f402 开启gzip 2022-10-20 16:15:59 +08:00
guoyue ba5526d7d8 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-20 16:08:12 +08:00
guoyue 33ba30d97f 西海岸：云图视频资源数量 ，前端去掉+4 2022-10-20 16:07:56 +08:00
gongjiale 56c4393f2e Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-20 11:24:31 +08:00
gongjiale f541f61409 添加一网通览 2022-10-20 11:24:17 +08:00
a0049873 6b1c3f30a4 排行榜功能开发 2022-10-20 10:09:41 +08:00
unknown a12d0aa6ff 西海岸视频选中bug修改 2022-10-19 17:32:01 +08:00
unknown 02d70b4b8d 西海岸视频地图图标点击切换方式修改 2022-10-19 17:10:48 +08:00
guoyue 4e271b6aa7 合并冲突 2022-10-19 13:55:49 +08:00
unknown 1a23d64064 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-19 11:50:11 +08:00
unknown 04471a122e ie浏览器提示信息 2022-10-19 11:48:31 +08:00
gongjiale b24e925c5a 西海岸问题修改 2022-10-19 11:46:29 +08:00
gongjiale 7a0d2ba101 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-19 10:45:54 +08:00
gongjiale 55398620f0 首页跳转问题修改 2022-10-19 10:45:15 +08:00
guoyue 2af92a6f8f 西海岸-基础设施：在线视频预览，弹出视频窗口，改成鼠标放上后给出tips“请申请后再预览”，弹框标题增加提示信息 2022-10-19 10:20:09 +08:00
guoyue 3f22be0d8d Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-18 15:52:16 +08:00
guoyue cdb47c705b 西海岸：基础设施--获取摄像头增加远雄url 2022-10-18 15:52:07 +08:00
guoyue 2ee2d988cc 西海岸：基础设施左侧树，只有一个父级菜单的时候，默认展开第一级 2022-10-18 15:51:23 +08:00
wuhongjian 811e80a27c bug修复 2022-10-18 15:14:50 +08:00
guoyue a7ac2e8a1e Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-18 14:12:26 +08:00
guoyue 42af2e980b 西海岸：基础设施-视频离线-预览按钮禁用 2022-10-18 14:11:52 +08:00
guoyue dd100d3867 西海岸-基础设施：点击消息通知列表中的数据，跳转到流程详情页面 2022-10-18 14:11:20 +08:00
unknown 05964a73e8 西海岸摄像头已申请列表添加新字段 2022-10-18 13:52:44 +08:00
a0049873 c5fc29a498 能力统计-部门数：金字塔设计修改 2022-10-18 11:12:01 +08:00
guoyue 5f3aad2539 西海岸：点击图标进入首页增加权限判断 2022-10-18 10:45:40 +08:00
guoyue 2ebec87514 西海岸：开发公安局申请 附件上传为必填 2022-10-17 17:21:18 +08:00
a0049873 21431958f0 宽度 2022-10-17 14:49:21 +08:00
guoyue 587c728a74 我的申请--申请详情 样式调整 2022-10-17 14:16:32 +08:00
guoyue ea2afd08c9 合并冲突 2022-10-17 14:16:00 +08:00
guoyue e0bde554b9 西海岸：流程已终止更改判断条件 2022-10-17 14:01:05 +08:00
guoyue 98d1b070ab 西海岸：我的申请-设备申请单兵无人机详情增加名称显示 2022-10-17 14:00:44 +08:00
guoyue 5ac06ce8d6 西海岸：申购车删除批量删除id参数更改 2022-10-17 14:00:16 +08:00
a0049873 4d65cc11e9 能力申请 1条消息时隐藏 展开按钮，审批详情 添加处理部门 2022-10-17 10:19:27 +08:00
a0049873 2c1070d4e2 访客模式 2022-10-17 09:43:35 +08:00
guoyue 29ace46c69 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-14 17:36:59 +08:00
guoyue fe85cd370f 西海岸-基础设施：无人机、单兵申请成功后，页面应该返回无人机页面 2022-10-14 17:36:46 +08:00
guoyue 0d402302f7 西海岸-基础设施：无人机、单兵申请成功后，页面应该返回无人机页面 2022-10-14 17:34:35 +08:00
guoyue 34ac0b016b 西海岸：我的申请-能力申请列表增加过期时间的显示 2022-10-14 17:08:54 +08:00
guoyue 4354abdf25 西海岸-视频资源申请-列表中包含西海岸开发分局添加申请附件个模板下载 2022-10-14 15:40:14 +08:00
guoyue 9c8785b8ce 西海岸-我的申请：查看详情界面，流程终止后，提示该流程终止 2022-10-14 14:20:45 +08:00
guoyue e34f47680b 西海岸：单兵和无人机设备申请，申请成功，前端提示文字 2022-10-14 14:20:23 +08:00
guoyue a71fc5326e 西海岸：我的申请--详情更改任务时长取值显示 2022-10-14 11:40:22 +08:00
guoyue 9bba3077ca 西海岸：我的申请--详情去掉期望效果字段 2022-10-14 11:39:41 +08:00
guoyue 4580df0182 西海岸：修复我的申请-能力上架名称不显示问题 2022-10-14 11:39:06 +08:00
unknown ae046a6f82 地图聚合字体样式 2022-10-14 10:34:17 +08:00
gongjiale 3d69aa5922 会客厅 2022-10-13 23:17:58 +08:00
gongjiale 259f82362a Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 21:51:48 +08:00
gongjiale 9df921cbe3 修改 2022-10-13 21:50:58 +08:00
wuhongjian 7210d77314 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 21:41:01 +08:00
wuhongjian 79cdaa1146 bug修复 2022-10-13 21:40:56 +08:00
gongjiale d06bf23062 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 21:37:53 +08:00
gongjiale aecfba1391 修改能力统计 2022-10-13 21:37:36 +08:00
a0049873 1a530271c5 修改位置 2022-10-13 21:34:06 +08:00
a0049873 32d7f38e80 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 21:28:38 +08:00
a0049873 c583569868 修改图例 2022-10-13 21:28:20 +08:00
gongjiale b51e66f54e 云资源隐藏 2022-10-13 21:26:05 +08:00
a0049873 23eff2d365 修改位置 2022-10-13 20:45:13 +08:00
a0049873 aeed2b27e3 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 20:41:06 +08:00
a0049873 678b60374e 修改展示样式 2022-10-13 20:40:29 +08:00
gongjiale eb563cd3dd Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 19:15:38 +08:00
gongjiale 23210070cd 添加数据资源 2022-10-13 19:15:20 +08:00
wuhongjian b79797b09a bug修复 2022-10-13 19:11:45 +08:00
wuhongjian 2c4752c97b bug修复 2022-10-13 18:13:19 +08:00
wuhongjian 0c83991e6c bug修复 2022-10-13 18:08:14 +08:00
gongjiale a900c4c332 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 18:02:02 +08:00
gongjiale a6ab3b9194 修改 2022-10-13 18:01:41 +08:00
a0049873 2a05650b26 修改部门数顺序 2022-10-13 17:24:20 +08:00
a0049873 cfe88605cc Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/home/infrastructurePage.vue
 2022-10-13 17:09:20 +08:00
a0049873 78aabf704b 修改基础设施BUG 以及 能力统计金字塔图 2022-10-13 17:07:51 +08:00
wuhongjian 5568f82e52 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 16:31:46 +08:00
wuhongjian 7abf71a6fb bug修复 2022-10-13 16:31:42 +08:00
unknown f4f5292540 西海岸bug修改 2022-10-13 16:19:03 +08:00
unknown 07a924cce4 修改 2022-10-13 15:51:59 +08:00
unknown 10fe94fbfa 后台返回数据字段修改 2022-10-13 15:47:25 +08:00
wuhongjian 4d003421fe Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 15:46:01 +08:00
wuhongjian 7877cd2474 bug修复 2022-10-13 15:45:21 +08:00
unknown 09cc87a095 修改文字描述 2022-10-13 15:39:16 +08:00
unknown feed3a454c 使用能力数据条数 2022-10-13 15:32:44 +08:00
wuhongjian 54aa64de64 客户需求更新 2022-10-13 14:47:53 +08:00
wuhongjian e5fdaa744a 客户意见修改 2022-10-13 11:31:39 +08:00
unknown bff7f51467 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 10:47:48 +08:00
unknown a0e38bd312 资源图谱隐藏 2022-10-13 10:43:55 +08:00
wuhongjian ce50c9221e bug修复 2022-10-13 10:29:20 +08:00
wuhongjian 720b26a902 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 17:56:45 +08:00
wuhongjian 8f1658f2eb 客户需求 2022-10-12 17:56:41 +08:00
guoyue 56696c6266 西海岸：基础设施添加到申购车，api更改 2022-10-12 17:41:21 +08:00
guoyue 85fa71f4b9 西海岸：申购车批量删除参数更改 2022-10-12 17:10:19 +08:00
guoyue f2a6e2ffc9 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 16:11:31 +08:00