Commit Graph

778 Commits

Author SHA1 Message Date
shijing 13bca8732e Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-14 15:32:06 +08:00
shijing 2cf1412f79 littleChange 2022-09-14 15:31:47 +08:00
曹前明 be537d884f Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-13 20:18:32 +08:00
曹前明 ea7c1defe2 area最大最小人员数 2022-09-13 20:18:28 +08:00
shijing 051526c243 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-13 18:52:56 +08:00
shijing 541627b9b5 eventDetail 2022-09-13 18:52:50 +08:00
曹前明 5c540505fb 播放次数最小一次 2022-09-13 17:38:03 +08:00
曹前明 60a352aec8 event vue 修改 2022-09-13 11:17:37 +08:00
曹前明 84839deeb0 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-12 21:17:26 +08:00
曹前明 1e76b8ee46 修改event 2022-09-12 21:17:19 +08:00
shijing 849dee3e4a newMap 2022-09-12 14:33:27 +08:00
shijing 1ed6787310 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-08 10:50:57 +07:00
shijing 2daa22557b 0907 2022-09-08 10:50:50 +07:00
曹前明 cd07f46cb9 账户管理增加type编辑 2022-09-07 18:34:08 +08:00
曹前明 b29f3cc295 增加筛选条件 2022-09-07 16:46:08 +08:00
曹前明 d81a6c77c8 user 界面显示岗位 2022-09-07 14:48:12 +08:00
曹前明 986c09bc22 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-07 10:17:21 +08:00
曹前明 38a3d10117 增加回车检索 2022-09-07 10:17:12 +08:00
shijing 56154669b9 0906 2022-09-07 09:37:56 +08:00
曹前明 8fca5caaa8 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-06 17:19:25 +08:00
曹前明 e36c5b43e3 blt sync bug 2022-09-06 17:19:15 +08:00
shijing 3b96be33e2 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-06 17:07:08 +08:00
shijing 339f8033cd change 2022-09-06 17:07:01 +08:00
曹前明 f9868d0494 首页修改 2022-09-06 15:51:06 +08:00
曹前明 1a1d809fe3 wf state getusers 2022-09-06 10:18:44 +08:00
shijing a87f529fe8 route 2022-09-05 11:19:39 +08:00
shijing 729260cf37 bind 2022-09-05 10:50:43 +08:00
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
shijing 6e154680b2 locationBind 2022-07-07 16:14:35 +08:00
2309368887@qq.com aacd5be780 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 15:35:45 +08:00
2309368887@qq.com 980e05edc7 xiala 2022-07-07 15:35:23 +08:00
曹前明 cf35dad763 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 15:32:48 +08:00
曹前明 01e243fb23 工单demo 2022-07-07 15:32:40 +08:00
2309368887@qq.com 65cadaeb54 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:26:50 +08:00
2309368887@qq.com 6865c67dc5 xiala 2022-07-07 14:26:19 +08:00
曹前明 9ca408daf1 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:24:19 +08:00
曹前明 a66e64cf7f 工作流配置基本ok 2022-07-07 14:24:11 +08:00
shijing dec05c1907 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:07:40 +08:00
shijing 773eeaa0dd mapcontroller&userdetail 2022-07-07 14:07:32 +08:00
曹前明 21854cd744 stash 2022-07-07 12:19:13 +08:00
曹前明 a9cde33315 stash 2022-07-07 12:17:24 +08:00
2309368887@qq.com ebcd31833a wodeshijian 2022-07-05 14:13:57 +08:00
2309368887@qq.com 6de230462d xialashijian 2022-07-05 09:14:57 +08:00
shijing 9c88f3f5fb ecm.js 2022-07-04 17:22:12 +08:00
2309368887@qq.com cf9f738a3d Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-04 17:19:10 +08:00
2309368887@qq.com a2204bb4c4 chuliren 2022-07-04 17:18:53 +08:00
shijing b607c75a18 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-04 17:17:18 +08:00
shijing d0fa208280 jsmapChange&bigScreen 2022-07-04 17:17:12 +08:00
2309368887@qq.com 3eaeef63b4 shijian 2022-07-04 13:44:00 +08:00
2309368887@qq.com 3e35f22abc Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 15:44:59 +08:00
2309368887@qq.com 960e42f359 ququanxian 2022-07-01 15:44:48 +08:00
shijing 57f192e39b video 2022-07-01 09:20:10 +08:00
shijing b33043b230 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 09:10:43 +08:00
shijing ca895ffa52 audio 2022-07-01 09:10:35 +08:00
2309368887@qq.com 91d3e47202 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 09:09:50 +08:00
2309368887@qq.com 9d72def8f1 quyu 2022-07-01 09:09:28 +08:00
shijing 623551ceae Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-29 14:26:03 +08:00
shijing fd86f4d520 bigScreen 2022-06-29 14:25:56 +08:00
2309368887@qq.com 8c5306dc09 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-29 10:46:31 +08:00
2309368887@qq.com b86626de20 login 2022-06-29 10:46:22 +08:00
shijing 20546f91cb conf 2022-06-28 14:18:13 +08:00
shijing c3ad6cbac9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-28 13:12:17 +08:00
shijing bd2cf50cfa conftotxt 2022-06-28 13:12:00 +08:00
2309368887@qq.com 862deb2ee3 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-27 10:41:08 +08:00
2309368887@qq.com 839c5c0a02 youxiankongjian 2022-06-27 10:40:55 +08:00
shijing d55a6c1070 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 17:23:07 +08:00
shijing 68bffb0d14 area 2022-06-25 17:23:00 +08:00
2309368887@qq.com f9ba761143 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 17:22:20 +08:00
2309368887@qq.com 25f000b3e1 donghuozuoye 2022-06-25 17:22:11 +08:00
shijing 93aaa93ce0 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 10:08:24 +08:00
shijing d38bbd7cf0 map 2022-06-25 10:08:19 +08:00
2309368887@qq.com 5115e4023c Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-24 09:19:08 +08:00
2309368887@qq.com 25e9acae47 zuoye 2022-06-24 09:18:18 +08:00
shijing 4a2bb04356 map 2022-06-24 09:12:11 +08:00
shijing 7da24fa7d8 bigScreen 2022-06-23 11:09:09 +08:00
shijing 8efbd85b56 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-23 10:06:34 +08:00
shijing 8a716c7e9e bigScreen 2022-06-23 10:06:16 +08:00
2309368887@qq.com 2039b52b40 zuoyetijiao 2022-06-23 10:04:31 +08:00
2309368887@qq.com 3ae7648954 zuoye 2022-06-23 09:56:25 +08:00
2309368887@qq.com 46b34704d5 zuoye 2022-06-23 09:51:06 +08:00
shijing 1ac0d23016 06222 2022-06-22 16:02:49 +08:00
shijing a0c61a83da woekflow 2022-06-21 18:22:18 +08:00
曹前明 693ce35829 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-21 18:08:36 +08:00
2309368887@qq.com bda5bb2771 xiala 2022-06-21 15:41:19 +08:00
2309368887@qq.com c8b0f21069 xial 2022-06-21 15:38:34 +08:00
shijing 8c17ad4d8d logs 2022-06-21 13:32:36 +08:00
shijing ec6dec9089 dict 2022-06-21 13:04:18 +08:00
曹前明 64bb493494 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-20 18:22:07 +08:00
曹前明 df9a1f38f9 修改system.js 2022-06-20 18:21:58 +08:00
shijing 9269677410 0620 2022-06-20 17:04:38 +08:00
shijing 6182435ce5 0620 2022-06-20 17:03:16 +08:00
曹前明 2fbba87176 处理冲突 2022-06-20 16:44:03 +08:00
曹前明 0a03736775 事件列表页面 2022-06-20 16:34:11 +08:00
shijing 3067a62f00 0620 2022-06-20 09:41:36 +08:00
shijing 940782989b dept 2022-06-17 16:59:39 +08:00
曹前明 b3c99be0fa request修改 2022-06-17 11:07:15 +08:00
曹前明 f7a785e40f request 请求修改 2022-06-17 10:46:01 +08:00
曹前明 5586dea490 scTable resetQuery 2022-06-17 09:01:45 +08:00
曹前明 e0bf4eef82 关闭多标签业 2022-06-17 08:37:16 +08:00
曹前明 b9d06b9832 调整路由1 2022-06-16 17:36:16 +08:00
曹前明 c034317790 table.js 修改 2022-06-16 16:01:35 +08:00