Commit Graph

1718 Commits

Author SHA1 Message Date
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
guoyue dff001a8c4 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:18:04 +08:00
guoyue 9d0e7bb4aa 工作台:echarts修复 2022-07-18 14:17:45 +08:00
guoyue d2460b321c 工作台:工作动态跳转 2022-07-18 14:17:28 +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
guoyue ddd3d89a14 赋能场景挂接增加能力输入 2022-07-18 13:53:01 +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
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
wuhongjian 6c10a4bb29 eslint问题修复 2022-07-15 21:35:22 +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
gaoyuanwei c59a3d48bd 后台-上架联动字段修改 2022-07-15 18:30:59 +08:00
a0049873 ed5576a604 BUG修改 2022-07-15 17:52:31 +08:00
a0049873 c0d59fdd24 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 17:40:38 +08:00
a0049873 bb99765381 上架添加取消按钮 2022-07-15 17:40:32 +08:00
guoyue 2d12bf76d4 样式调整 2022-07-15 17:39:24 +08:00