 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 |
|
guoyue
|
adcb0cdbf0
|
西海岸: 获取摄像头列表的api更改为配置文件形式
|
2022-10-12 16:11:12 +08:00 |
|
gongjiale
|
fe17edeb39
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-12 16:01:47 +08:00 |
|
gongjiale
|
e0ca9166e4
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-12 16:01:10 +08:00 |
|
guoyue
|
5f8659f7f4
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-12 16:00:45 +08:00 |
|
gongjiale
|
6d3d16bbdf
|
修改
|
2022-10-12 16:00:41 +08:00 |
|
guoyue
|
f198ad5f5a
|
西海岸: 获取摄像头列表的api更改为配置文件形式
|
2022-10-12 16:00:41 +08:00 |
|
wuhongjian
|
672981d051
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-12 13:40:18 +08:00 |
|
guoyue
|
ae252efcc0
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-12 11:53:43 +08:00 |
|
guoyue
|
61592ceaea
|
删除冗余代码
|
2022-10-12 11:52:50 +08:00 |
|
guoyue
|
edf1cb5af9
|
西海岸：修复首页--能力汇聚显示错乱bug
|
2022-10-12 11:52:32 +08:00 |
|
guoyue
|
140ff7f92c
|
西海岸--基础设施-摄像头获取：增加loading
|
2022-10-12 11:51:22 +08:00 |
|
a0049873
|
66df6d8c76
|
没有后台权限账号 屏蔽跳转功能
|
2022-10-12 10:04:11 +08:00 |
|
wuhongjian
|
70bb06cba6
|
更改token问题
|
2022-10-12 09:50:17 +08:00 |
|
guoyue
|
240784a3b2
|
消息跳转：区分市局和西海岸
|
2022-10-11 17:03:15 +08:00 |
|
guoyue
|
177cc4e9c7
|
修复消息跳转tab显示不对问题
|
2022-10-11 16:40:22 +08:00 |
|
guoyue
|
1382f22cb5
|
西海岸-修复能力汇聚显示错误bug
|
2022-10-11 16:27:26 +08:00 |
|
guoyue
|
e4ad24ba8c
|
西海岸：修复视频预览提示错误问题
|
2022-10-11 15:07:55 +08:00 |
|
guoyue
|
ba597c1da4
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-10 17:10:57 +08:00 |
|
guoyue
|
b5ad10130f
|
更改基础设施--左侧树选中状态以及取消选中（没区分西海岸和市局）
|
2022-10-10 17:10:43 +08:00 |
|
a0049873
|
8f6ef3d8f9
|
token改成12小时失效
|
2022-10-10 16:57:36 +08:00 |
|
a0049873
|
be971b7112
|
修改token失效问题
|
2022-10-10 16:52:38 +08:00 |
|
guoyue
|
05c93f9dd9
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-10 15:45:50 +08:00 |
|
guoyue
|
37347b3de2
|
市局：增加消息通知会议室跳转
|
2022-10-10 15:45:33 +08:00 |
|
a0049873
|
9c3a8495c0
|
申请按钮 只能点一次
|
2022-10-10 15:29:38 +08:00 |
|
a0049873
|
6203566058
|
提示优化
|
2022-10-10 14:53:30 +08:00 |
|
guoyue
|
8940dc4e24
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-10 13:54:31 +08:00 |
|
guoyue
|
9f111d3336
|
技术文档仅支持文件上传（不支持zip）
|
2022-10-10 13:54:03 +08:00 |
|
guoyue
|
c5ae492e70
|
融合服务：赋能场景图片大小更改
|
2022-10-10 13:53:35 +08:00 |
|
a0049873
|
c95d9ac76e
|
修改token失效 导致白屏问题， 目前设置的有效时长为2小时
|
2022-10-10 10:35:29 +08:00 |
|
unknown
|
0ba3526904
|
修改bug
|
2022-10-10 10:15:39 +08:00 |
|
unknown
|
4c4fe02f74
|
融合服务我的申请修改
|
2022-10-10 10:11:16 +08:00 |
|
gongjiale
|
a5a76110f0
|
使用手册下载
|
2022-10-10 09:53:44 +08:00 |
|
guoyue
|
5db6afcb6c
|
西海岸：特殊用户增加可查看所有权限
|
2022-10-09 16:42:57 +08:00 |
|
guoyue
|
a04241c9a5
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-09 15:46:43 +08:00 |
|
guoyue
|
4a104177bf
|
西海岸：个人中心只留申购车和我的申请功能
|
2022-10-09 15:46:38 +08:00 |
|
gongjiale
|
c9da08b40d
|
应用状态改为必填
|
2022-10-09 15:37:16 +08:00 |
|
guoyue
|
af1c03d3ed
|
西海岸相关功能 合并代码
|
2022-10-09 14:29:51 +08:00 |
|
guoyue
|
c4ae6d603a
|
西海岸购物车等功能
|
2022-10-09 13:52:28 +08:00 |
|
guoyue
|
e83ddfe47e
|
浏览器增加提示：文件抽取引入js,css
|
2022-10-09 10:07:24 +08:00 |
|
guoyue
|
d6c971ab23
|
西海岸顶部导航提示正在建设中
|
2022-10-08 19:20:18 +08:00 |
|
unknown
|
4a78bfa72e
|
添加浏览器版本提示
|
2022-10-08 19:09:33 +08:00 |
|
guoyue
|
b2c2958fdb
|
删除无用代码
|
2022-10-08 18:01:53 +08:00 |
|
guoyue
|
7d513edafc
|
配置环境
|
2022-10-08 16:00:37 +08:00 |
|
guoyue
|
c71784567c
|
西海岸-购物车收藏功能
|
2022-10-08 16:00:26 +08:00 |
|
guoyue
|
f727efbdcd
|
顶部导航除基础设施外，禁止切换且提示正在建设中
|
2022-10-08 14:58:01 +08:00 |
|
guoyue
|
7b4b410538
|
重定向解注
|
2022-10-08 14:20:51 +08:00 |
|
guoyue
|
667d53484e
|
浏览器强制用谷歌，提供exe下载包
|
2022-10-08 13:38:46 +08:00 |
|
guoyue
|
d13dbbb09a
|
谷歌浏览器64位和32位exe文件
|
2022-10-08 13:38:14 +08:00 |
|
guoyue
|
14aa35bd11
|
注释掉重定向
|
2022-10-08 11:52:47 +08:00 |
|
guoyue
|
0103444cb8
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-04 16:00:23 +08:00 |
|
guoyue
|
aec249624a
|
市局： 能力统计金字塔根据值排序
|
2022-10-04 16:00:11 +08:00 |
|
guoyue
|
608b6d10ff
|
fix：控制台报错
|
2022-10-04 15:59:35 +08:00 |
|
guoyue
|
1ae5dda1a7
|
市局： 消息处理 跳转到前台以及门户的各自审批页面
|
2022-10-04 15:59:22 +08:00 |
|
gongjiale
|
ca9244ed80
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-04 13:19:02 +08:00 |
|
gongjiale
|
e01788b7b0
|
部分问题修改
|
2022-10-04 13:14:15 +08:00 |
|
guoyue
|
251c3d33d6
|
市局：城市云脑会客厅--去掉电话必填
|
2022-10-03 17:23:12 +08:00 |
|
guoyue
|
58e045e862
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-03 16:26:28 +08:00 |
|
guoyue
|
c1c4eaf4d6
|
市局：能力统计--覆盖部门量改为资源汇聚部门量，
|
2022-10-03 16:26:16 +08:00 |
|
guoyue
|
ad34e10710
|
市局：能力申请--技术文档由富文本编辑改为上传
|
2022-10-03 16:23:30 +08:00 |
|
guoyue
|
1d5d4845c2
|
市局：能力统计，部门数漏斗图更改，覆盖部门量更改为资源汇聚部门量，与部门总数保持一直
|
2022-10-03 15:46:11 +08:00 |
|
guoyue
|
12d3cc221c
|
市局：申请页面---应用系统选项下方加提示：如选项没有系统请新增
|
2022-10-03 15:44:54 +08:00 |
|
guoyue
|
c23d0aeee7
|
市局：消息状态，未读点击提示已读，已读点击不提示，加粗未读消息字体
|
2022-10-03 15:43:43 +08:00 |
|
gongjiale
|
aa6022f599
|
修改部分usc问题
|
2022-10-02 16:42:34 +08:00 |
|
guoyue
|
d549a7f73d
|
能力云图：适配西海岸和市局
|
2022-10-02 11:08:42 +08:00 |
|
guoyue
|
c183ee883d
|
代码找回 (详情按钮，西海岸智能算法支持，融合服务详情，西海岸登录默认基础设施) 【2022-09-30：修改文件 】
|
2022-09-30 16:07:15 +08:00 |
|
851673013@qq.com
|
1bff4a6f85
|
代码修改
|
2022-09-30 11:07:15 +08:00 |
|
851673013@qq.com
|
cce81f9ece
|
bug申请能力应用系统选项下方加提示：如选项没有系统请新增
|
2022-09-30 10:51:03 +08:00 |
|
851673013@qq.com
|
a906b433f2
|
区市站点隐藏掉
|
2022-09-30 10:40:05 +08:00 |
|
851673013@qq.com
|
cba2a5c089
|
bug修改
|
2022-09-30 10:31:14 +08:00 |
|
851673013@qq.com
|
a3c6162592
|
修改文件
|
2022-09-30 10:27:57 +08:00 |