Commit Graph

418 Commits

Author SHA1 Message Date
wuhongjian 5deb9a3826 Merge branch 'hi-ucs-dev' into release 2022-10-20 16:20:24 +08:00
wuhongjian 1a96e4e6a2 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-20 16:16:44 +08:00
wuhongjian 1f3116f402 开启gzip 2022-10-20 16:15:59 +08:00
a0049873 188d9bb85a 流程管理员 2022-10-20 15:03:44 +08:00
a0049873 6a6d1fc473 代码格式 2022-10-20 14:52:43 +08:00
a0049873 04ad7eb6ed BUG修改 2022-10-20 14:51:16 +08:00
a0049873 fe1f6dc08d 新增委托功能 2022-10-20 14:51:02 +08:00
a0049873 c6429869a4 BUG修改 2022-10-20 09:38:28 +08:00
guoyue 4e271b6aa7 合并冲突 2022-10-19 13:55:49 +08:00
guoyue 4d59133942 后台管理-能力统计-明细-添加分页功能 2022-10-19 13:41:02 +08:00
a0049873 e6a102ce3f 添加隐藏空数据功能 2022-10-19 11:32:09 +08:00
a0049873 d3466d4521 调整列表高度 2022-10-18 19:42:57 +08:00
wuhongjian 2258b05184 bug修复 2022-10-18 17:44:46 +08:00
wuhongjian 6784514ec5 bug修复 2022-10-18 17:43:58 +08:00
wuhongjian 0a2a081a28 Merge branch 'hi-ucs-dev' into release 2022-10-18 15:49:57 +08:00
wuhongjian 107e6205a2 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-18 15:48:40 +08:00
wuhongjian 8e6fac427b 菜单栏bug修复 2022-10-18 15:48:34 +08:00
a0049873 c41028ffaa 能力统计导出功能 2022-10-18 15:42:53 +08:00
wuhongjian a139bd809b bug修复 2022-10-18 15:35:14 +08:00
wuhongjian b13577d4b4 bug修复 2022-10-18 15:34:46 +08:00
wuhongjian 8e89d8d1b0 Merge branch 'hi-ucs-dev' into release 2022-10-18 15:24:25 +08:00
wuhongjian e96c0c11b1 bug修复 2022-10-18 15:23:33 +08:00
wuhongjian 3f6e432d0b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-18 15:15:41 +08:00
wuhongjian 811e80a27c bug修复 2022-10-18 15:14:50 +08:00
unknown 71041b60f2 申请审批完成后待办任务数不刷新问题 2022-10-18 15:10:01 +08:00
guoyue adf964a400 能力申请:有附件的时候提供附件下载功能 2022-10-17 16:01:03 +08:00
guoyue 8db5b8bee5 西海岸:设备审批 增加审核时间和创建时间 2022-10-17 16:00:37 +08:00
guoyue b66a781b81 我的待办:设备审批增加 设备名称显示字段 2022-10-17 14:39:29 +08:00
unknown f20aac7430 数组对象监控属性修改 2022-10-17 13:48:23 +08:00
unknown e26937bc37 穿梭框重写 2022-10-17 13:38:46 +08:00
gongjiale 2484cda43d 1.完成能力统计-能力上架统计:查看详情,任务开始时间、任务结束时间不转行;
2.完成能力统计-能力上架统计:搜索条件中的状态和列表中的状态请保持一致
2022-10-14 15:39:18 +08:00
wuhongjian 502068705b Merge branch 'hi-ucs-dev' into release 2022-10-14 11:24:10 +08:00
unknown 9243c94e8d 穿梭框搜索修改 2022-10-13 21:35:46 +08:00
unknown 5ec0d81181 组件服务修改 2022-10-13 20:11:01 +08:00
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