Commit Graph

489 Commits

Author SHA1 Message Date
wuhongjian ab21f7de11 合并版本v0.8.1.6 2022-07-09 10:37:17 +08:00
gaoyuanwei 883581f67e Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-08 19:53:42 +08:00
gaoyuanwei c00872b8d7 新增内容 2022-07-08 19:52:59 +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
a0049873 2447b7abfa 样式修改 2022-07-08 17:51:41 +08:00
a0049873 f2e0f87605 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-08 17:28:25 +08:00
a0049873 42eb1257b1 样式调整 2022-07-08 17:27:27 +08:00
851673013@qq.com 71f9e137cf Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-08 17:26:09 +08:00
851673013@qq.com c018a11271 bug492 2022-07-08 17:25:37 +08:00
a0049873 cb46ccbcf9 样式调整 2022-07-08 17:25:35 +08:00
a0049873 0c7715e1c1 后台挂载 2022-07-08 17:05:55 +08:00
851673013@qq.com dd6e249190 bug487 2022-07-08 16:39:09 +08:00
851673013@qq.com 4344056f55 后台我的待办和已办任务分出来 2022-07-08 15:53:53 +08:00
a0049873 900b3ea26d 后台挂载 2022-07-08 15:51:55 +08:00
851673013@qq.com 08bb99011b 后台编目bug 2022-07-08 10:42:00 +08:00
a0049873 de9e38e5bf no message 2022-07-08 09:55:01 +08:00
a0049873 db087b9869 后台新挂载 2022-07-08 09:49:33 +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
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 4a1126cf94 BUG修改 2022-07-07 10:27:46 +08:00
a0049873 e6528b4b3b 滚动条BUG修改 2022-07-07 09:23:12 +08:00
wuhongjian 6cb8142534 favio替换,与后台同步更新版本 2022-07-06 22:17:22 +08:00
wuhongjian 888711b94d Merge branch 'hi-ucs-dev' into release 2022-07-06 18:52:04 +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 695aa6867d Merge branch 'hi-ucs-dev' into release 2022-07-06 18:45:20 +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