Commit Graph

623 Commits

Author SHA1 Message Date
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
caoqianming f54a17b641 安全清单文档 2021-05-23 21:42:48 +08:00
caoqianming 646bed55c9 安全清单完成 2021-05-23 21:04:26 +08:00
caoqianming ad2ff3bdda 安全清单model 2021-05-22 23:06:49 +08:00
caoqianming 063d4b2ce9 Merge https://e.coding.net/ctcdevteam/safesite 2021-05-19 22:52:55 +08:00
caoqianming c9c7ce6067 多标签页完成 2021-05-19 22:52:03 +08:00
caoqianming 96d60bf2d4 多tab页完成 2021-05-19 21:54:58 +08:00
caoqianming 268d47c267 增加tab页,不过有很多问题 2021-05-18 22:01:35 +08:00
caoqianming cca66d26c3 异常记录可指定提交人 2021-05-15 20:46:51 +08:00
caoqianming 161bc107d0 Merge https://e.coding.net/ctcdevteam/safesite 2021-05-13 07:13:08 +08:00
caoqianming cd19746949 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-05-12 16:12:57 +08:00
caoqianming 11d40cba05 隐患导入 整改人 deletemark 2021-05-12 16:12:42 +08:00
caoqianming 87a983ce5e Merge https://e.coding.net/ctcdevteam/safesite 2021-05-09 22:06:23 +08:00
caoqianming 74be0b6f03 增加违章举报功能 2021-05-09 21:14:04 +08:00
caoqianming 6e227123d9 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2021-05-08 17:09:39 +08:00
caoqianming 0c8969dac6 增加offence页面 2021-05-08 17:09:32 +08:00
caoqianming 93f22564b6 新增违章举报菜单 2021-05-07 22:06:48 +08:00
caoqianming d8097d9d9d Merge https://e.coding.net/ctcdevteam/safesite 2021-05-06 22:01:01 +08:00
caoqianming 694a9411d7 异常处理新增查询 2021-05-06 21:48:19 +08:00
caoqianming 1b9d40e6df 正在整改中可查看详情 2021-05-06 21:12:04 +08:00
caoqianming 16e8a35582 Merge https://e.coding.net/ctcdevteam/safesite 2021-04-18 23:06:40 +08:00