guoyuepeng
|
045793c5fd
|
1.八项作业bug修复
|
2024-06-27 20:41:28 +08:00 |
water_xu
|
59edf1e6af
|
危险作业-有限空间bug
|
2024-06-27 20:39:15 +08:00 |
|
guoyuepeng
|
b8d812284a
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-06-27 20:15:49 +08:00 |
|
guoyuepeng
|
9eda4f728d
|
1.八项作业bug修复
|
2024-06-27 20:15:37 +08:00 |
|
guoyuepeng
|
50dcd9c4be
|
Merge remote-tracking branch 'origin/pet' into pet
# Conflicts:
# src/views/dangerousWork/limitspace/components/detail.vue
# src/views/dangerousWork/limitspace/components/list.vue
|
2024-06-27 19:29:31 +08:00 |
|
water_xu
|
70407e7e00
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-27 19:17:20 +08:00 |
|
water_xu
|
ec00128c3b
|
危险作业-断路作业的前端组件修改
|
2024-06-27 19:13:52 +08:00 |
|
guoyuepeng
|
117daa34d0
|
1.有限空间统计信息
|
2024-06-27 19:01:40 +08:00 |
zy
|
3b4803ee19
|
八项作业前端编码
|
2024-06-27 18:16:12 +08:00 |
 liujun
|
ae700e84d8
|
Merge branch 'pet' into liujun-2024-06-13-一公司人员定位新需求
|
2024-06-27 17:36:40 +08:00 |
|
liujun
|
08555f1a10
|
边界入侵未初始化bug修复
|
2024-06-27 14:48:12 +08:00 |
1261008090@qq.com
|
7e847adc4f
|
地图：人员定位/历史轨迹，人员定位标点增加label
|
2024-06-27 14:36:31 +08:00 |
|
water_xu
|
f42d56a7c0
|
门口门禁-地图小窗口排序bug
|
2024-06-27 14:13:03 +08:00 |
|
water_xu
|
f47878a392
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-27 14:06:34 +08:00 |
|
water_xu
|
6561b6af7d
|
气象设备管理历史记录排序bug
|
2024-06-27 14:06:08 +08:00 |
|
zy
|
a2f1ef07ac
|
八项作业前端编码
|
2024-06-27 13:35:59 +08:00 |
|
guoyuepeng
|
14f6b53835
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-06-27 11:16:06 +08:00 |
|
guoyuepeng
|
908bd4b53c
|
1.消防资源管理菜单修改
|
2024-06-27 10:40:42 +08:00 |
|
water_xu
|
101d0fac70
|
门口门禁-完善地图进入进出统计小窗口东西港条件
|
2024-06-27 09:29:00 +08:00 |
|
water_xu
|
c2ef837d93
|
门口门禁-地图小窗口图表排序问题修正
|
2024-06-26 15:16:36 +08:00 |
|
water_xu
|
33312767b7
|
门口门禁-完善地图进入进出统计小窗口
|
2024-06-26 15:14:24 +08:00 |
|
water_xu
|
8050b95233
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-26 10:53:06 +08:00 |
|
water_xu
|
50025690f0
|
门口门禁-地图-口门统计小窗口1
|
2024-06-26 10:51:47 +08:00 |
|
water_xu
|
3d834d7b6a
|
其他设备管理-气象设备管理-图表统计排序bug修复
|
2024-06-26 10:51:03 +08:00 |
|
liujun
|
a78960d107
|
边界入侵功能地图监管段代码
|
2024-06-25 17:55:04 +08:00 |
|
guoyuepeng
|
9c123a62a3
|
1.盲板作业,完成部分,移交
|
2024-06-25 17:24:19 +08:00 |
|
water_xu
|
b7a09e54bb
|
口门门禁-修改错别字... : (
|
2024-06-25 14:36:32 +08:00 |
|
water_xu
|
3c368c2b3b
|
Merge remote-tracking branch 'origin/dev' into pet
|
2024-06-25 14:24:22 +08:00 |
|
water_xu
|
a728f33cc1
|
其他设备管理-气象设备管理-气象设备历史记录以及图表统计页面
|
2024-06-25 14:21:58 +08:00 |
|
guoyuepeng
|
0dd4f97072
|
1.断路作业的统计
|
2024-06-25 14:11:24 +08:00 |
|
1261008090@qq.com
|
1acf73d2cd
|
地图/门口门禁
|
2024-06-25 10:21:35 +08:00 |
|
liujun
|
5eb8bd0484
|
工匠学员对接班级信息接口
|
2024-06-24 19:47:40 +08:00 |
|
liujun
|
e78e953523
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-24 08:52:38 +08:00 |
WenShiJun
|
9f0ffebe6f
|
接受交底人，完工验收添加多张签字图片逻辑修改
|
2024-06-21 17:41:52 +08:00 |
|
guoyuepeng
|
e5998ef8c4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-06-20 19:52:08 +08:00 |
|
water_xu
|
9ad0b93974
|
门口门禁-调整菜单分级
|
2024-06-20 19:51:32 +08:00 |
|
guoyuepeng
|
2d32483388
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-06-20 19:47:52 +08:00 |
|
water_xu
|
9c8ece8153
|
Merge branch 'pet' into dev
|
2024-06-20 19:47:29 +08:00 |
|
water_xu
|
0d6b60b245
|
门口门禁-修复进出情况分析管理分页错误
|
2024-06-20 19:44:59 +08:00 |
|
water_xu
|
607155e24c
|
revert a217326e9a
revert 门口门禁-修复进出情况分析管理分页错误
|
2024-06-20 19:32:29 +08:00 |
|
water_xu
|
a217326e9a
|
门口门禁-修复进出情况分析管理分页错误
|
2024-06-20 19:29:58 +08:00 |
|
guoyuepeng
|
aba24ac8eb
|
Merge branch 'pet' into dev
|
2024-06-20 18:37:18 +08:00 |
|
water_xu
|
a6680fae2b
|
门口门禁-记录数据显示调整
|
2024-06-20 18:04:41 +08:00 |
|
water_xu
|
a36c05be34
|
门口门禁-人行、车行记录支持分页查询
|
2024-06-20 16:35:06 +08:00 |
|
water_xu
|
38d137dc06
|
门口门禁-进出记录管理子级页面开发（人行口门记录、车行口门记录）
|
2024-06-20 14:38:19 +08:00 |
|
liujun
|
603ad362f2
|
Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求
|
2024-06-20 08:35:10 +08:00 |
|
WenShiJun
|
5bbe79885f
|
接受交底人，完工验收添加多张签字图片逻辑修改
|
2024-06-19 17:27:50 +08:00 |
|
water_xu
|
25d319976e
|
门口门禁-删除口门区域界面
|
2024-06-19 11:57:04 +08:00 |
|
water_xu
|
fa47f243b3
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-19 09:37:22 +08:00 |
|
water_xu
|
95d447013e
|
门口门禁-地图-摄像头点位播放功能
|
2024-06-19 09:36:41 +08:00 |