Commit Graph

334 Commits

Author SHA1 Message Date
a0049873 90b6866c65 Merge branch 'hi-ucs-dev' into release 2022-07-22 17:29:21 +08:00
851673013@qq.com f10110e1bf bug 2022-07-22 17:26:48 +08:00
a0049873 f372ae6b73 BUG 修改 2022-07-22 17:24:17 +08:00
guoyue 2bcc93b0d6 合并 2022-07-22 16:09:16 +08:00
guoyue f52cbac587 赋能场景,融合服务挂接更改 2022-07-22 16:06:40 +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
a0049873 83ffb69730 BUG修改 2022-07-22 15:49:26 +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
851673013@qq.com f0505d2d87 bug691 2022-07-22 14:33:03 +08:00
wuhongjian b1543e323a 合并版本v0.8.2.6 2022-07-21 18:17:37 +08:00
gaoyuanwei 12f0bdc814 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-21 17:13:55 +08:00
gaoyuanwei 3a34e97ec8 bug 2022-07-21 17:13:39 +08:00
851673013@qq.com 3f24f6feed 后台能力下架审批 2022-07-21 16:45:00 +08:00
a0049873 d3174f8cb0 驳回改成 终止 2022-07-21 16:41:46 +08:00
gaoyuanwei 3968d6a7de bug 2022-07-21 15:57:08 +08:00
a0049873 681dceaa47 BUG修改 2022-07-21 15:36:01 +08:00
851673013@qq.com 66e479ed5f 关闭弹窗bug 2022-07-21 13:52:30 +08:00
a0049873 d5bb315312 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-21 10:37:33 +08:00
a0049873 599250db0d BUG修改 2022-07-21 10:37:26 +08:00
gaoyuanwei c687738e2c 同意跳转 2022-07-21 10:09:46 +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
a0049873 578c941f1c 按钮修改 2022-07-21 09:57:47 +08:00
gaoyuanwei 2330dd5680 组件服务-挂载 2022-07-20 15:06:57 +08:00
gaoyuanwei 29a5016590 组件服务-挂接 2022-07-20 15:04:52 +08:00
wuhongjian 418ba1300e 合并版本v0.8.2.4 2022-07-19 10:40:08 +08:00
gaoyuanwei cc633449ed 后台加overflow: hidden; 2022-07-19 09:55:05 +08:00
wuhongjian a89511eee3 合并版本v0.8.2.4 2022-07-19 09:19:29 +08:00
851673013@qq.com f0d7ca4f39 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:53:09 +08:00
851673013@qq.com 23a577a544 组件服务挂接 2022-07-18 18:53:04 +08:00
wuhongjian 0e351e915b 合并版本v0.8.2.3 2022-07-18 18:49:43 +08:00
gaoyuanwei 2c241828b9 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:38:27 +08:00
gaoyuanwei cb5eb60b65 后台挂接-归属部门给我显示出来! 2022-07-18 18:29:17 +08:00
a0049873 0ee999ed86 后台展示 改为详情 2022-07-18 18:24:28 +08:00
gaoyuanwei 0a8cc6257d 633bug 2022-07-18 18:04:38 +08:00
a0049873 cf7fcb4e4a BUG修改 2022-07-18 18:01:56 +08:00
gaoyuanwei fd2fa09fd9 bug修复及后台挂接计费标准只能选一次 2022-07-18 15:22:12 +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
guoyue ddd3d89a14 赋能场景挂接增加能力输入 2022-07-18 13:53:01 +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 c817f9eefc 合并版本v0.8.2.3 2022-07-16 16:44:00 +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
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 c59a3d48bd 后台-上架联动字段修改 2022-07-15 18:30:59 +08:00
guoyue 2d12bf76d4 样式调整 2022-07-15 17:39:24 +08:00
guoyue 497e3f5dbc Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 17:33:47 +08:00
guoyue 78e3a4d7f0 样式调整 2022-07-15 17:33:27 +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
guoyue 4e0a985a3b 更改列宽 2022-07-15 16:51:46 +08:00
guoyue 16db951043 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 16:44:17 +08:00
guoyue 0c3948e544 赋能场景相关 2022-07-15 16:43:55 +08:00
guoyue 4132ea0589 fix: 融合服务 2022-07-15 16:43:29 +08:00
a0049873 e8b741077e BUG修改 2022-07-15 16:16:50 +08:00
wuhongjian 09518566c7 合并版本 2022-07-15 14:10:46 +08:00
gaoyuanwei 3acee93e23 后台上架-计费单位 2022-07-15 14:04:46 +08:00
gaoyuanwei c933eeb642 后台字段修改 2022-07-15 11:41:10 +08:00
851673013@qq.com f06af37a5f bug584 2022-07-15 11:27:26 +08:00
a0049873 a0526237f1 BUG修改 2022-07-15 11:14:48 +08:00
a0049873 622f2f645b BUG修改 2022-07-15 11:07:08 +08:00
wuhongjian 63711c54bd 合并版本 2022-07-15 09:17:43 +08:00
gaoyuanwei 1f7a02927e 555bug 2022-07-14 15:52:57 +08:00
guoyue d9ed994429 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 15:49:52 +08:00
guoyue a8b91e2788 add: 赋能场景 2022-07-14 15:49:34 +08:00
851673013@qq.com bd77db0ce4 bug582 2022-07-14 15:37:55 +08:00
851673013@qq.com deb886a254 技术文档 2022-07-14 14:55:49 +08:00
gaoyuanwei 6877c7e2c3 后台-上架-修改573bug 2022-07-14 14:01:06 +08:00
gaoyuanwei de1868eb5c 573bug 2022-07-14 11:43:42 +08:00
gaoyuanwei 0194a9b146 后台-上架-复选框问题 2022-07-14 11:02:12 +08:00
851673013@qq.com 5299e797e6 后台能力资源上架审批 2022-07-14 10:33:30 +08:00
851673013@qq.com c61611e01e 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/ResourcesAndServices.vue
2022-07-13 19:07:12 +08:00
851673013@qq.com dc9d5323e6 后台审批 2022-07-13 19:03:21 +08:00
gaoyuanwei 69668a0ae8 审批 2022-07-13 18:58:35 +08:00
851673013@qq.com e832b3e1d5 能力上架后台审批 2022-07-13 15:53:30 +08:00
851673013@qq.com 22f1091532 我的待办,上架 2022-07-13 14:30:32 +08:00
wuhongjian 86a3be9b82 合并版本 2022-07-13 11:29:19 +08:00
gaoyuanwei 70b5e91a78 后台上架字段问题 2022-07-13 11:23:26 +08:00
wuhongjian 38bc627486 merge change修改 2022-07-13 11:18:02 +08:00
851673013@qq.com 962ab8841d 后台能力资源上架 2022-07-13 10:11:01 +08:00
wuhongjian 432f8fef23 测试环境配置 2022-07-12 15:11:38 +08:00
wuhongjian b7b0a14b86 文本类算法试用+单点登录bug修复 2022-07-11 19:12:53 +08:00
851673013@qq.com ae22bbd063 重置功能隐掉 2022-07-11 18:59:21 +08:00
851673013@qq.com 71b6b2edd7 日志bug修改 2022-07-11 18:53:42 +08:00
851673013@qq.com a44cce5492 日志bug修改 2022-07-11 18:33:58 +08:00
851673013@qq.com dcf90b081e 详情页bug以及后台日志 2022-07-11 17:50:01 +08:00
gaoyuanwei b8ddfe5938 后天-上架关联组件字段修改 2022-07-11 17:12:12 +08:00
gaoyuanwei d44af11e8a 后台-应用资源上架bug 2022-07-11 16:52:42 +08:00
a0049873 39d139d06d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-11 16:43:30 +08:00
a0049873 29087301b4 特殊类型回填处理 2022-07-11 16:43:23 +08:00
gaoyuanwei c58fd36487 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-11 16:13:12 +08:00
gaoyuanwei a6c9ca295a 后台-应用资源上架 2022-07-11 16:12:59 +08:00
a0049873 b37b3cafb9 清空BUG修改 2022-07-11 16:10:59 +08:00
a0049873 2eca6ab758 后台 上架功能开发 2022-07-11 15:41:18 +08:00
guoyue c4a99bf8de 合并冲突 2022-07-11 10:29:34 +08:00
a0049873 23324f50ad BUG修改 后台上架开发 2022-07-09 15:22:20 +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
851673013@qq.com 678367a6bf 编目bug 2022-07-08 18:33:17 +08:00
a0049873 2447b7abfa 样式修改 2022-07-08 17:51:41 +08:00
a0049873 42eb1257b1 样式调整 2022-07-08 17:27:27 +08:00
a0049873 cb46ccbcf9 样式调整 2022-07-08 17:25:35 +08:00
a0049873 0c7715e1c1 后台挂载 2022-07-08 17:05:55 +08:00
guoyue 2540d303fc fix: 融合服务 2022-07-08 16:16:23 +08:00
guoyue d7778972f5 融合服务后台管理相关功能 2022-07-08 16:10:08 +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 4a1126cf94 BUG修改 2022-07-07 10:27:46 +08:00
gaoyuanwei e1b7fb4dd8 后台-组件服务bug 2022-07-05 15:00:38 +08:00
gaoyuanwei 20b968beba demandSubject 2022-07-05 13:51:21 +08:00
gaoxiaolong 854eaef183 能力统计调试 2022-07-04 17:07:11 +08:00
a0049873 c35d5789fc BUG修改 2022-07-04 17:02:00 +08:00
gaoxiaolong 5f0aec483b 使用组件统计 2022-07-04 09:37:21 +08:00
guoyue 260302e1df 增加融合服务页面 2022-07-01 17:25:21 +08:00
guoyue cacb9ec52e 工作台:待办已办路由跳转 2022-07-01 15:43:13 +08:00
guoyue 5c5a3b497f 样式微调 2022-07-01 14:54:57 +08:00
guoyue 8809317979 样式微调 2022-07-01 14:53:40 +08:00
guoyue bcaddcd4fa 工作台优化 2022-07-01 14:50:29 +08:00
guoyue 2b01c0efa4 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 14:03:42 +08:00
guoyue e7bc4e8f0c 更改色度值,去掉调用数量 2022-07-01 14:03:31 +08:00
gaoyuanwei f30d67b7d4 bug 接口请求方式 2022-07-01 13:46:49 +08:00
guoyue 02639e6696 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 13:30:24 +08:00
guoyue 930eae441d 工作台:待办 已办 数量更改 2022-07-01 13:29:38 +08:00
gaoyuanwei 11a2eb5602 bug 2022-07-01 11:24:19 +08:00
a0049873 aff2ebda88 BUG修改 2022-07-01 10:33:11 +08:00
gaoxiaolong 146d80cd78 组件使用UI 2022-07-01 10:29:01 +08:00
gaoxiaolong f47d964105 使用组件 2022-07-01 09:16:41 +08:00
851673013@qq.com e093ab7aab 运行监控 2022-06-30 21:24:49 +08:00
gaoyuanwei ecdc04930d 免批申请、免费试用按钮取消 && 详情页标签折行问题 && 基础设施感知为空 &&新建工作流程提示错误 2022-06-30 21:19:57 +08:00
gaoyuanwei d898bbec7e 详情页、审批bug修改 2022-06-30 19:44:50 +08:00
gaoxiaolong 814ed5ff92 能力统计 2022-06-30 17:53:47 +08:00
hucongqian 5ead4f085b 趋势接口修改 2022-06-30 16:50:01 +08:00
hucongqian c4b6faaa6d 尺寸调整 2022-06-30 14:37:45 +08:00
hucongqian 5d1c2d51ee Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-30 14:25:39 +08:00
hucongqian 2339b13ec8 部门发布能力被调用趋势 2022-06-30 14:25:27 +08:00
guoyue 10c21d5eac Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-30 13:52:06 +08:00
guoyue fdce918f4a 样式微调 2022-06-30 13:51:53 +08:00