Commit Graph

651 Commits

Author SHA1 Message Date
shijing 517a91a93b bind 2022-09-05 10:48:11 +08:00
曹前明 4aefa086e6 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-02 17:15:12 +08:00
曹前明 188f3ab2e7 fire页面采用选人组件 2022-09-02 17:14:55 +08:00
shijing b4664383fb Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-01 11:21:54 +07:00
shijing 1de0ea6f83 0831 2022-09-01 11:21:32 +07:00
曹前明 50a17fbd1d 同步设备后的刷新按钮 2022-09-01 11:04:36 +08:00
shijing 4f05f6f460 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-31 14:58:46 +07:00
shijing 4c49964283 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-31 14:55:00 +07:00
shijing 9ea3cb58a9 change 2022-08-31 14:54:53 +07:00
曹前明 44d836cc79 router修改 2022-08-31 14:55:43 +08:00
曹前明 f81f1c17d3 工单界面修改包括工单日志等 2022-08-31 14:54:44 +08:00
shijing 8c8eeeda69 mapChange 2022-08-26 17:27:37 +07:00
shijing 2d3b9fa8fe weizhibiaoji 2022-08-26 17:21:29 +07:00
曹前明 ceb9365bc4 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-26 16:24:35 +08:00
曹前明 96bdd862c1 喇叭设备同步 2022-08-26 16:24:25 +08:00
shijing 92f92f7ab2 routerChange 2022-08-23 19:21:36 +07:00
shijing a96b91702f reSet 2022-08-23 19:09:50 +07:00
曹前明 e03113f25a 修改gitignore 2022-08-23 17:16:00 +08:00
曹前明 d709b41bf1 去除文件追踪 2022-08-23 17:15:06 +08:00
shijing 334625e90b logoChange 2022-08-23 15:59:00 +07:00
曹前明 55f821cc03 fix conflict 2022-08-18 18:12:10 +08:00
曹前明 f27fe96fb2 algo修改 2022-08-18 18:10:48 +08:00
shijing 413cad098a Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-18 17:28:15 +08:00
shijing 0c55e47cf7 关闭监控后停止资源加载 2022-08-18 17:28:06 +08:00
曹前明 c57921f340 算法布设修改 2022-08-12 11:20:33 +08:00
shijing 4bc5a7733b Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-11 17:13:50 +08:00
shijing d846e8d6ef iconChange 2022-08-11 17:13:45 +08:00
曹前明 8e18267da6 增加打卡记录页 2022-08-11 09:44:02 +08:00
曹前明 c24f736937 首页安卓app下载地址 2022-08-08 13:23:17 +08:00
曹前明 fdbcd2c634 首页安卓app下载二维码 2022-08-08 11:16:20 +08:00
曹前明 708a3e42a5 取消上传限制 2022-08-08 10:03:10 +08:00
曹前明 f79b37eae7 apk上传 2022-08-08 08:50:12 +08:00
曹前明 d66242d7de 路由bug 2022-08-05 09:23:41 +08:00
曹前明 8840084ce9 pc界面优化初步完成 2022-08-03 15:33:56 +08:00
曹前明 8ef71cf24e rpm vm 等模块的界面优化 2022-08-03 12:25:27 +08:00
曹前明 f40bee35be 前端页面优化 2022-07-23 19:19:58 +08:00
曹前明 50f025455a fix conflict 2022-07-22 14:24:25 +08:00
曹前明 48e83cc4fa 事件页面美化调整 2022-07-22 14:22:42 +08:00
shijing 03842ca8e9 按钮调整 2022-07-22 14:12:44 +08:00
shijing 243e29568e 动火作业工作流测试 2022-07-22 14:02:33 +08:00
shijing 8df5338155 zuoyepiaoguanbi&role 2022-07-22 10:55:15 +08:00
2309368887@qq.com 117617a026 anniuquanxian 2022-07-22 09:00:37 +08:00
2309368887@qq.com 0d114bf349 tijiao 2022-07-21 16:40:28 +08:00
2309368887@qq.com 23ec1dfc38 anniuquanxain 2022-07-21 16:05:09 +08:00
shijing 70533ed872 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-21 16:01:09 +08:00
shijing ca5084d20a d3&workflow 2022-07-21 16:01:01 +08:00
曹前明 9f2f00f98e 首页样式调整 2022-07-21 00:33:21 +08:00
曹前明 d9d647af43 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 17:08:20 +08:00
曹前明 5b9b8b72dc 首页样式调整 2022-07-18 17:08:13 +08:00
shijing cbb1920724 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 16:50:04 +08:00
shijing 331de979f3 fireWorkTick 2022-07-18 16:49:58 +08:00
曹前明 eccf3892f9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 16:11:21 +08:00
2309368887@qq.com ecb23db22e Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 14:51:28 +08:00
曹前明 a5dac1fff9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 14:46:49 +08:00
曹前明 be62ebc37a 修改state 2022-07-18 14:46:44 +08:00
shijing 10d8beadcb Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 14:35:50 +08:00
shijing ed771eab5b ticketDetail 2022-07-18 14:35:44 +08:00
2309368887@qq.com 63eddd40fe Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 11:22:36 +08:00
2309368887@qq.com df0d48418f 按钮权限配置 2022-07-18 11:22:17 +08:00
曹前明 7a7e8d7066 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 11:16:39 +08:00
曹前明 21434b4ef8 v auth 2022-07-18 11:16:32 +08:00
2309368887@qq.com b3c432c35d 员工岗位修改 2022-07-18 09:59:46 +08:00
2309368887@qq.com 4e3da40fdb caidanquanxian 2022-07-18 09:24:05 +08:00
2309368887@qq.com 72b64fcddd caidanpeiquan 2022-07-18 08:57:58 +08:00
shijing 7d732d68c2 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 08:36:07 +08:00
shijing 973a92fd25 ticketDetail 2022-07-18 08:35:57 +08:00
曹前明 5d492ff497 页面效果调整 2022-07-18 01:19:44 +08:00
曹前明 759e87d621 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-16 02:07:19 +08:00
曹前明 0e1c21710a sctable 修改 外加样式调整 2022-07-16 02:07:10 +08:00
shijing 90f9fcc2ca Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 17:16:14 +08:00
shijing 14ef127744 rpjdetail 2022-07-15 17:16:08 +08:00
曹前明 ea1cffeff6 route 修改 2022-07-15 17:01:57 +08:00
曹前明 5d89acd012 路由配置解决 2022-07-15 16:37:53 +08:00
2309368887@qq.com dc9b3aaa08 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 14:27:38 +08:00
2309368887@qq.com 940f5da05a tubiaojicaidan 2022-07-15 14:27:30 +08:00
shijing af4a575139 workflowstate&rpj 2022-07-15 12:44:01 +08:00
shijing 3f939338bd Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 08:46:11 +08:00
shijing e80dcecc39 rparty 2022-07-15 08:46:01 +08:00
2309368887@qq.com e2470b42e7 jiekou 2022-07-14 10:24:43 +08:00
2309368887@qq.com a1e652a8fe Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-14 09:06:59 +08:00
2309368887@qq.com d466be638a xiala 2022-07-14 09:06:44 +08:00
shijing aa44a69c4f ticket&component 2022-07-14 09:04:55 +08:00
shijing 490c0e489d ticket&component 2022-07-14 09:02:15 +08:00
曹前明 6e316c9fd2 perms存权限列表 2022-07-14 07:47:10 +08:00
2309368887@qq.com 90e1ffdbf3 shouye 2022-07-13 17:27:32 +08:00
shijing b2d50e536a Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-12 13:52:08 +08:00
shijing 9ce7a254bd 0712 2022-07-12 13:52:02 +08:00
2309368887@qq.com 67a9c88fa0 tijiao 2022-07-12 13:50:04 +08:00
2309368887@qq.com 32e3b828b9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-12 11:00:58 +08:00
2309368887@qq.com 8ebf1d4e31 gongdan 2022-07-12 11:00:46 +08:00
shijing 0231e6ce32 thirdlogs&blt 2022-07-11 17:01:43 +08:00
shijing d4b72069f2 clearConsolelogs 2022-07-11 14:13:48 +08:00
shijing cfd0f4df95 track&bindblt 2022-07-11 13:35:17 +08:00
shijing 01084c4f5b Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-08 17:11:51 +08:00
shijing 54ea10290c personmove 2022-07-08 17:11:45 +08:00
2309368887@qq.com e54616b53a jibenxinix 2022-07-08 17:03:09 +08:00
2309368887@qq.com 4349b634dd Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-08 16:31:00 +08:00
2309368887@qq.com f026024b5f jibenxinxi 2022-07-08 16:30:51 +08:00
shijing 25e0cb4b13 0707 2022-07-07 18:56:48 +08:00
shijing 459636e5b0 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 16:14:43 +08:00