Commit Graph

570 Commits

Author SHA1 Message Date
unknown 8ec209162c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 18:55:19 +08:00
unknown d278b2194c 添加后端接口所需字段 2022-10-13 18:54:27 +08:00
wuhongjian 0c83991e6c bug修复 2022-10-13 18:08:14 +08:00
a0049873 cfe88605cc Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/infrastructurePage.vue
2022-10-13 17:09:20 +08:00
a0049873 78aabf704b 修改基础设施BUG 以及 能力统计金字塔图 2022-10-13 17:07:51 +08:00
wuhongjian 5568f82e52 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 16:31:46 +08:00
gongjiale 6d45680b9a 1 2022-10-13 15:54:50 +08:00
wuhongjian 7877cd2474 bug修复 2022-10-13 15:45:21 +08:00
gongjiale e58b788f09 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 15:34:51 +08:00
gongjiale 48393700ed 信息 2022-10-13 15:34:34 +08:00
wuhongjian 54aa64de64 客户需求更新 2022-10-13 14:47:53 +08:00
a0049873 75299e8648 能力统计 能力使用统计 新增 会议室 2022-10-13 11:55:06 +08:00
gongjiale 17d08d399f 西海岸市局区分 2022-10-13 11:36:45 +08:00
gongjiale 1fa11e3358 添加字段 2022-10-13 11:28:44 +08:00
gongjiale b57d9c5b11 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-13 09:35:49 +08:00
gongjiale 7f662ee870 我得待办添加标签 2022-10-13 09:35:33 +08:00
wuhongjian 8f1658f2eb 客户需求 2022-10-12 17:56:41 +08:00
wuhongjian 672981d051 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 13:40:18 +08:00
guoyue 6f1550734d 市局配置文件:增加测试环境后台 2022-10-12 11:53:28 +08:00
wuhongjian 70bb06cba6 更改token问题 2022-10-12 09:50:17 +08:00
gongjiale fe1ac7cfbc 分页去掉 2022-10-09 15:44:17 +08:00
gongjiale 4094c3afc4 查看详情修改 2022-10-09 15:29:37 +08:00
gongjiale 06d16202a2 修改查看详情问题 2022-10-09 10:13:35 +08:00
gongjiale ca9244ed80 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-04 13:19:02 +08:00
gongjiale 82cbe0aecb 添加明细页面 2022-10-04 13:18:52 +08:00
gongjiale e01788b7b0 部分问题修改 2022-10-04 13:14:15 +08:00
guoyue 58e045e862 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-03 16:26:28 +08:00
guoyue cdb0ed10ea 工作台待办,已办跳转,分别跳转到待办、已办-能力申请 2022-10-03 16:25:20 +08:00
gongjiale aa6022f599 修改部分usc问题 2022-10-02 16:42:34 +08:00
guoyue ded5cfed22 更改已办任务,能力申请processDefinitionKey: abilityprocess_v2参数,市局v2 ,其他v3 2022-10-02 14:59:23 +08:00
851673013@qq.com 7918e07b6c 页面设计优化:首页5个统计展示模块要让用户能明显的清楚可“点击进入”(比如字下面加下划线或者鼠标移入时“小手“图标要明显等) 2022-09-29 11:37:08 +08:00
guoyue 9c93864e38 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 18:49:40 +08:00
guoyue 9023a44715 西海岸:已办--增加单兵无人机设备历史记录 2022-09-27 18:49:26 +08:00
a0049873 a02926006a 删除 数字校验 2022-09-27 14:17:31 +08:00
a0049873 8782498104 管理端bug修改 门户修改右侧图标 2022-09-27 09:42:13 +08:00
a0049873 67e009d110 BUG修改 2022-09-26 09:26:17 +08:00
guoyue 2688b764e5 后台管理:公共scss文件 更改弹框最大高度,以及树形组件最大高度 2022-09-23 17:35:08 +08:00
guoyue 5e31517f1d fix:控制台--地图报错 2022-09-23 13:33:41 +08:00
guoyue 85b515acf8 fix: 我的角色-报错页面空白 2022-09-22 13:37:18 +08:00
guoyue 8f56c1680d 无人机单兵设备,表单重置 2022-09-21 21:13:32 +08:00
guoyue b8eda12e43 无人机单兵设备增加设备审批 2022-09-21 18:48:19 +08:00
guoyue 47871e8a02 后台-角色管理,新增重置功能 2022-09-19 19:22:06 +08:00
guoyue c6d456055e 后台-岗位管理,新增重置功能 2022-09-19 19:21:46 +08:00
guoyue 18578c1a58 我的待办:西海岸改成v2 2022-09-19 19:20:22 +08:00
zhangzhuliang 205cb756be 会议室审核加下载附件按钮和输入框报错 2022-09-02 11:06:11 +08:00
gaoyuanwei c3bc043228 提示语 2022-09-01 17:56:20 +08:00
a0049873 3b09661496 v3 流程 2022-09-01 16:12:44 +08:00
gaoyuanwei 619fc10627 后台审批----附件下载 2022-09-01 14:28:09 +08:00
gaoyuanwei 2ff89ea6e4 前后台-- -- 上传附件 2022-09-01 13:50:42 +08:00
zhangzhuliang c1643e3cb0 会议室bug提交 2022-08-31 18:26:06 +08:00
guoyue 27423a3c14 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-27 16:08:11 +08:00
guoyue 0400fdbbb1 基础设施记住已选择 2022-08-27 15:03:32 +08:00
wuhongjian 13226c8976 版本号更新 2022-08-27 14:26:03 +08:00
wuhongjian 66db5faf1b 详情页模糊化处理 2022-08-27 14:25:03 +08:00
wuhongjian 8a0ac98824 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-26 19:24:20 +08:00
wuhongjian 0e224958ce 配置修改 2022-08-26 19:24:17 +08:00
gaoyuanwei bfc88508d8 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-26 18:55:56 +08:00
gaoyuanwei 244123dd74 赋能案例--数据资源 2022-08-26 18:55:19 +08:00
guoyue 4a0f2eff68 基础设施:去掉tooltip,更改点击弹框不选择数据丢失bug 2022-08-26 17:51:23 +08:00
wuhongjian 84850788d8 解决进入工作台报错的问题 2022-08-26 11:54:07 +08:00
wuhongjian 64ef4c95a1 bug修复 2022-08-26 09:27:34 +08:00
wuhongjian 9b77589c6e 配置文件更新 2022-08-25 15:20:06 +08:00
wuhongjian b923e7ac2d 配置文件更新 2022-08-25 15:07:19 +08:00
gaoyuanwei 0c4015cb5c 亿点点修改 2022-08-23 17:47:24 +08:00
wuhongjian d9186e3ac8 删除报错接口 2022-08-23 16:37:29 +08:00
a0049873 ded027bb64 新 申请流程 2022-08-23 13:59:43 +08:00
gaoyuanwei 7014db07b3 前台进入后台图标修改 2022-08-18 11:01:27 +08:00
zhangzhuliang 9eaa4ca9bb bug提交 2022-08-17 17:33:57 +08:00
a0049873 080682f6b7 能力下架功能开发 2022-08-17 16:42:46 +08:00
gaoyuanwei 05a706cd8a 后台-上架审批-提示修改 2022-08-16 15:08:22 +08:00
a0049873 91d3622d77 智能算法添加置顶按钮 2022-08-15 14:36:54 +08:00
gaoyuanwei c4597f6cbd 最少50字 2022-08-12 18:06:56 +08:00
851673013@qq.com bc55f39d38 bug734 2022-08-11 19:50:15 +08:00
zhangzhuliang b1aae6175b 会议室代码提交 2022-08-11 14:22:54 +08:00
guoyue 607e119c61 fix : 组件服务获取列表传参 2022-08-10 15:47:24 +08:00
guoyue b3769f2415 fix:融合服务-详情 2022-08-09 13:13:01 +08:00
guoyue 2e79549ae1 fix: 融合服务-详情 2022-08-09 13:02:16 +08:00
guoyue b7afa338a6 工作台--样式调整 2022-08-09 11:13:44 +08:00
guoyue a9e3582db2 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-09 10:35:01 +08:00
guoyue 141378eaee fix: 赋能场景--基础设施--详情 2022-08-09 10:34:48 +08:00
851673013@qq.com cfa2f69b80 工作台bug修改 2022-08-08 17:42:28 +08:00
851673013@qq.com 11a555200c 工作台-部门待办和部门已办 2022-08-08 16:39:21 +08:00
guoyue 0864e8a1ca 融合服务:组合能力详情更改 2022-08-08 13:33:17 +08:00
guoyue b90e3377a2 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-08 10:47:44 +08:00
guoyue dae78b5513 赋能场景 详情 2022-08-08 10:47:33 +08:00
a0049873 f54169dfa3 后台挂载BUG修改 前台视频资源上限改为1000 2022-08-05 17:02:55 +08:00
a0049873 a25df90421 BUG修改 2022-08-05 14:51:43 +08:00
a0049873 d4f2efd515 BUG修改 2022-08-05 14:50:38 +08:00
wuhongjian dca5dc511e bug修复,配置更新 2022-08-05 10:01:49 +08:00
a0049873 6d79448ebe 能力申请驳回开发 视频调整成100个 2022-08-04 15:07:58 +08:00
851673013@qq.com 3817737f04 bug796 2022-08-03 14:47:02 +08:00
gaoyuanwei 8c15de2b45 797bug 2022-08-03 14:31:17 +08:00
gaoyuanwei e271d2fe94 789、790bug 2022-08-03 14:05:42 +08:00
gaoyuanwei e8be9f904e Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	back/src/views/modules/activiti/demo/comments.vue
2022-08-03 13:39:21 +08:00
gaoyuanwei 9c991756eb 784bug 2022-08-03 12:10:56 +08:00
851673013@qq.com a9e500490d 能力上架 2022-08-03 11:07:16 +08:00
851673013@qq.com 5673d88047 bug783 2022-08-03 10:32:08 +08:00
851673013@qq.com 2bbb2e19cd bug729 2022-08-02 17:39:06 +08:00
a0049873 c889fe069f 申请方 新增终止功能 审批方能力申请 改为驳回 2022-08-02 17:23:07 +08:00
a0049873 e081c560a7 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/index.html
2022-08-02 11:59:59 +08:00
a0049873 ee9ec45450 前台上架 驳回功能 2022-08-02 11:59:01 +08:00
851673013@qq.com 651c58404f 前台-技术文档-总体流程 2022-08-02 11:58:02 +08:00
wuhongjian 8ecafcc1ae Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-01 14:42:26 +08:00
wuhongjian 2bf1249913 算法仓更新 2022-08-01 14:42:08 +08:00
a0049873 dafc2ac1be 后台挂载 部门校验 2022-08-01 14:34:44 +08:00
851673013@qq.com a202bb27c9 bug767 2022-08-01 11:47:39 +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
gaoyuanwei 5f0e5bb7ce 769\753 Bug修改 2022-07-29 18:05:04 +08:00
gaoyuanwei 879797d0c5 基本信息1111 2022-07-29 16:02:35 +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
gaoyuanwei c8a8a58705 747\739\748 Bug 2022-07-29 15:27:24 +08:00
851673013@qq.com d8cbe92fb6 工作台部门能力风险和能力云图 2022-07-29 14:14:30 +08:00
guoyue 42bad9af8e 赋能场景 基础设施标签查询传参 2022-07-29 09:27:04 +08:00
wuhongjian 428af8b74f 时间 2022-07-29 09:08:06 +08:00
851673013@qq.com 8376fb23d5 后台能力运行监控 2022-07-28 20:40:48 +08:00
a0049873 bab0c94093 BUG修改 2022-07-28 20:37:08 +08:00
a0049873 fb78805786 BUG修改 2022-07-28 20:20:34 +08:00
a0049873 1c7bdef115 修改BUG 2022-07-28 20:12:50 +08:00
a0049873 ea3f4b3da1 弹窗禁用点击遮罩层 2022-07-28 17:23:57 +08:00
a0049873 fc524a6b43 BUG修改 2022-07-28 17:12:30 +08:00
guoyue 78f836dd92 赋能场景:数据资源接口联调 2022-07-28 10:31:42 +08:00
guoyue 20de75e0dd 合并 2022-07-28 10:19:01 +08:00
guoyue 480d887b6d 融合服务 赋能场景 后台管理增删改查 2022-07-28 10:15:49 +08:00
wuhongjian 806a45ccf7 后台开发文档 2022-07-27 10:54:34 +08:00
wuhongjian a0361b2eba Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 18:08:28 +08:00
wuhongjian c2b323b14c bug修复 2022-07-26 18:08:24 +08:00
a0049873 7c2cc4a7f1 修改 后台挂载列表样式 2022-07-26 16:50:02 +08:00
gaoyuanwei 072bf90913 716\715 bug 2022-07-26 15:47:48 +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 c966d75387 列表样式 2022-07-25 17:20:51 +08:00
a0049873 b7fd109210 后台挂载 新增必填字段校验,列表按必填进行展示 2022-07-25 17:07:47 +08:00
a0049873 3f6a5ab267 BUG修改 2022-07-25 10:09:05 +08:00
a0049873 fe349c3ff3 BUG修改 2022-07-25 09:51:55 +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
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