Commit Graph

463 Commits

Author SHA1 Message Date
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
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
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
gongjiale 7e53463eaf 三个页面 2022-10-29 16:26:39 +08:00
unknown dd38eba69b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-28 15:27:07 +08:00
unknown 7e6fb8417a 系统标题修改 2022-10-28 15:25:03 +08:00
guoyue 43bc0dd992 我的统计:修改为日期选择器 2022-10-28 14:57:23 +08:00
a0049873 f837060104 BUG修改 2022-10-27 17:39:40 +08:00
a0049873 140f927763 工作台逻辑修改 2022-10-27 15:03:21 +08:00
guoyue 3e310fb7ea 合并 2022-10-27 14:40:35 +08:00
guoyue a864842957 能力统计:查询按钮样式更改 2022-10-27 14:33:59 +08:00
a0049873 4930027d67 能力上架 新增转办功能 2022-10-27 10:50:09 +08:00
guoyue b61722857d Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-26 19:40:10 +08:00
guoyue 6b509a61d2 后台-能力统计-非明细页面:建议隐藏掉右下角的分页 2022-10-26 19:39:42 +08:00
gongjiale 474292f532 能力上架 2022-10-26 19:10:52 +08:00
gongjiale 98bdfd71f3 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-26 15:06:09 +08:00
gongjiale 4ed1d18cb3 能力统计修改 2022-10-26 15:04:12 +08:00
guoyue 82718e3d02 合并 2022-10-26 15:03:29 +08:00
a0049873 ccebe3d09c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-26 14:49:14 +08:00
a0049873 3ef7da2d6c 金宏网-能力统计:资源申请量,点击跳转时,应该跳转到后台管理的能力统计-能力使用sheet页 2022-10-26 14:49:00 +08:00
a0049873 94a940a1ab 金宏网-能力统计:资源申请量,点击跳转时,应该跳转到后台管理的能力统计-能力使用sheet页 2022-10-26 14:48:37 +08:00
gongjiale c6313796bb 修改能力统计分页查询问题 2022-10-26 14:47:08 +08:00
a0049873 42b7ec1129 BUG修改 2022-10-26 14:35:32 +08:00
guoyue f93550990f 用户管理-区域搜索:输入框设置为只读 2022-10-26 14:05:05 +08:00
guoyue 76e1fb7e1b 后台管理--隐藏切换语言按钮 2022-10-26 11:07:08 +08:00