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

1468 Commits

Author SHA1 Message Date
unknown d89ae93ae2 视频播放 2022-11-08 15:08:07 +08:00
a0049873 383289ea94 门户如果未选中类型进行全局搜索 2022-11-07 14:43:28 +08:00
guoyue 799749ecdc 删除无用代码 2022-11-04 17:05:22 +08:00
guoyue 023f11c03a 能力集市--详情--描述信息tootlip样式：添加成全局样式（后续如果有需要，可直接加上类名） 2022-11-04 17:04:47 +08:00
guoyue 99f962c74f 修复应用领域不能选中bug 2022-11-04 17:00:45 +08:00
guoyue 4a2e8f4a62 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-04 14:10:07 +08:00
guoyue 2962cb6e9d 需求中心：tooltip 样式更改 2022-11-04 14:09:53 +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
guoyue 91b2f229ee 智能算法详情增加说明文字 2022-11-02 16:52:46 +08:00
gongjiale 65026d0e65 修改样式 2022-11-02 14:35:57 +08:00
unknown e4cdac8bb9 服务详情收藏错误 2022-11-01 18:05:32 +08:00
a0049873 72229ea4fb 修改城市云脑顺序 2022-11-01 15:35:30 +08:00
a0049873 3950122864 全局搜索功能优化 2022-11-01 14:41:17 +08:00
a0049873 33e9cfe960 修改表格宽度 2022-11-01 14:32:01 +08:00
a0049873 2a2eb0fbc3 调换首页应用资源位置 2022-11-01 13:56:55 +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 50c2d6264d renren-admin改为ucs-admin 2022-10-31 14:08:04 +08:00
guoyue 5f155dc69a 更改图片字段 2022-10-31 14:07:39 +08:00
guoyue 2774650d96 新手指南--资源下架跳转到我的发布 2022-10-28 17:04:37 +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
guoyue 2f34e4acbc 合并 2022-10-27 19:39:34 +08:00
guoyue cc00873328 我的申请：查看详情按钮位置调整 2022-10-27 19:33:42 +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
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
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
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 057b926183 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-29 17:28:06 +08:00
guoyue 39547f16e4 西海岸：登录重定向到能力集市页面 2022-09-29 17:27:45 +08:00
guoyue f0df682cc6 响应拦截器，错误信息增加msg取值 2022-09-29 17:26:58 +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
851673013@qq.com e477b3f90e 我的申请——能力评价位置往最后面放 2022-09-29 14:24:07 +08:00
851673013@qq.com 9e5bd33650 首页“能力汇聚”改为“能力分类”；“工作动态”隐掉； 2022-09-29 11:48:59 +08:00
851673013@qq.com 7918e07b6c 页面设计优化：首页5个统计展示模块要让用户能明显的清楚可“点击进入”（比如字下面加下划线或者鼠标移入时“小手“图标要明显等） 2022-09-29 11:37:08 +08:00
guoyue 3f4e27177c fix：重定向白屏需强刷bug 2022-09-29 11:02:23 +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 9c93864e38 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 18:49:40 +08:00
guoyue 787ceeef3f 西海岸：基础设施--批量申请--增加参数 2022-09-27 18:04:07 +08:00
a0049873 55da389003 隐藏趋势站点，能力云图 2022-09-27 16:49:10 +08:00
a0049873 1066a00154 按钮名字修改 2022-09-27 16:04:13 +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 2df958d69e 西海岸：能力申请--过期给出提示 2022-09-27 14:06:57 +08:00
guoyue cf7d85060c 西海岸：基础设施-申请增加过期时间 2022-09-27 11:53:10 +08:00
a0049873 18f911bd16 基础设施修改 2022-09-27 10:37:08 +08:00
guoyue f071abfcf7 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 09:49:35 +08:00
guoyue 0b401f5741 我的申请增加水印 2022-09-27 09:49:30 +08:00
a0049873 ccbb53093f Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 09:43:44 +08:00
a0049873 8782498104 管理端bug修改 门户修改右侧图标 2022-09-27 09:42:13 +08:00
guoyue 2f752de364 西海岸：基础设施--视频预览增加水印 2022-09-27 09:28:03 +08:00
guoyue ae5978f408 add: 西海岸 测试环境 2022-09-26 17:26:06 +08:00
guoyue 479c2791f3 合并 2022-09-26 17:25:30 +08:00
guoyue 653559e727 格式化代码 2022-09-26 16:55:51 +08:00
guoyue cecba03c6e 西海岸：视频播放 离线(status不是1)提示当前视频离线 2022-09-26 16:41:09 +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
guoyue 4e3fa20984 西海岸：登录默认 跳转到能力集市-基础设施 2022-09-26 15:55:31 +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 5e31517f1d fix：控制台--地图报错 2022-09-23 13:33:41 +08:00