Commit Graph

493 Commits

Author SHA1 Message Date
caoqianming 6106871358 Merge https://e.coding.net/ctcdevteam/safesite 2021-08-27 18:35:51 +08:00
caoqianming 3431b467ff 检查表zgtime 2021-08-27 16:36:05 +08:00
caoqianming 943bcd0485 Merge https://e.coding.net/ctcdevteam/safesite 2021-08-27 12:21:25 +08:00
caoqianming 6286871195 pc端页面调整 2021-08-27 12:20:34 +08:00
caoqianming fef0eb1637 检查时间段非必填 2021-08-27 10:40:02 +08:00
caoqianming fee7fb830d Merge https://e.coding.net/ctcdevteam/safesite 2021-08-26 22:44:21 +08:00
caoqianming 8639e4eae5 检查时间段调整完毕 2021-08-26 22:43:53 +08:00
caoqianming 4418289bbe Merge https://e.coding.net/ctcdevteam/safesite 2021-08-26 22:35:23 +08:00
caoqianming d74cd4ae28 修改检查任务增加结束时间 2021-08-26 08:11:29 +08:00
caoqianming 836c76883f Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-08-25 07:56:17 +08:00
caoqianming 523cd6b3fb 增加检查结束时间 2021-08-25 07:55:47 +08:00
caoqianming 147596f4e7 Merge https://e.coding.net/ctcdevteam/safesite 2021-07-28 23:09:22 +08:00
caoqianming 9706bd0c43 合理化建议查询和导出不一致 2021-07-27 08:35:04 +08:00
caoqianming c36e42dc70 更新doc 2021-07-26 17:08:05 +08:00
caoqianming 3e84c6a85c 带图片隐患导出提升到500 2021-07-12 09:08:43 +08:00
caoqianming 226f9051f0 Merge https://e.coding.net/ctcdevteam/safesite 2021-07-11 22:45:59 +08:00
caoqianming fdeec7438a bug修复 2021-07-11 22:45:14 +08:00
caoqianming 89d29f0b7f Merge https://e.coding.net/ctcdevteam/safesite 2021-07-11 22:28:35 +08:00
caoqianming 81a92d362c bug修复 2021-07-11 18:06:44 +08:00
caoqianming 73ce4d8118 导出无图隐患列表 2021-07-11 16:58:26 +08:00
caoqianming 8d5b4546e6 Merge https://e.coding.net/ctcdevteam/safesite 2021-07-10 22:37:09 +08:00
caoqianming b9a3b9cf58 应急预案与个人绩效关联查询 2021-07-10 22:36:08 +08:00
caoqianming eac5e81049 Merge https://e.coding.net/ctcdevteam/safesite 2021-07-08 16:12:59 +08:00
caoqianming 90fd3d011d Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-07-08 16:11:58 +08:00
caoqianming 9df11eb16d menutree 获取有误 2021-07-08 16:10:53 +08:00
caoqianming b995497a97 增加应急预案表 2021-07-06 22:02:22 +08:00
caoqianming 551d8426b7 Merge https://e.coding.net/ctcdevteam/safesite 2021-07-05 14:17:38 +08:00
caoqianming 8685e42241 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-07-05 14:13:56 +08:00
caoqianming 8e8d6f8514 导入设备bug 2021-07-05 14:13:47 +08:00
caoqianming 29a37943ef Merge https://e.coding.net/ctcdevteam/safesite 2021-07-04 21:55:55 +08:00
caoqianming 3de9d6f2e9 合理化建议增加查询条件 2021-07-04 21:54:48 +08:00
caoqianming aec6ddeb3a Merge https://e.coding.net/ctcdevteam/safesite 2021-06-23 22:13:19 +08:00
caoqianming 919b4caec7 Merge https://e.coding.net/ctcdevteam/safesite 2021-06-23 22:11:48 +08:00
caoqianming 69e61000ac 导入用户成功重新刷新tab 2021-06-23 21:17:22 +08:00
caoqianming b95b1391cb 创建用户赋权 2021-06-23 08:45:51 +08:00
caoqianming 0264cb3cb4 Merge https://e.coding.net/ctcdevteam/safesite 2021-06-05 22:45:26 +08:00
caoqianming a8bd695339 违章举报详情图片不显示bug 2021-06-05 21:18:36 +08:00
caoqianming 9de9b9fe31 Merge https://e.coding.net/ctcdevteam/safesite 2021-06-02 22:47:30 +08:00
caoqianming b4969688eb 通知富文本问题修正完毕 2021-06-02 22:47:03 +08:00
caoqianming a4fa07d264 Merge https://e.coding.net/ctcdevteam/safesite 2021-06-02 22:34:50 +08:00
caoqianming 05e50de53b 解决冲突 2021-05-31 13:49:30 +08:00
caoqianming 170ef3da2a 公告通知富文本框 2021-05-31 13:47:41 +08:00
caoqianming b0830e7406 Merge https://e.coding.net/ctcdevteam/safesite 2021-05-26 22:00:30 +08:00
caoqianming 65384660d9 groupuser type3 不刷新datagrid 2021-05-26 22:00:04 +08:00
caoqianming 6ad4320bce Merge https://e.coding.net/ctcdevteam/safesite 2021-05-26 21:54:15 +08:00
caoqianming 23b83d57d8 grouptype3 搞定 2021-05-26 21:46:17 +08:00
caoqianming 705bf13343 删除grouptype3 2021-05-26 16:20:42 +08:00
caoqianming 2d6f49e8c8 Merge https://e.coding.net/ctcdevteam/safesite 2021-05-24 23:01:18 +08:00
caoqianming fbdacce0b5 修改违章举报bug 2021-05-24 22:59:58 +08:00
caoqianming 1dacb3dc7a Merge https://e.coding.net/ctcdevteam/safesite 2021-05-23 22:22:02 +08:00