Commit Graph

489 Commits

Author SHA1 Message Date
wuhongjian fa809a37e0 Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-04 17:46:04 +08:00
wuhongjian 4c1c3ff628 需求新增 2022-11-04 17:46:03 +08:00
unknown 37aa68ba7a 错别字修改 2022-11-04 17:34:23 +08:00
a0049873 42bba89d54 应用系统上架 2022-11-04 10:02:57 +08:00
guoyue c19e1ac231 Merge branch 'hi-ucs-pre' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-03 14:50:18 +08:00
guoyue 02de5ba910 能力标签化调整 2022-11-03 14:50:13 +08:00
a0049873 b10158ce02 Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-03 14:46:30 +08:00
a0049873 63267ed67e 演示版本 2022-11-03 14:46:20 +08:00
gongjiale e915396532 11.03修改 2022-11-03 14:42:39 +08:00
unknown 9ae72f0b9d 能力盘点弹窗修改 2022-11-03 14:20:51 +08:00
guoyue d21697d3aa 标签化:标签体系构建调整 2022-11-03 09:47:59 +08:00
guoyue 492360166c 能力标签化:样式调整 2022-11-02 16:07:01 +08:00
guoyue a6a7d467e6 Merge branch 'hi-ucs-pre' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-02 15:58:35 +08:00
guoyue a157cc24e7 完成能力标签化--标签目录管理 2022-11-02 15:58:31 +08:00
a0049873 759cc667f6 BUG修改 2022-11-02 15:13:07 +08:00
unknown 9d4aa897ee Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-02 15:02:32 +08:00
unknown 9a5b1732c5 能力盘点系统修改 2022-11-02 15:02:10 +08:00
a0049873 cab45f5558 Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-02 14:34:18 +08:00
a0049873 97e17115c4 能力溯源统计分析 2022-11-02 14:34:01 +08:00
gongjiale 2689f95272 1.完成能力溯源统计分析添加CIS图层弹出框的开发工作 2022-11-02 14:11:59 +08:00
gongjiale 5ecd94df32 三个页面开发 2022-11-02 14:09:42 +08:00
gongjiale ef095da37f Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-02 10:54:31 +08:00
gongjiale 952db84e29 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-02 09:06:27 +08:00
guoyue 14cac6c190 Merge branch 'hi-ucs-pre' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-01 18:06:10 +08:00
guoyue 14813c1f4d 能力标签相关更改 2022-11-01 18:06:00 +08:00
unknown af4ba480cb 系统名称修改 2022-11-01 16:54:38 +08:00
unknown d4d2b06e1d 能力融合系统修改 2022-11-01 16:52:48 +08:00
gongjiale 6eae78fd3b 修改 2022-11-01 16:13:46 +08:00
gongjiale fc74f6a769 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-01 15:55:16 +08:00
gongjiale 27cb8bd7d3 修改 2022-11-01 15:54:53 +08:00
wuhongjian 47ba0c8b14 Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-01 15:37:24 +08:00
wuhongjian c6c2fa57cc 省厅修改 2022-11-01 15:36:50 +08:00
guoyue 5c6ad1a4eb Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-01 15:22:12 +08:00
guoyue 0dc6bb2012 我的待办-能力资源上架,按钮样式调整为统一样式 2022-11-01 15:21:58 +08:00
a0049873 c8813f9688 能力申请添加默认审批意见 2022-11-01 15:00:51 +08:00
a0049873 b755a35565 能力申请加部门名称 2022-11-01 14:59:31 +08:00
a0049873 4281bc5156 后台-能力挂接-组件服务:查不到数据的时候就正常展示暂无数据就可以,没必要这样提示 2022-11-01 10:43:16 +08:00
a0049873 abd89f6eeb Merge branch 'hi-ucs-pre' into release
# Conflicts:
#	back/public/config/basicConfig.js
2022-11-01 09:20:18 +08:00
a0049873 9eba41250e Merge branch 'hi-ucs-dev' into hi-ucs-pre
# Conflicts:
#	back/public/config/basicConfig.js
#	back/src/i18n/zh-CN.js
2022-11-01 09:15:57 +08:00
wuhongjian abc8bf3dd5 省厅版本 2022-10-31 19:00:55 +08:00
gongjiale 61bb1291c2 后台-权限管理-用户管理:去掉多余的操作按钮 2022-10-31 18:10:48 +08:00
gongjiale d130bcf1aa Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-31 17:47:56 +08:00
gongjiale 2156e70433 左侧树修改 2022-10-31 17:47:38 +08:00
guoyue 76a7be9f48 部门管理增加分页功能 2022-10-31 14:56:33 +08:00
gongjiale 511f4690c1 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-31 14:50:38 +08:00
a0049873 3c134e0949 添加查看全部 2022-10-31 14:39:30 +08:00
unknown a680dbaa74 能力挂接菜单修改 2022-10-31 14:15:11 +08:00
guoyue 50c2d6264d renren-admin改为ucs-admin 2022-10-31 14:08:04 +08:00
a0049873 97eaa4e9d2 数字资源能力一本账 2022-10-31 11:41:22 +08:00
guoyue b67fa140cf 能力标签管理 2022-10-31 09:35:52 +08:00