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

827 Commits

Author SHA1 Message Date
851673013@qq.com 1cd5db6444 判断当前用户是否拥有归属部门 2022-08-01 14:34:02 +08:00
a0049873 80e9ddf3fc BUG修改 2022-08-01 11:07:58 +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
guoyue 32ad0904c2 打包模式-详情 2022-07-29 15:36:21 +08:00
gaoyuanwei c8a8a58705 747\739\748 Bug 2022-07-29 15:27:24 +08:00
851673013@qq.com 35d8487a5f 来源部门共享门户颜色修改 2022-07-29 14:54:31 +08:00
851673013@qq.com 3609c2ba20 bug751 2022-07-29 14:49:44 +08:00
lizhicheng2 4d31d111ac 赋能场景详情补充 2022-07-29 14:20:40 +08:00
851673013@qq.com d8cbe92fb6 工作台部门能力风险和能力云图 2022-07-29 14:14:30 +08:00
gaoyuanwei 16a624b136 应用场景、功能介绍tab展示不全 2022-07-29 11:43:24 +08:00
gaoyuanwei cfa9de0b32 747、749 2022-07-29 11:02:16 +08:00
851673013@qq.com 8376fb23d5 后台能力运行监控 2022-07-28 20:40:48 +08:00
a0049873 fabd0da877 更改 西海岸字段 2022-07-28 19:35:42 +08:00
guoyue 488dbfbe5f Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-28 17:54:49 +08:00
guoyue 816d07495c 打包模式详情页添加 2022-07-28 17:52:31 +08:00
lizhicheng2 d9139ae621 赋能场景详情-初步完成 2022-07-28 17:36:23 +08:00
wuhongjian e47d7cf470 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-28 14:43:04 +08:00
wuhongjian b766bcf8fa bug修复 2022-07-28 14:42:44 +08:00
a0049873 bd839fd335 隐藏高级搜索 2022-07-28 14:21:20 +08:00
a0049873 5d3388465f BUG修改 视频展示多个/ 2022-07-28 14:13:49 +08:00
guoyue 20de75e0dd 合并 2022-07-28 10:19:01 +08:00
a0049873 fd3a7ef353 基础设施输入框 去除X 2022-07-28 09:40:05 +08:00
a0049873 a11d9eb221 能力申请 摄像头修改 2022-07-27 16:58:31 +08:00
gaoyuanwei 531aa7aafb 前台上架-预览bug修复 2022-07-27 16:19:34 +08:00
851673013@qq.com ef980d77c3 基础设施视频接口调换 2022-07-27 14:19:51 +08:00
lizhicheng2 291b65d03f 前台融合服务页面修改 2022-07-27 13:53:59 +08:00
851673013@qq.com bb9856e5c1 前台富文本样式修改 2022-07-27 11:07:34 +08:00
851673013@qq.com 42020cd1be 富文本前台样式修改 2022-07-27 11:02:32 +08:00
wuhongjian 806a45ccf7 后台开发文档 2022-07-27 10:54:34 +08:00
wuhongjian be75d352b2 JSESSIONID删除 2022-07-26 18:55:33 +08:00
wuhongjian c2b323b14c bug修复 2022-07-26 18:08:24 +08:00
wuhongjian efa51429f9 bug修复 2022-07-26 16:33:10 +08:00
a0049873 5dbaa26848 引入富文本编辑 2022-07-26 16:32:07 +08:00
wuhongjian 09f65b44ed Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 15:16:53 +08:00
wuhongjian b4e6f56c47 添加西海岸地图 2022-07-26 15:16:28 +08:00
a0049873 7ed6be40d7 改名 技术文档 2022-07-26 14:48:02 +08:00
a0049873 c09aa9c1b9 BUG修改 2022-07-26 14:42:17 +08:00
a0049873 5f8d005935 添加预览 时默认保存 常见问题功能 2022-07-26 14:38:09 +08:00
a0049873 486c3e8d46 websocket 钩子 2022-07-26 14:05:58 +08:00
gaoyuanwei 20e75d78cc 填写时红字提示消失 2022-07-26 11:36:15 +08:00
a0049873 fe5b5e1102 BUG修改 标题过长导致右边样式不统一 2022-07-26 10:54:19 +08:00
a0049873 15a3236516 BUG修改 下架的能力 不允许申请 2022-07-26 10:43:28 +08:00
gaoyuanwei 8be597f9cf Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 10:18:49 +08:00
gaoyuanwei 14d684bdfd 前台必填字段 2022-07-26 10:18:34 +08:00
a0049873 73ef6f5bdc BUG 修改 我的发布无法跳转 申购车 过滤已经下架的能力 2022-07-26 10:17:47 +08:00
gaoyuanwei 837641ba79 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 10:09:16 +08:00
gaoyuanwei 73ed69f315 前台必填项设置 2022-07-26 10:07:39 +08:00
a0049873 b8e4c36223 BUG修改 首页知识库跳转 、 能力统计 添加tooltip 2022-07-26 09:51:47 +08:00
851673013@qq.com 32997c5f73 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/home/DetailsPageconetent.vue
 2022-07-25 19:33:44 +08:00
851673013@qq.com 44e2d6a9b9 基础设施 2022-07-25 19:21:41 +08:00
guoyue a5e5c35da8 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-25 19:15:08 +08:00
guoyue f161ca967a add:赋能场景基础设施弹框 2022-07-25 19:07:07 +08:00
a0049873 975a51e4b4 放开 免批 2022-07-25 17:32:24 +08:00
a0049873 3675a618bf 视频审核成功 拼接地址 2022-07-25 15:07:44 +08:00
851673013@qq.com 03bfdd1d14 富文本引用 2022-07-25 11:34:30 +08:00
gaoyuanwei 979458071d 开发组件轮播 2022-07-25 11:24:41 +08:00
851673013@qq.com ef9a2dd15c bug703 2022-07-25 11:09:59 +08:00
gaoyuanwei aa1af8b4cd 应用场景-样式修改 2022-07-25 10:49:20 +08:00
a0049873 dc4b16d04d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-25 10:17:20 +08:00
a0049873 011cd3708a 基础设施申请添加提示 2022-07-25 10:17:08 +08:00
851673013@qq.com 859005e1c0 bug708 2022-07-25 10:13:01 +08:00
gaoyuanwei 4ee80c7529 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-25 09:52:41 +08:00
gaoyuanwei df43efef31 701bug 通知小铃铛的位置 2022-07-25 09:52:23 +08:00
a0049873 b3b9b48ed4 BUG修改 2022-07-22 18:44:07 +08:00
a0049873 12288fe713 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-22 18:20:31 +08:00
851673013@qq.com 7f7f5d4602 bug 2022-07-22 18:07:25 +08:00
a0049873 90b6866c65 Merge branch 'hi-ucs-dev' into release 2022-07-22 17:29:21 +08:00
a0049873 f372ae6b73 BUG 修改 2022-07-22 17:24:17 +08:00
851673013@qq.com b8afda6f0a 我的浏览bug修改 2022-07-22 16:58:19 +08:00
gaoyuanwei 133553b6a1 上传文件限一个 2022-07-22 16:51:00 +08:00
851673013@qq.com d92cf6925f bug448 2022-07-22 16:46:03 +08:00
a0049873 4a1d7340b9 Merge branch 'release' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-uce-release 
# Conflicts:
#	front/public/index.html
#	front/src/main.js
 2022-07-22 16:04:05 +08:00
851673013@qq.com 5876a3488e 常见问题bug 2022-07-22 16:02:49 +08:00
a0049873 cf0c32979f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-22 15:46:26 +08:00
a0049873 795d3e0b56 BUG修改 2022-07-22 15:46:13 +08:00
gaoyuanwei 78a9f22ffb bug--需求提交/搜索校验/样式 2022-07-22 15:39:31 +08:00
a0049873 2ac76dc174 添加websocket配置 2022-07-22 10:55:44 +08:00
851673013@qq.com 4e0d54efb1 归属部门bug 2022-07-22 10:50:39 +08:00
wuhongjian 4da090585a 登出问题解决 2022-07-21 18:39:19 +08:00
wuhongjian f952931b92 【单点登录】解决登出问题 2022-07-21 18:38:20 +08:00
wuhongjian b1543e323a 合并版本v0.8.2.6 2022-07-21 18:17:37 +08:00
a0049873 1bdd5c6a1c BUG修改 2022-07-21 17:58:13 +08:00
gaoyuanwei 0562c702fe 627bug 2022-07-21 17:20:43 +08:00
a0049873 2cc2cc4e00 BUG修改 以及消息中心自动刷新 2022-07-21 17:10:13 +08:00
a0049873 f3499c31b0 BUG修改 2022-07-21 16:20:09 +08:00
gaoyuanwei 2c95fa65af tota 2022-07-21 16:06:45 +08:00
gaoyuanwei 3968d6a7de bug 2022-07-21 15:57:08 +08:00
a0049873 681dceaa47 BUG修改 2022-07-21 15:36:01 +08:00
a0049873 10f3323676 消息中心添加 websocket 2022-07-21 14:34:09 +08:00
851673013@qq.com c0831d1eea 应用资源归属部门 2022-07-21 11:39:09 +08:00
851673013@qq.com 722f0b970a 能力下架申请 2022-07-21 11:29:15 +08:00
gaoyuanwei dbe688f3aa Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-21 11:26:59 +08:00
gaoyuanwei 2be53d5e28 applicationSystem[]变'' 2022-07-21 11:26:47 +08:00
a0049873 f62af22a5e 样式修改 2022-07-21 10:56:54 +08:00
gaoyuanwei a044ead9b0 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-21 10:00:38 +08:00
gaoyuanwei eadcfdceaf 购物车返回第一页bug 2022-07-21 09:59:17 +08:00
851673013@qq.com 30afa74344 前台上架下一页 2022-07-21 09:15:05 +08:00
wuhongjian 38c77a3e96 西海岸直接回单点 2022-07-20 17:22:23 +08:00
gaoyuanwei 66a5d33609 眼花了，没有png 2022-07-20 16:21:28 +08:00
gaoyuanwei b2d51e12eb 技术文档提示---高级搜索条件编辑---基础设施dec不要 2022-07-20 16:18:18 +08:00
wuhongjian 6fcc79b738 合并版本v0.8.2.5 2022-07-20 15:02:17 +08:00
wuhongjian 9cdbc6ef61 大屏变黑适配 2022-07-20 15:01:14 +08:00
gaoyuanwei f3e32e9698 前台-申购车-搜索功能 2022-07-20 10:53:02 +08:00
851673013@qq.com 70fb082506 应用详情-应用详情tab-bug修改 2022-07-20 09:18:34 +08:00
a0049873 a833330be1 上架完善 资源图谱转rem 2022-07-19 20:06:01 +08:00
851673013@qq.com 227eb72670 能力云图bug 2022-07-19 19:44:48 +08:00
gaoyuanwei 2905416d07 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 19:34:50 +08:00
gaoyuanwei 2548beb7c1 650、657bug 2022-07-19 19:34:43 +08:00
a0049873 0a2ebce897 完善 挂载 2022-07-19 19:30:42 +08:00
a0049873 f820d49f58 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
 2022-07-19 18:52:02 +08:00
a0049873 7bcb6b2062 修改多条添加逻辑 2022-07-19 18:51:21 +08:00
gaoyuanwei b6ce94a078 修改来源应用为下拉框 2022-07-19 17:44:39 +08:00
gaoyuanwei 166f6f91be Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 17:17:30 +08:00
gaoyuanwei a5ef8d2046 bug==select 2022-07-19 17:17:19 +08:00
gaoyuanwei e4d79e03b8 bug==select 2022-07-19 17:14:42 +08:00
851673013@qq.com 0ca63565e3 样式修改 2022-07-19 16:43:49 +08:00
851673013@qq.com 5afe117bc6 bug619 2022-07-19 16:20:45 +08:00
851673013@qq.com 0976ca98ac Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 15:54:26 +08:00
851673013@qq.com 768645a94a 归属部门bug619 2022-07-19 15:54:23 +08:00
a0049873 8ec4b585b6 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 15:06:32 +08:00
a0049873 d1692a1f51 上架功能修改 2022-07-19 15:06:26 +08:00
a0049873 e770028fba 详情页收藏功能BUG修改 2022-07-19 15:05:37 +08:00
gaoyuanwei bf56ce5eaa bug修改 2022-07-19 14:45:35 +08:00
wuhongjian da68d9117c 合并版本v0.8.2.4 2022-07-19 14:11:58 +08:00
gaoyuanwei 00af09c4f0 bug！ 2022-07-19 14:05:47 +08:00
gaoyuanwei b75e6a4fb0 还原 2022-07-19 13:59:26 +08:00
wuhongjian 578b63fdd0 bug修复 2022-07-19 13:40:11 +08:00
gaoyuanwei 9a681317f0 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 11:26:29 +08:00
gaoyuanwei 4d01131e74 来源应用穿梭框左侧实现单选 2022-07-19 11:26:18 +08:00
851673013@qq.com 4b33b089f1 我的浏览模糊查询 2022-07-19 11:14:46 +08:00
a0049873 a52966d68a BUG修改 2022-07-19 11:13:15 +08:00
a0049873 dbe0edfcd7 BUG修改 2022-07-19 11:08:32 +08:00
wuhongjian d757b3c8cd 冲突修复 2022-07-19 10:47:45 +08:00
wuhongjian 418ba1300e 合并版本v0.8.2.4 2022-07-19 10:40:08 +08:00
851673013@qq.com 7c63022fc5 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 10:25:16 +08:00
851673013@qq.com b15efd9206 bug629 2022-07-19 10:25:10 +08:00
a0049873 ed5ed8c828 能力申请 应用资源特殊处理 2022-07-19 10:22:16 +08:00
851673013@qq.com b407c3e610 bug626 2022-07-19 09:57:38 +08:00
gaoyuanwei 52ece255f3 冲突 2022-07-19 09:45:36 +08:00
gaoyuanwei a99f4fcbf3 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 09:43:58 +08:00
gaoyuanwei f1de4b860e 前台加word-break: break-all; 2022-07-19 09:42:41 +08:00
851673013@qq.com caf80caeff bug630 2022-07-19 09:42:37 +08:00
wuhongjian a89511eee3 合并版本v0.8.2.4 2022-07-19 09:19:29 +08:00
a0049873 4827fc5784 BUG修改 2022-07-19 09:16:29 +08:00
wuhongjian 0e351e915b 合并版本v0.8.2.3 2022-07-18 18:49:43 +08:00
gaoyuanwei b19361005f 把部门联系人和电话给我带出来！！！ 2022-07-18 18:24:17 +08:00
851673013@qq.com 46aef1c4df bug577 2022-07-18 18:17:48 +08:00
851673013@qq.com 6080e7933a bug498 2022-07-18 18:00:07 +08:00
851673013@qq.com e10cb78ab9 bug625 2022-07-18 17:56:36 +08:00
a0049873 259ee9379a 能力申请修改 2022-07-18 17:55:18 +08:00
851673013@qq.com fe86d84699 应用详情-状态判断bug 2022-07-18 17:40:35 +08:00
wuhongjian 665484d30c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 17:29:30 +08:00
wuhongjian 027409b123 西海岸bug修复 2022-07-18 17:29:28 +08:00
a0049873 a740904660 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 17:26:26 +08:00
a0049873 5af7b5f7e8 全部应用资源申请 2022-07-18 17:26:18 +08:00
gaoyuanwei a35a885b2f 业务组件视频、图片分离 2022-07-18 16:39:11 +08:00
851673013@qq.com f535e26c84 归属部门bug 2022-07-18 16:29:49 +08:00
gaoyuanwei 3d3e2729ed 623bug 2022-07-18 16:03:06 +08:00
gaoyuanwei 0c9d41c4ce 621bug 2022-07-18 15:45:40 +08:00
851673013@qq.com 0d66553d28 应用详情暂无样式修改 2022-07-18 15:40:45 +08:00
wuhongjian e1005536bb Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 15:39:25 +08:00
wuhongjian 2c526aeb52 数据中台跳转id添加 2022-07-18 15:39:16 +08:00
gaoyuanwei fd2fa09fd9 bug修复及后台挂接计费标准只能选一次 2022-07-18 15:22:12 +08:00
851673013@qq.com 07d387b5a2 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 15:20:02 +08:00
851673013@qq.com 6b9de7f3b7 应用资源详情页-应用详情判断是否是青岛 2022-07-18 15:19:15 +08:00
a0049873 57758bbfa4 应用资源能力申请BUG修改 2022-07-18 15:18:26 +08:00
a0049873 8f8a1ed3ad Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
 2022-07-18 14:43:58 +08:00
a0049873 4819e5ad17 应用资源 能力申请 BUG修改 2022-07-18 14:43:24 +08:00
gaoyuanwei e4e7ed161b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:33:48 +08:00
gaoyuanwei 5f4a67ca55 恢复bug 2022-07-18 14:28:50 +08:00
851673013@qq.com 24f5eeee55 bug597 2022-07-18 14:27:11 +08:00
gaoyuanwei 15b16757a4 能力集市详情bug 2022-07-18 14:20:20 +08:00
gaoyuanwei 31d20f4f15 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:02:48 +08:00
gaoyuanwei 569d2340ee Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:02:33 +08:00
851673013@qq.com 5507c8ed9c 应用详情-详情页tab显示问题bug 2022-07-18 14:00:49 +08:00
gaoyuanwei a168e10105 bug+bug+bug 2022-07-18 13:56:27 +08:00
wuhongjian 8f0fbc0551 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 13:56:06 +08:00
wuhongjian 61e61fbb87 修复tab页会左偏 2022-07-18 13:56:02 +08:00
851673013@qq.com 1dce78dc92 应用资源详情页-应用详情 2022-07-18 13:53:01 +08:00
wuhongjian 71a8a3ef59 添加西海岸图标切图 2022-07-18 13:35:11 +08:00
wuhongjian 5a9f4ee620 来源应用只能选择一个 2022-07-18 11:24:57 +08:00
851673013@qq.com 351518f849 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
 2022-07-18 11:00:07 +08:00
851673013@qq.com 4a52c2cf78 审批和前台应用详情 2022-07-18 10:47:49 +08:00
gaoyuanwei aa84a66a0b bug 2022-07-18 10:44:34 +08:00
wuhongjian e2e0dd8f6c 合并版本v0.8.2.2.release 2022-07-18 10:21:49 +08:00
851673013@qq.com 3ad0e3e77c 基础设施 2022-07-18 09:13:39 +08:00
wuhongjian ddf4ff421b 合并版本 2022-07-16 17:03:32 +08:00
a0049873 9001b5a5e1 BUG修改 2022-07-16 16:58:33 +08:00
wuhongjian c817f9eefc 合并版本v0.8.2.3 2022-07-16 16:44:00 +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