Commit Graph

610 Commits

Author SHA1 Message Date
caoqianming 33b8f17e99 Merge https://e.coding.net/ctcdevteam/safesite 2021-12-20 00:04:06 +08:00
caoqianming 9efdff2d3a 作业审批驳回功能 2021-12-19 23:58:31 +08:00
caoqianming f4313eada2 Merge https://e.coding.net/ctcdevteam/safesite 2021-11-11 08:20:02 +08:00
caoqianming 06d358c568 设备导入bug 2021-11-10 09:53:52 +08:00
caoqianming 68b2e848f2 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-11-10 09:22:57 +08:00
caoqianming a2fe0f0c85 导入设备xlsx格式 2021-11-10 09:22:44 +08:00
caoqianming e644a285c6 Merge https://e.coding.net/ctcdevteam/safesite 2021-10-06 23:28:07 +08:00
caoqianming b443edc7c4 watchtime 2021-10-06 23:26:13 +08:00
caoqianming 72ebcb1848 Merge https://e.coding.net/ctcdevteam/safesite 2021-10-06 22:13:55 +08:00
caoqianming 1919e93124 增加companyinfo 2021-10-06 22:13:30 +08:00
caoqianming 7555d6f8e9 环保管理预测 2021-10-06 17:32:26 +08:00
caoqianming 0856a2da76 Merge https://e.coding.net/ctcdevteam/safesite 2021-09-29 21:23:33 +08:00
caoqianming fe38607d04 关联考试 2021-09-29 20:43:23 +08:00
caoqianming 85c20e32e1 Merge https://e.coding.net/ctcdevteam/safesite 2021-09-05 22:16:43 +08:00
caoqianming d62c484c32 导出检查记录excel 2021-09-05 17:40:02 +08:00
caoqianming cd300971eb Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-09-04 22:36:31 +08:00
caoqianming 82c123ba76 导出检查记录详情word 2021-09-04 22:36:20 +08:00
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