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

235 Commits (2a719a791e58bc441960ed0f34df156b736cd1de)

Author SHA1 Message Date
LiuJiaNan 96b7ae4aaf 历史轨迹 2024-02-21 16:18:58 +08:00
zhangyanli 2530d035c5 隐患治理和清单统计bug修复 2024-02-21 16:14:40 +08:00
wangpeng 91457d22d4 特种作业人员证件临期提醒（迁表） 2024-02-21 11:45:23 +08:00
chenxinying 7e8ac114fe 特种作业人员 2024-02-21 11:18:02 +08:00
fangjiakai f645b8fbe8 八项作业流程图 2024-02-21 10:48:25 +08:00
dearlin 287201927d 人员定位菜单 2024-02-21 10:41:40 +08:00
dearlin 0b5ab067fd 人员定位告警 2024-02-21 10:16:35 +08:00
LiuJiaNan e0450b2e11 更改eslint规则 2024-02-21 09:42:49 +08:00
LiuJiaNan 83dd3a57a9 提示当前路由文件位置 2024-02-21 09:09:20 +08:00
dearlin 480013c3d2 地图上报警信息 2024-02-21 09:04:28 +08:00
wangpeng 2bb72fc628 Merge remote-tracking branch 'origin/dev' into dev 2024-02-21 08:39:34 +08:00
wangpeng f5fda138c3 特种作业人员证件临期提醒 2024-02-21 08:39:20 +08:00
LiuJiaNan 93790e999a element样式 2024-02-21 08:38:23 +08:00
zhangyanli b6bc893c88 隐患排查bug修复 2024-02-20 17:25:15 +08:00
fangjiakai 35efe19638 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 17:03:04 +08:00
fangjiakai a443986e7d 修改流程图 2024-02-20 17:02:53 +08:00
LiuJiaNan 42002585a4 init 2024-02-20 16:39:30 +08:00
LiuJiaNan 6b17aa7db0 BI 2024-02-20 14:57:09 +08:00
fangjiakai 4315877414 修改流程图 2024-02-20 14:29:49 +08:00
zhangqihang 935f7d6c9e 重点工程流程修复 2024-02-20 14:27:37 +08:00
zhangyanli 847b82afbf 隐患查看报错 2024-02-20 13:51:01 +08:00
zhangyanli a42da670f0 查看隐患信息报错 2024-02-20 11:12:06 +08:00
dearlin 450426dff8 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 11:11:00 +08:00
dearlin de4b84b501 安全例会打印 2024-02-20 11:10:49 +08:00
fangjiakai b2e0e1fd9f Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 09:50:26 +08:00
fangjiakai 976d62cfaf 动火作业流程图 2024-02-20 09:50:15 +08:00
dearlin 4a84899838 安全例会，14082bug 2024-02-20 08:39:01 +08:00
zhangqihang 273c90be57 修复bug 2024-02-19 17:05:46 +08:00
dearlin dd91ce3a28 Merge remote-tracking branch 'origin/dev' into dev 2024-02-06 15:40:50 +08:00
dearlin 1744e25b89 安全例会 2024-02-06 15:40:39 +08:00
chenxinying bd6d6d2947 Merge remote-tracking branch 'origin/dev' into dev 2024-02-06 15:39:52 +08:00
chenxinying 6df7f671c4 查看验收视频 2024-02-06 15:39:39 +08:00
zhangyanli 9a6b2ea3a0 bug修复 2024-02-06 14:27:22 +08:00
zhangyanli 6dcd12b952 bug修复 2024-02-06 09:15:44 +08:00
zhangyanli 91f0d30d74 删除清单管理bug修复 2024-02-05 16:22:46 +08:00
LiuJiaNan f3fe3cf185 init 2024-02-05 15:56:25 +08:00
dearlin dfc19df839 安全隐患清单检查标准的bug问题 2024-02-05 15:20:30 +08:00
dearlin 357924a7c0 操作类型是选择的，点合格后上传照片，检查结果变空了。 
操作类型是填写，点合格后最好是把合格项数据传过来。
 2024-02-05 14:52:00 +08:00
zhangyanli 855daed2ab bug修复 2024-02-05 14:29:54 +08:00
zhangqihang 065523c0aa 路由修改 2024-02-05 14:18:39 +08:00
LiuJiaNan aefcd3d4e3 init 2024-02-05 14:12:24 +08:00
dearlin 34dd98ed80 批量打印清单 2024-02-05 11:48:29 +08:00
LiuJiaNan 3fbaa951bd init 2024-02-05 10:18:41 +08:00
LiuJiaNan 0bed8dcef9 init 2024-02-05 10:11:12 +08:00
fangjiakai aade1f3c01 Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 09:28:04 +08:00
fangjiakai 4a56fab4d8 地图改为天地图 2024-02-05 09:27:49 +08:00
zhangyanli 4e3d69b9e4 导入 2024-02-04 17:39:17 +08:00
dearlin 375b8ed5cb Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 17:11:56 +08:00
dearlin 0f59aa83d4 清单排查中无定位信息 禁止提交 2024-02-04 17:11:50 +08:00
zhangyanli c2047f0e97 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 17:07:19 +08:00
zhangyanli 863092ccb7 隐患排查清单管理导入 2024-02-04 17:06:50 +08:00
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 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