Commit Graph

236 Commits (8d91edbab0821dced4d145eed6b00e9dc0543bca)

Author SHA1 Message Date
chenxinying 47da726664 排查計劃 2024-02-04 17:06:41 +08:00
chenxinying 284407c8f9 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 17:05:38 +08:00
dearlin 07f2a683b5 清单排查 2024-02-04 17:00:00 +08:00
LiuJiaNan 2da5e720d3 init 2024-02-04 16:18:49 +08:00
LiuJiaNan c91e38adb9 init 2024-02-04 14:06:09 +08:00
zhangyanli 35d912e707 隐患排查清单管理 2024-02-04 14:03:35 +08:00
zhangyanli 76af1d175e 隐患排查清单管理 2024-02-04 14:02:30 +08:00
dearlin f5690e4056 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 13:56:34 +08:00
dearlin 1b06549a31 清单排查 2024-02-04 13:56:28 +08:00
LiuJiaNan 55a5470adc init 2024-02-04 13:50:28 +08:00
dearlin 2dfe2e9ee7 隐患清单排查状态变更 2024-02-04 11:42:56 +08:00
chenxinying 1ed77eabd0 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 11:09:47 +08:00
fangjiakai ecf918bc38 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:16:51 +08:00
fangjiakai 0a52cca78b 地图电子围栏 2024-02-04 09:16:40 +08:00
chenxinying 9b4fc4fa0d Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:10:58 +08:00
zhangyanli c950b86ceb 路由 2024-02-04 09:00:23 +08:00
zhangyanli 592d8716ab 隐患排查检查清单 2024-02-04 08:55:43 +08:00
dearlin a1eca8d05d 地图相关展示默认值为0,清单检查情况完善隐患排查清单 2024-02-04 08:50:52 +08:00
LiuJiaNan eb43ac1e95 init 2024-02-03 18:00:44 +08:00
zhangqihang baca47e4cf 重点工程 2024-02-03 17:56:17 +08:00
chenxinying 3097645a25 刪除清單管理隱患排查清單 2024-02-03 17:04:07 +08:00
fangjiakai f0a6339a7d 添加隐患发现部门 2024-02-03 15:55:45 +08:00
LiuJiaNan 4ee2018f16 init 2024-02-03 14:07:23 +08:00
chenxinying fe685942cf Merge remote-tracking branch 'origin/dev' into dev 2024-02-03 14:02:34 +08:00
chenxinying ff680ec1de 刪除清單管理 2024-02-03 14:02:14 +08:00
dearlin f4b61c1003 bi页统计数值默认0,ai视频分所有摄像头扎点 2024-02-03 11:37:05 +08:00
fangjiakai f4490f70b7 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/request/map.js
#	src/views/BI/components/bottom_options.vue
#	src/views/BI/js/map.js
2024-02-03 10:19:12 +08:00
fangjiakai c6eec67e71 作业票地图显示 2024-02-03 10:17:02 +08:00
dearlin 0a53421386 Merge remote-tracking branch 'origin/dev' into dev 2024-02-03 09:43:12 +08:00
dearlin c9e14d6fcf 八项作业摄像头播放相关 2024-02-03 09:42:50 +08:00
chenxinying 8c7cb413fe 八项作业受限空间和高处作业PC端显示 2024-02-03 08:46:43 +08:00
chenxinying d699e3472f Merge remote-tracking branch 'origin/dev' into dev 2024-02-02 14:09:20 +08:00
chenxinying f6d550ab3e 受限空间,高处作业 2024-02-02 14:08:57 +08:00
fangjiakai 998b8413b7 Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 17:38:58 +08:00
fangjiakai 6fdd4126c5 取消地图entity贴地限制 2024-02-01 17:38:43 +08:00
LiuJiaNan 2324d1110d init 2024-02-01 17:37:47 +08:00
zhangyanli 5ea9fb929d 隐患排查批量删除 2024-02-01 16:41:45 +08:00
zhangyanli e24a7c48aa 隐患排查清单 2024-02-01 15:35:37 +08:00
fangjiakai 92e98ffa1b Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 15:06:35 +08:00
fangjiakai 7a55d48a18 BI地图页 动火作业标点 2024-02-01 15:05:31 +08:00
LiuJiaNan 632b540938 init 2024-02-01 08:21:01 +08:00
dearlin 42a75014e0 辨别部位里电子围栏名称字段修改 2024-01-31 17:19:49 +08:00
LiuJiaNan 6884d11144 init 2024-01-31 16:57:16 +08:00
LiuJiaNan 440a1bd252 init 2024-01-31 16:44:17 +08:00
LiuJiaNan 62798bee5f init 2024-01-31 15:38:40 +08:00
fangjiakai a643da6979 BI地图页 2024-01-31 09:18:20 +08:00
fangjiakai b45a400b91 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/BI/components/work_safely.vue
#	src/views/BI/index.vue
2024-01-31 09:05:24 +08:00
fangjiakai fdc7d02735 BI地图页 2024-01-31 09:03:02 +08:00
LiuJiaNan 9169935d67 init 2024-01-30 17:36:49 +08:00
dearlin 11d8a5f2e6 辨别部位里电子围栏名称字段修改 2024-01-30 15:41:48 +08:00