Commit Graph

590 Commits

Author SHA1 Message Date
unknown 79357c6e9a 会议室全部修改为会客厅 2022-11-11 10:33:16 +08:00
a0049873 62b2091fd6 全局搜索调整 2022-11-10 15:18:29 +08:00
a0049873 6abc05dcf6 全局搜索添加排序 2022-11-10 15:12:33 +08:00
unknown a5be25cec4 还原 2022-11-08 16:44:11 +08:00
unknown d89ae93ae2 视频播放 2022-11-08 15:08:07 +08:00
a0049873 383289ea94 门户如果未选中类型进行全局搜索 2022-11-07 14:43:28 +08:00
guoyue 99f962c74f 修复应用领域不能选中bug 2022-11-04 17:00:45 +08:00
gongjiale 0f479dfec4 问题修改 2022-11-04 13:59:28 +08:00
gongjiale d88430ec93 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-04 09:05:11 +08:00
unknown 4c77bb2405 申购车中展开收起修改 2022-11-03 17:59:48 +08:00
gongjiale 7b334a0224 修改 2022-11-03 17:43:41 +08:00
gongjiale 14f82809f6 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-03 14:34:02 +08:00
gongjiale 7da4dc814a 修改部分 2022-11-03 14:33:53 +08:00
unknown 92c6bf687b 会议室预约时间选择器限制 2022-11-03 10:02:39 +08:00
guoyue 4f41648fa4 修复应用资源详情返回未选中bug 2022-11-03 09:22:18 +08:00
gongjiale 65026d0e65 修改样式 2022-11-02 14:35:57 +08:00
a0049873 72229ea4fb 修改城市云脑顺序 2022-11-01 15:35:30 +08:00
a0049873 3950122864 全局搜索功能优化 2022-11-01 14:41:17 +08:00
a0049873 ad6a1c14de BUg修改 2022-10-31 20:23:26 +08:00
a0049873 493151d9f0 BUG修改 2022-10-31 19:45:21 +08:00
gongjiale d130bcf1aa Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-31 17:47:56 +08:00
gongjiale 2156e70433 左侧树修改 2022-10-31 17:47:38 +08:00
unknown 1ad52d954c bug修改,我的申请 2022-10-31 16:29:19 +08:00
a0049873 15426bccdc 能力申请 应用系统对接 2022-10-31 16:03:12 +08:00
gongjiale 511f4690c1 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-31 14:50:38 +08:00
guoyue 5f155dc69a 更改图片字段 2022-10-31 14:07:39 +08:00
gongjiale 90237e4f6d Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-28 16:40:35 +08:00
gongjiale 6967b3f1da 1.完成能力集市:基础设施-会客厅,字数太多时,展示不美观的问题;
2.完成融合服务:打包模式,点击发布时间,只能按照正序排,不能按照倒序排列的问题;
3完成.融合服务:打包模式,点击收藏量,只能按照正序排,不能按照倒序排列的问题
2022-10-28 16:37:48 +08:00
wuhongjian ed6a7e85b2 bug修复 2022-10-28 13:59:44 +08:00
wuhongjian 04fcdfde08 bug修复 2022-10-28 13:58:53 +08:00
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
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
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
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 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