Commit Graph

1584 Commits

Author SHA1 Message Date
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 562c57e783 Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-pre
# Conflicts:
#	front/src/views/newHome/components/Navigation.vue
2022-11-02 14:13:59 +08:00
gongjiale 2689f95272 1.完成能力溯源统计分析添加CIS图层弹出框的开发工作 2022-11-02 14:11:59 +08:00
gongjiale 5ecd94df32 三个页面开发 2022-11-02 14:09:42 +08:00
a0049873 962740bde6 Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-11-02 14:03:53 +08:00
a0049873 ca603957cb 门户需求修改 2022-11-02 14:03:38 +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 e4cdac8bb9 服务详情收藏错误 2022-11-01 18:05:32 +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
a0049873 72229ea4fb 修改城市云脑顺序 2022-11-01 15:35:30 +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 3950122864 全局搜索功能优化 2022-11-01 14:41:17 +08:00
a0049873 33e9cfe960 修改表格宽度 2022-11-01 14:32:01 +08:00
a0049873 2a2eb0fbc3 调换首页应用资源位置 2022-11-01 13:56:55 +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
a0049873 ad6a1c14de BUg修改 2022-10-31 20:23:26 +08:00
a0049873 493151d9f0 BUG修改 2022-10-31 19:45:21 +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
unknown 1ad52d954c bug修改,我的申请 2022-10-31 16:29:19 +08:00
a0049873 15426bccdc 能力申请 应用系统对接 2022-10-31 16:03:12 +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
guoyue 5f155dc69a 更改图片字段 2022-10-31 14:07:39 +08:00
a0049873 97eaa4e9d2 数字资源能力一本账 2022-10-31 11:41:22 +08:00
guoyue b67fa140cf 能力标签管理 2022-10-31 09:35:52 +08:00
guoyue b6f26564c4 后台:能力标签管理 2022-10-31 09:18:49 +08:00
guoyue e0f0365dab Merge branch 'hi-ucs-pre' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-pre 2022-10-29 16:43:22 +08:00
guoyue 4341f143f4 增加能力标签管理 2022-10-29 16:43:17 +08:00
gongjiale 3180324cd2 发布时间 2022-10-29 16:33:42 +08:00