Commit Graph

567 Commits

Author SHA1 Message Date
a0049873 9001b5a5e1 BUG修改 2022-07-16 16:58:33 +08:00
yuhan_jiang c156b52d84 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
* 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs:
  端口修改
  BUG修改  应用资源新增 能力集市图标  和详情页切换
  bug修改
  bug修复
  BUG修改
  BUG修改

# Conflicts:
#	front/src/utils/request.js
#	front/src/vab/plugins/permissions.js
2022-07-16 16:22:28 +08:00
yuhan_jiang 15eb5dbd13 【单点登录】修复云图需要点击两次才能单点成功问题 2022-07-16 16:16:38 +08:00
a0049873 c7f2e1f70a 端口修改 2022-07-16 16:01:57 +08:00
a0049873 d38c0ae217 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-16 16:01:34 +08:00
a0049873 6062af489e BUG修改 应用资源新增 能力集市图标 和详情页切换 2022-07-16 16:01:28 +08:00
gaoyuanwei 123b64bc70 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-16 15:27:49 +08:00
gaoyuanwei c9cda03deb bug修改 2022-07-16 15:25:49 +08:00
wuhongjian 835e9d0cc4 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-16 15:05:34 +08:00
wuhongjian 6b0bb85212 bug修复 2022-07-16 15:04:25 +08:00
a0049873 bb6d58f568 BUG修改 2022-07-16 14:40:49 +08:00
a0049873 2354d8da3b BUG修改 2022-07-16 14:27:58 +08:00
a0049873 1740d6c06a Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/personalCenter/components/MyBrowse.vue
2022-07-16 10:03:25 +08:00
a0049873 86ece3cb09 BUG修改 2022-07-16 10:00:27 +08:00
gaoyuanwei 4568d28b6a 关联bug 2022-07-15 19:23:37 +08:00
851673013@qq.com 61baa7441b bug498 2022-07-15 18:56:00 +08:00
851673013@qq.com 97e078e596 bug507 2022-07-15 18:40:54 +08:00
a0049873 ed5576a604 BUG修改 2022-07-15 17:52:31 +08:00
a0049873 bb99765381 上架添加取消按钮 2022-07-15 17:40:32 +08:00
a0049873 3b10007619 详情页收藏按钮 2022-07-15 17:32:47 +08:00
gaoyuanwei 60e26e151c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 17:26:38 +08:00
gaoyuanwei 5978bc1859 前台-上架联动 2022-07-15 17:22:48 +08:00
851673013@qq.com 46285025f8 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 17:01:45 +08:00
851673013@qq.com bc1d36dae9 等保备案bug 2022-07-15 17:01:41 +08:00
a0049873 8213a9761d 前端上架 新增 归属部门 下拉 2022-07-15 16:57:51 +08:00
851673013@qq.com d36a5fc3a0 bug564 2022-07-15 16:55:13 +08:00
851673013@qq.com 425b8de7c6 是否等保备案bug修改 2022-07-15 16:47:06 +08:00
851673013@qq.com dcbc08d000 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 16:31:19 +08:00
851673013@qq.com 6dc52aff1d bug535 2022-07-15 16:31:05 +08:00
a0049873 02f1de8486 BUG修改 2022-07-15 16:30:13 +08:00
851673013@qq.com 90d9e7ae30 bug535 2022-07-15 16:25:33 +08:00
a0049873 906533e574 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 16:16:56 +08:00
a0049873 e8b741077e BUG修改 2022-07-15 16:16:50 +08:00
851673013@qq.com e7bfc7db36 bug566 2022-07-15 16:06:36 +08:00
851673013@qq.com d6e7324b80 前台-详情页-算法优势bug 2022-07-15 15:30:15 +08:00
851673013@qq.com 8fda94f942 基础设施bug 2022-07-15 14:56:17 +08:00
851673013@qq.com acd4bdae9f bug523 2022-07-15 14:36:13 +08:00
851673013@qq.com 0bf0722e53 bug577 2022-07-15 14:12:04 +08:00
a0049873 2e2287f1cf BUg修改 2022-07-15 11:51:40 +08:00
a0049873 e2209f7694 BUG修改 2022-07-15 11:49:14 +08:00
a0049873 e1e676e70a BUG修改 2022-07-15 11:34:23 +08:00
a0049873 a0526237f1 BUG修改 2022-07-15 11:14:48 +08:00
a0049873 622f2f645b BUG修改 2022-07-15 11:07:08 +08:00
851673013@qq.com cf296916e1 bug251 2022-07-15 11:03:21 +08:00
a0049873 f2aa5c5e3c BUg修改 2022-07-15 10:35:05 +08:00
851673013@qq.com ca7df48001 bug557 2022-07-15 10:15:03 +08:00
851673013@qq.com 293d6794c8 前台上架滚动条问题 2022-07-14 18:43:32 +08:00
851673013@qq.com b9dc8c15b4 摄像头接口更改 2022-07-14 18:31:19 +08:00
guoyue c951b7f858 文档url拼接 2022-07-14 17:45:20 +08:00
guoyue e5d772ab21 合并 2022-07-14 17:41:09 +08:00
guoyue efe4c42995 技术文档url拼接 2022-07-14 17:34:13 +08:00
a0049873 85dbc018b0 添加徽章 2022-07-14 17:33:01 +08:00
a0049873 bf6676dd06 我的申请页面 筛选功能 2022-07-14 17:20:40 +08:00
gaoyuanwei 38ebe981fa 全部评论提示bug修改 2022-07-14 17:04:17 +08:00
wuhongjian 65cd3bf086 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 17:02:45 +08:00
wuhongjian 29b20ce55b 添加地图分区摄像头数量 2022-07-14 17:02:42 +08:00
a0049873 9cb2e9e81f 我的申请模块开发 2022-07-14 16:50:51 +08:00
gaoyuanwei 0929b51faf 562bug 2022-07-14 15:37:27 +08:00
851673013@qq.com 9f5186f12b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 15:13:46 +08:00
gaoyuanwei 1ed9909e47 570bug 2022-07-14 15:12:47 +08:00
851673013@qq.com ea665df41e bug568 2022-07-14 15:12:40 +08:00
851673013@qq.com deb886a254 技术文档 2022-07-14 14:55:49 +08:00
wuhongjian 169d66e608 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 14:17:38 +08:00
wuhongjian 2ed32e97db 用户名显示真实姓名 2022-07-14 14:17:20 +08:00
guoyue 310a5f837d 指导手册:左侧树更改 2022-07-14 14:16:49 +08:00
guoyue ecf536e13c Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 10:56:55 +08:00
guoyue eefa5354ec 指导手册增加图标 2022-07-14 10:56:37 +08:00
guoyue e4280e3874 fix: 融合服务详情-申请使用, 常见问题 2022-07-14 10:56:04 +08:00
a0049873 2532a6cc79 BUG修改 2022-07-14 09:45:52 +08:00
wuhongjian 21a5d058ef Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 18:16:12 +08:00
wuhongjian 39a93eefc6 bug修复 2022-07-13 18:16:10 +08:00
a0049873 7f2f5e541b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/index.html
2022-07-13 18:15:37 +08:00
a0049873 876676819b BUG修改 2022-07-13 18:15:13 +08:00
wuhongjian a1eb29974c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 18:01:41 +08:00
wuhongjian 2019c1583f 11个算法试用配置内容 2022-07-13 18:00:26 +08:00
guoyue 3d223aaaf3 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 17:47:44 +08:00
guoyue ad7f05fcba fix: 融合服务列表报错 2022-07-13 17:47:14 +08:00
guoyue 7bd990fe25 add: 指导手册 2022-07-13 17:46:57 +08:00
a0049873 d551b833d3 我的申请 能力申请 开发 2022-07-13 16:30:37 +08:00
guoyue 84ecc46c69 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 15:04:20 +08:00
guoyue dfbdbb5a46 fix:指导手册 2022-07-13 15:04:12 +08:00
wuhongjian cbe9efa5ea 更换ico 2022-07-13 11:43:28 +08:00
851673013@qq.com 962ab8841d 后台能力资源上架 2022-07-13 10:11:01 +08:00
guoyue 8acde6c897 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 09:20:23 +08:00
guoyue 68efdf228b add: 指导手册(暂存) 2022-07-13 09:19:03 +08:00
a0049873 8bccb9bd94 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 09:09:41 +08:00
a0049873 19e8f11f1d 个人中心接口 2022-07-13 09:09:35 +08:00
851673013@qq.com 570a582818 技术文档样式修改 2022-07-12 17:13:03 +08:00
851673013@qq.com 57df5fe220 技术文档bug 2022-07-12 17:08:58 +08:00
851673013@qq.com f593a97854 技术文档 2022-07-12 16:54:35 +08:00
851673013@qq.com 616d806c2d 上架技术文档 2022-07-12 15:58:57 +08:00
wuhongjian b7b0a14b86 文本类算法试用+单点登录bug修复 2022-07-11 19:12:53 +08:00
851673013@qq.com dcf90b081e 详情页bug以及后台日志 2022-07-11 17:50:01 +08:00
guoyue c4a99bf8de 合并冲突 2022-07-11 10:29:34 +08:00
a0049873 23324f50ad BUG修改 后台上架开发 2022-07-09 15:22:20 +08:00
wuhongjian a839c90a1e 单点登录bug修复 2022-07-08 19:02:20 +08:00
851673013@qq.com 678367a6bf 编目bug 2022-07-08 18:33:17 +08:00
851673013@qq.com c018a11271 bug492 2022-07-08 17:25:37 +08:00
guoyue 324aa70b51 融合服务列表增加收藏量 2022-07-08 16:58:46 +08:00
851673013@qq.com dd6e249190 bug487 2022-07-08 16:39:09 +08:00
a0049873 e8485a86f9 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/static/config/location.js
2022-07-08 08:53:52 +08:00
a0049873 2aa05ee719 解决冲突 2022-07-08 08:53:19 +08:00
wuhongjian 32e5253c9f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 20:38:01 +08:00
wuhongjian d95a2eeb9f bug修复 2022-07-07 20:37:34 +08:00
851673013@qq.com 4958384c9a 应用资源详情页跳转 2022-07-07 20:35:13 +08:00
gaoyuanwei 3b7f8b745a Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 20:03:24 +08:00
gaoyuanwei e40efaf30e 基础设施bug 2022-07-07 20:00:03 +08:00
851673013@qq.com 251231ebb8 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/infrastructurePage.vue
2022-07-07 19:56:25 +08:00
a0049873 2ffb67b235 no message 2022-07-07 19:15:27 +08:00
851673013@qq.com 74187e4623 基础设施 2022-07-07 19:07:56 +08:00
wuhongjian 6f7d059eca Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 18:23:20 +08:00
wuhongjian dfa6c6a67b 单点登录bug修复 2022-07-07 18:22:54 +08:00
gaoyuanwei 420a31531f 按钮 2022-07-07 18:17:31 +08:00
a0049873 c271f3d988 BUG修改 2022-07-07 17:54:41 +08:00
a0049873 44479b25e9 BUG修改 2022-07-07 17:38:13 +08:00
gaoyuanwei 73b9108c08 469,顺序排序 2022-07-07 16:46:48 +08:00
guoyue 5d2c39fb44 融合服务:一键申请的存储数组更改 2022-07-07 14:31:52 +08:00
guoyue 4aef24c734 门户:融合服务列表+详情+我的收藏 2022-07-07 13:34:29 +08:00
851673013@qq.com 617373eb8e 详情页技术文档添加暂无上传提示 2022-07-07 11:37:05 +08:00
a0049873 4774431110 BUG修改 2022-07-07 11:25:56 +08:00
a0049873 0ad5646167 BUG修改 2022-07-07 10:49:37 +08:00
851673013@qq.com b48c2972ce 能力云图bug 2022-07-07 10:42:14 +08:00
a0049873 e6528b4b3b 滚动条BUG修改 2022-07-07 09:23:12 +08:00
wuhongjian 25b6d1196b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-06 18:51:43 +08:00
wuhongjian 9cc8accbde 不显示问题修复 2022-07-06 18:42:23 +08:00
gaoyuanwei 71eae6deeb 318摄像头列表弹窗bug修改 2022-07-06 18:15:58 +08:00
851673013@qq.com 544ba02828 调用趋势 2022-07-06 17:01:44 +08:00
gaoyuanwei eb08f86f21 462无法滚动问题 2022-07-06 16:34:17 +08:00
gaoyuanwei 7b6dfa8b93 387浏览记录bug 2022-07-06 16:02:30 +08:00
gaoyuanwei 89a73222e6 bug修复 2022-07-06 13:35:02 +08:00
gaoyuanwei 2bbfac3363 bug 2022-07-06 13:16:13 +08:00
gaoyuanwei 5035cc074a 应用资源 2022-07-06 13:07:12 +08:00
851673013@qq.com 8a686cfca6 应用资源关联组件 2022-07-06 12:48:00 +08:00
gaoyuanwei d93cfa543c 业务组件bug 2022-07-06 12:05:05 +08:00
851673013@qq.com 86580758f4 详情页bug自测 2022-07-06 11:58:13 +08:00
wuhongjian d96a0c440b bug修复 2022-07-06 10:36:41 +08:00
gaoyuanwei c2bb7f5eb8 bug修改 2022-07-06 10:09:53 +08:00
851673013@qq.com 0cab45f228 详情页tab 2022-07-06 09:52:38 +08:00
a0049873 adfc44cc7f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/assignCase/components/queryPage.vue
2022-07-05 20:52:02 +08:00
a0049873 35653daae4 BUg 2022-07-05 20:51:11 +08:00
wuhongjian 48aa9dffa1 bug修复 2022-07-05 20:46:50 +08:00
wuhongjian d72d47970c 冲突合并 2022-07-05 20:07:44 +08:00
wuhongjian cedb88a2b6 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-05 20:07:29 +08:00
a0049873 e65a8765fb 数字能力超市 2022-07-05 20:05:53 +08:00
a0049873 d5d85a194c 云图跳转首页 2022-07-05 19:47:38 +08:00
a0049873 48971f001a 图片判断 默认智能算法 2022-07-05 18:37:28 +08:00
wuhongjian b6942754cd Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-05 17:36:56 +08:00
wuhongjian d71dc876f5 西海岸bug修复 2022-07-05 17:35:48 +08:00
851673013@qq.com 6539637031 详情页 2022-07-05 17:33:32 +08:00
a0049873 a8780ed884 BUG修改 2022-07-05 17:12:53 +08:00