Commit Graph

590 Commits

Author SHA1 Message Date
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 52be0acd83 一键组会 2022-10-24 11:28: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
a0049873 30328e575d 视频会议 2022-10-22 11:08:52 +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
unknown 44da94a71e 所属部门自动搜索 2022-10-21 16:35:26 +08:00
gongjiale f541f61409 添加一网通览 2022-10-20 11:24:17 +08:00
unknown 02d70b4b8d 西海岸视频地图图标点击切换方式修改 2022-10-19 17:10:48 +08:00
guoyue 4e271b6aa7 合并冲突 2022-10-19 13:55:49 +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 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
unknown 05964a73e8 西海岸摄像头已申请列表添加新字段 2022-10-18 13:52:44 +08:00
guoyue 5f3aad2539 西海岸:点击图标进入首页增加权限判断 2022-10-18 10:45:40 +08:00
guoyue 2ebec87514 西海岸:开发公安局申请 附件上传为必填 2022-10-17 17:21:18 +08:00
a0049873 4d65cc11e9 能力申请 1条消息时隐藏 展开按钮,审批详情 添加处理部门 2022-10-17 10:19:27 +08:00
guoyue fe85cd370f 西海岸-基础设施:无人机、单兵申请成功后,页面应该返回无人机页面 2022-10-14 17:36:46 +08:00
guoyue 0d402302f7 西海岸-基础设施:无人机、单兵申请成功后,页面应该返回无人机页面 2022-10-14 17:34:35 +08:00
guoyue 4354abdf25 西海岸-视频资源申请-列表中包含西海岸开发分局添加申请附件个模板下载 2022-10-14 15:40:14 +08:00
guoyue e34f47680b 西海岸:单兵和无人机设备申请,申请成功,前端提示文字 2022-10-14 14:20:23 +08:00
wuhongjian 79cdaa1146 bug修复 2022-10-13 21:40:56 +08:00
gongjiale 23210070cd 添加数据资源 2022-10-13 19:15:20 +08:00
wuhongjian 2c4752c97b bug修复 2022-10-13 18:13:19 +08:00
wuhongjian 0c83991e6c bug修复 2022-10-13 18:08:14 +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 e5fdaa744a 客户意见修改 2022-10-13 11:31:39 +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 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 140ff7f92c 西海岸--基础设施-摄像头获取:增加loading 2022-10-12 11:51:22 +08:00
a0049873 66df6d8c76 没有后台权限账号 屏蔽跳转功能 2022-10-12 10:04:11 +08:00
guoyue e4ad24ba8c 西海岸:修复视频预览提示错误问题 2022-10-11 15:07:55 +08:00
guoyue b5ad10130f 更改基础设施--左侧树选中状态以及取消选中(没区分西海岸和市局) 2022-10-10 17:10:43 +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
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 c5ae492e70 融合服务:赋能场景图片大小更改 2022-10-10 13:53:35 +08:00
unknown 0ba3526904 修改bug 2022-10-10 10:15:39 +08:00
unknown 4c4fe02f74 融合服务我的申请修改 2022-10-10 10:11:16 +08:00
guoyue 5db6afcb6c 西海岸:特殊用户增加可查看所有权限 2022-10-09 16:42:57 +08:00
guoyue af1c03d3ed 西海岸相关功能 合并代码 2022-10-09 14:29:51 +08:00
guoyue c4ae6d603a 西海岸购物车等功能 2022-10-09 13:52:28 +08:00
guoyue d6c971ab23 西海岸顶部导航提示正在建设中 2022-10-08 19:20:18 +08:00
guoyue c71784567c 西海岸-购物车收藏功能 2022-10-08 16:00:26 +08:00
guoyue f727efbdcd 顶部导航除基础设施外,禁止切换且提示正在建设中 2022-10-08 14:58:01 +08:00
guoyue 608b6d10ff fix:控制台报错 2022-10-04 15:59:35 +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 12d3cc221c 市局:申请页面---应用系统选项下方加提示:如选项没有系统请新增 2022-10-03 15:44:54 +08:00
gongjiale aa6022f599 修改部分usc问题 2022-10-02 16:42:34 +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 cba2a5c089 bug修改 2022-09-30 10:31:14 +08:00
851673013@qq.com a3c6162592 修改文件 2022-09-30 10:27:57 +08:00
guoyue 166e5e119e 西海岸:能力集市点击非基础设施提示正在建设中 2022-09-29 18:35:14 +08:00
于秀圆 3dcb9b8778 接口传参方式修改 2022-09-29 18:27:32 +08:00
于秀圆 bcbafaf9f0 不规则框选 2022-09-29 18:19:24 +08:00
guoyue 98f0c360d4 西海岸:基础设施--一键申请增加数量限制 2022-09-29 17:26:08 +08:00
guoyue bafe53bc67 西海岸:能力集市--默认选中基础设施 2022-09-29 17:21:54 +08:00
guoyue 48bfe71c6f 西海岸:基础设施--一键申请增加最大数量限制 2022-09-29 17:21:02 +08:00
guoyue a7d7431c75 fix:基础设施-申请报错 2022-09-29 09:24:02 +08:00
guoyue a7da8b013e Merge branches 'hi-ucs-dev' and 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-28 17:33:59 +08:00
guoyue f86d40feda 西海岸:基础设施-视频预览,增加在线离线状态显示,点击预览,提示离线 2022-09-28 17:31:57 +08:00
于秀圆 a4259cf2d9 视频资源表格和地图选中联动 2022-09-28 16:42:35 +08:00
guoyue f79b43d261 西海岸:基础设施--默认选中视频资源 2022-09-28 14:05:12 +08:00
guoyue 787ceeef3f 西海岸:基础设施--批量申请--增加参数 2022-09-27 18:04:07 +08:00
guoyue fc8f43b94c Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 14:07:25 +08:00
guoyue cf7d85060c 西海岸:基础设施-申请增加过期时间 2022-09-27 11:53:10 +08:00
a0049873 18f911bd16 基础设施修改 2022-09-27 10:37:08 +08:00
guoyue 0b401f5741 我的申请增加水印 2022-09-27 09:49:30 +08:00
guoyue 2f752de364 西海岸:基础设施--视频预览增加水印 2022-09-27 09:28:03 +08:00
guoyue 479c2791f3 合并 2022-09-26 17:25:30 +08:00
guoyue 653559e727 格式化代码 2022-09-26 16:55:51 +08:00
guoyue 5c6d90d912 西海岸:我的申请中-视频预览 增加离线提示 2022-09-26 16:40:54 +08:00
guoyue 076d84bd0a 西海岸:视频播放 离线(status不是1)提示当前视频离线 2022-09-26 16:29:32 +08:00
guoyue eab0eb374a 西海岸:去掉拼接的status=1 2022-09-26 16:28:50 +08:00
a0049873 432ba890f6 基础设施初始化BUG修改 2022-09-26 11:32:14 +08:00
unknown 186184c14f new button 2022-09-26 09:41:43 +08:00
guoyue 4dc1525520 fix:基础设施-地图搜索 改回最初 2022-09-23 11:15:14 +08:00
guoyue 10fdc587a2 西海岸:单兵无人机 申请按钮,更改为未申请状态才可申请 2022-09-22 16:04:24 +08:00
guoyue fe3eb0aa68 西海岸--基础设施:去掉视频标签 2022-09-22 15:08:02 +08:00
guoyue 4296677fcd 西海岸:批量预览视频增加提示,去申请才能查看 2022-09-22 13:30:53 +08:00
guoyue 2d32d735a5 西海岸:获取摄像头,拼接status=1 2022-09-22 13:29:47 +08:00
guoyue c55eedc5b4 单兵和无人机:列表增加详情 2022-09-21 23:31:56 +08:00
guoyue a5df439fd0 pk 算法对比,修复弹框没有确定按钮bug 2022-09-21 22:31:56 +08:00
guoyue cce7cb3be9 去掉城市云脑会客厅 2022-09-21 22:27:49 +08:00
guoyue 14978ef490 算法对比,弹框增加确定取消按钮 2022-09-21 21:12:29 +08:00
guoyue 44525afeb8 无人机申请,去掉用户id 2022-09-21 21:12:00 +08:00
guoyue f1de06b5ad 无人机申请增加用户id 2022-09-21 19:59:02 +08:00
guoyue bcef134cf9 无人机申请,增加参数 2022-09-21 17:23:51 +08:00
guoyue 7ea1bc972b 无人机、单兵申请更改参数名 2022-09-21 16:18:02 +08:00
guoyue b17f4a3056 无人机单兵设备申请,参数更改 2022-09-21 15:55:43 +08:00
guoyue 11f4c3fe25 西海岸--单兵设备和无人机:列表/申请接口联调 2022-09-21 15:43:55 +08:00
guoyue b3b35d21b3 删除多余console 2022-09-20 19:28:24 +08:00
guoyue 21adcb62c8 fix:一键申请--融合服务特殊处理 2022-09-20 19:28:13 +08:00
guoyue 5387d6a7a3 西海岸:获取摄像头拼接status为1 2022-09-20 19:08:21 +08:00
guoyue 3e6f875728 西海岸-视频预览--禁止点击播放,给出提示 2022-09-20 16:37:59 +08:00
guoyue 856cf3e41f 西海岸-智能算法:容错处理 2022-09-20 15:15:17 +08:00
guoyue 7f884528e9 西海岸-支持组件服务-算法分类 2022-09-20 13:31:56 +08:00
guoyue 07fff52e43 去掉基础设施--云资源 2022-09-20 10:32:03 +08:00
guoyue c35398209b 视频播放-关闭自动播放功能 2022-09-20 10:24:12 +08:00
guoyue bff2aa9f97 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-19 19:24:02 +08:00
guoyue 1455e2e0d7 一键申请:融合服务特殊处理 2022-09-19 19:23:41 +08:00
guoyue 253b9f511a 能力集市-组件服务:智能算法支持类型选择 2022-09-19 19:18:49 +08:00
lizhicheng2 f3973fe28d bug fix:单点登录登出问题 2022-09-19 13:04:27 +08:00
guoyue de605dd446 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-16 16:45:53 +08:00
guoyue 1b26210e01 去掉能力集市-浏览量排序 2022-09-16 16:44:26 +08:00
851673013@qq.com f2e68d0105 能力申请单位 2022-09-16 15:15:03 +08:00
guoyue fb0a5e1f38 退出登录,移除本地查询条件 2022-09-13 18:04:12 +08:00
guoyue 31a809f9d9 赋能场景存储查询条件 2022-09-13 18:03:55 +08:00
guoyue 1cba78f8e1 融合服务,能力集市详情返回 2022-09-13 09:38:26 +08:00
guoyue 9df17910ee fix基础设施控制台报错 2022-09-08 14:22:07 +08:00
guoyue 715792aa7d 应用资源和组件服务调换位置 2022-09-08 14:21:42 +08:00
guoyue 510e72f35e 能力集市列表 隐藏浏览量 2022-09-08 13:15:51 +08:00
guoyue 43aec16d92 融合服务支持收藏量 2022-09-08 13:12:40 +08:00
zhangzhuliang 205cb756be 会议室审核加下载附件按钮和输入框报错 2022-09-02 11:06:11 +08:00
zhangzhuliang c1643e3cb0 会议室bug提交 2022-08-31 18:26:06 +08:00
gaoyuanwei cd067cfcc1 赋能场景-典型赋能场景;图片 2022-08-26 10:49:29 +08:00
wuhongjian 64ef4c95a1 bug修复 2022-08-26 09:27:34 +08:00
gaoyuanwei d7d2c56ec7 赋能场景 2022-08-25 20:47:41 +08:00
a0049873 748b3b72ea 隐藏按钮 2022-08-25 20:24:17 +08:00
a0049873 faa639200e 赋能场景 2022-08-25 20:22:33 +08:00
a0049873 9b448c0fcc 赋能场景修改 2022-08-25 19:56:48 +08:00
wuhongjian 916ea5ecd2 bug修复 2022-08-25 19:06:53 +08:00
gaoyuanwei 89d782fa9b 只留已申请标签 2022-08-24 17:42:31 +08:00
wuhongjian 894db08c4e 市局基础设施只要图片预览 2022-08-24 13:53:45 +08:00
wuhongjian d1a50bc25a 修复变形问题 2022-08-24 09:19:32 +08:00
gaoyuanwei 0c4015cb5c 亿点点修改 2022-08-23 17:47:24 +08:00
a0049873 d1e6b9acd7 修改首页 选择数据类型样式 , 修改 全局搜索逻辑 2022-08-23 16:51:41 +08:00
a0049873 c824e53a50 消息中心位置 2022-08-22 11:50:51 +08:00
a0049873 73591c0ed2 CIM专区 图层 算法开发 2022-08-19 16:53:42 +08:00
a0049873 88e063fa04 CIM专区 初始化 2022-08-19 10:03:43 +08:00
gaoyuanwei 7014db07b3 前台进入后台图标修改 2022-08-18 11:01:27 +08:00
zhangzhuliang 9eaa4ca9bb bug提交 2022-08-17 17:33:57 +08:00
a0049873 3f235f3d81 修改能力申请文案 2022-08-17 11:16:25 +08:00
gaoyuanwei de04c8ce33 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-15 18:08:33 +08:00
gaoyuanwei f45974d654 申请--- --- 应用系统 2022-08-15 18:06:34 +08:00
a0049873 e50dc1ad1f 新排序 2022-08-15 16:47:33 +08:00
a0049873 0b972d7bb9 更改首页逻辑 2022-08-15 15:08:50 +08:00
a0049873 5f3c8d3556 全局搜索 2022-08-15 14:48:53 +08:00
gaoyuanwei c4597f6cbd 最少50字 2022-08-12 18:06:56 +08:00
wuhongjian a2267a59bb Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-12 17:17:06 +08:00
wuhongjian ce3f7ec183 配置更新 2022-08-12 17:17:03 +08:00
a0049873 1e7aca42fd 点图标返回首页 2022-08-12 16:34:13 +08:00
a0049873 f78f2f1292 能力集市 新增点击任意地方跳转详情 2022-08-12 14:19:53 +08:00
zhangzhuliang b1aae6175b 会议室代码提交 2022-08-11 14:22:54 +08:00
guoyue 810e183611 ifx: 门户详情 --资源key更改 2022-08-11 09:33:21 +08:00
guoyue 0b718307d8 fix 融合服务bug 2022-08-10 17:52:49 +08:00
gaoyuanwei e1d18f8b27 入口在能力集市 2022-08-09 20:01:21 +08:00
wuhongjian 5a32f96150 bug修复 2022-08-09 17:09:58 +08:00
851673013@qq.com 2ee3a34b94 bug794增加审核中标签 2022-08-08 14:43:07 +08:00
851673013@qq.com 01f36b7586 能力集市树区市样式修改 2022-08-08 11:38:50 +08:00
wuhongjian cf53e51913 西海岸需求更新 2022-08-06 16:36:20 +08:00
a0049873 f54169dfa3 后台挂载BUG修改 前台视频资源上限改为1000 2022-08-05 17:02:55 +08:00
851673013@qq.com 027a3a072d 能力集市左侧树,区级加上数 2022-08-05 11:13:16 +08:00
wuhongjian dca5dc511e bug修复,配置更新 2022-08-05 10:01:49 +08:00
a0049873 f2b714a915 改成100个 2022-08-04 15:14:55 +08:00
a0049873 6d79448ebe 能力申请驳回开发 视频调整成100个 2022-08-04 15:07:58 +08:00
851673013@qq.com c7b15fbe5b bug804 2022-08-03 16:42:40 +08:00
guoyue 403018f234 赋能场景详情标签字体演示更改 2022-08-03 14:23:23 +08:00
gaoyuanwei e271d2fe94 789、790bug 2022-08-03 14:05:42 +08:00
a0049873 3bb705ec3f 区市站点 添加 鼠标移动效果 2022-08-02 18:37:51 +08:00
a0049873 b1c04e5f31 趋势站点 新增 崂山区 李沧区 2022-08-02 17:59:47 +08:00
851673013@qq.com 5a14127977 bug算法pk 2022-08-02 17:30:39 +08:00
a0049873 c889fe069f 申请方 新增终止功能 审批方能力申请 改为驳回 2022-08-02 17:23:07 +08:00
lizhicheng2 ae2e323769 融合服务列表bug修复 2022-08-01 17:05:40 +08:00
lizhicheng2 035a600a3c 赋能场景详情完善 2022-08-01 16:43:44 +08:00
guoyue c5d7351809 合并 2022-08-01 16:22:24 +08:00
guoyue 1ccd81cd66 融合服务,一键申请--基础设施更改 2022-08-01 16:16:16 +08:00
a0049873 ce5d587c35 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	back/public/index.html
2022-08-01 09:23:58 +08:00
a0049873 328ab1102e 西海岸演示版本 2022-08-01 09:21:57 +08:00
851673013@qq.com 53f0b38c5a bug774搜索框遮挡问题 2022-07-30 17:55:40 +08:00
851673013@qq.com b79f0674bf bug764闲情也行距和bug759头部图标小手和自测bug 2022-07-30 17:13:56 +08:00
guoyue 44d1aad7dd 打包模式详情 2022-07-29 18:09:06 +08:00
guoyue 7b04a81d62 赋能场景详情增加头部 2022-07-29 15:58:27 +08:00
guoyue 6b07f48dd1 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-29 15:36:32 +08:00