wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity
166 Commits
2 Branches
0 Tags
23 MiB
Commit Graph

166 Commits (a42da670f06b44cb2377546a3a05a88a112ebe4d)

Author SHA1 Message Date
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
dearlin 307b9fcc4d 电子围栏必选,电子围栏区域名称 必填项 2024-01-30 15:24:17 +08:00
dearlin 253e5ae799 电子围栏 2024-01-30 15:22:17 +08:00
LiuJiaNan 71eea9850c init 2024-01-29 17:43:23 +08:00
dearlin 3e489b86f3 Merge remote-tracking branch 'origin/dev' into dev 2024-01-29 17:35:26 +08:00
dearlin aa5c41e8ba bi页人员定位，ai视频分析完成 2024-01-29 17:35:09 +08:00
LiuJiaNan 47b58382ab init 2024-01-27 17:41:00 +08:00
LiuJiaNan 07eb6d8306 init 2024-01-26 18:04:18 +08:00
LiuJiaNan 7724a93c30 init 2024-01-26 16:16:02 +08:00
dearlin 04f28b4acc ai视频报警 2024-01-26 15:52:00 +08:00
LiuJiaNan 41f08a759e init 2024-01-26 10:24:28 +08:00
chenxinying bd76ab2a39 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/asyncRouter.js
 2024-01-26 08:59:59 +08:00
zhangqihang ca7eadbb19 重点工程（不包括AI报警和视频监控） 2024-01-25 18:05:58 +08:00
LiuJiaNan 3c06405a40 init 2024-01-25 18:00:08 +08:00
chenxinying 486fea5b03 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/asyncRouter.js
 2024-01-25 17:54:39 +08:00
dearlin 659469ec58 清单检查要有电子围栏禁止排查 2024-01-25 17:35:13 +08:00
dearlin f7859bdb34 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:22:20 +08:00
dearlin 53b63fabc1 人员与辨别部位对接第三方 2024-01-25 14:22:04 +08:00
鲁洪霞 b8006fa5ec 样式修改 2024-01-25 11:35:41 +08:00
鲁洪霞 919644d1dd 样式修改 2024-01-25 11:23:48 +08:00
鲁洪霞 added38399 BI页面 2024-01-25 10:28:53 +08:00