Commit Graph

565 Commits

Author SHA1 Message Date
a0049873 872227b425 能力统计样式 2022-11-11 09:48:13 +08:00
a0049873 bddd6c159c 应用资源以及组件服务导出功能 2022-11-10 15:34:47 +08:00
a0049873 f45b2c6331 置顶BUG修改 2022-11-10 15:08:53 +08:00
a0049873 b707337c4f 后端更新包更新 2022-11-10 09:04:13 +08:00
lizhicheng2 de21518dbd 部门增加按名称模糊查询 2022-11-08 18:01:20 +08:00
a0049873 7ba6767cda 能力挂接 组件服务 置顶功能 2022-11-08 17:16:19 +08:00
lizhicheng2 8c682e819d 能力挂接-数据资源按钮缺少样式 2022-11-07 17:58:03 +08:00
lizhicheng2 45b6b64216 去掉新增部门区划默认值0 2022-11-04 14:23:44 +08:00
gongjiale 2e7131ad14 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-04 13:59:57 +08:00
gongjiale 0f479dfec4 问题修改 2022-11-04 13:59:28 +08:00
lizhicheng2 bfaac75b43 会客厅description最大字符限制修改 2022-11-04 13:52:59 +08:00
a0049873 a0aa8a8ffc BUG修改 2022-11-04 10:30:50 +08:00
gongjiale d88430ec93 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-04 09:05:11 +08:00
guoyue c8d315934a 基础设施,左侧树增加tips显示 2022-11-03 17:58:46 +08:00
guoyue 3e1ff71686 删除增加二次确认 2022-11-03 17:58:28 +08:00
gongjiale 7b334a0224 修改 2022-11-03 17:43:41 +08:00
unknown c53f72be5e 赋能按钮列表错乱修改 2022-11-03 10:03: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
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
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
guoyue 50c2d6264d renren-admin改为ucs-admin 2022-10-31 14:08:04 +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
guoyue 4c77943db2 后台管理:隐藏切换主题颜色按钮 2022-10-26 11:03:51 +08:00
guoyue c65dac78ea 后台站内--通知管理:消息列表增加消息内容 2022-10-26 10:59:47 +08:00
guoyue 02925c3282 后台管理—能力统计,导出 按钮样式更改 2022-10-26 10:26:36 +08:00
guoyue e4437ac420 fix: 能力运行监控:API异常分析 清楚初始化数据 2022-10-24 16:18:43 +08:00
guoyue f6eca9013c fix:后台-权限管理-用户管理--外面的搜索框点重置后,搜索框内内容还存在 2022-10-24 14:29:56 +08:00
guoyue 49b41ce8e6 修复后台-权限管理-用户管理:搜索bug 2022-10-22 14:29:43 +08:00
a0049873 bd036feee2 转办功能开发 2022-10-21 16:13:01 +08:00
gongjiale ec1f832617 能力上架 2022-10-21 10:08:50 +08:00
gongjiale a9aef58f6c Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-21 09:39:15 +08:00
gongjiale 002cbdd6f0 修改能力上架 2022-10-21 09:39:00 +08:00
a0049873 1e855be058 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	back/src/views/modules/myAgent/demo/competency-application.vue
2022-10-21 09:31:33 +08:00
a0049873 82f007aa40 流转功能 2022-10-21 09:31:00 +08:00
gongjiale 30a8641929 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-20 19:56:56 +08:00
gongjiale 5d0a02a364 修改能力上架统计 2022-10-20 19:56:43 +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 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 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
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
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