water_xu
|
86771a851b
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-07-17 16:42:18 +08:00 |
|
water_xu
|
648b9e1ac5
|
相关方 - 培训班级管理列表培训地点修复
|
2024-07-17 15:47:24 +08:00 |
|
water_xu
|
12a09b1448
|
相关方所有人员管理 - 无法查看特种作业证书背面照片bug修复
|
2024-07-12 15:42:16 +08:00 |
|
water_xu
|
38adefd0fb
|
相关方人员审批 - 重复推送相关功能
|
2024-07-10 14:22:13 +08:00 |
|
water_xu
|
ba30331605
|
隐患排查治理系统 - 一般隐患管理支持按整改部门条件搜索
|
2024-07-09 08:30:52 +08:00 |
|
water_xu
|
0832284f06
|
安全环保检查管理 - 列表支持检查情况模糊查询
|
2024-07-08 15:35:51 +08:00 |
guoyuepeng
|
20c574897b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-02 17:52:34 +08:00 |
 liujun
|
0cdcd706bc
|
代码冲突解决
|
2024-07-02 15:24:09 +08:00 |
|
liujun
|
2ccd92f1c3
|
Merge remote-tracking branch 'origin/liujun-2024-06-06-相关方新需求' into pet
|
2024-07-02 15:09:29 +08:00 |
|
water_xu
|
48ebcae4a8
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-07-01 14:47:07 +08:00 |
|
water_xu
|
18412553ae
|
重点工程 - 相关方人员管理支持手机号码搜索
|
2024-07-01 14:46:52 +08:00 |
|
guoyuepeng
|
ebb141a699
|
1.显示一公司的门口门禁页面
2.调整监管端的重点工程视频监控样式
|
2024-06-29 12:45:05 +08:00 |
|
guoyuepeng
|
5ce51685d6
|
Merge remote-tracking branch 'origin/pet' into pet
# Conflicts:
# src/views/map/index.vue
|
2024-06-28 21:08:44 +08:00 |
|
guoyuepeng
|
6e7452c113
|
1.地图显示一公司门口内容
|
2024-06-28 21:07:43 +08:00 |
|
water_xu
|
b2ffac3acd
|
八项作业 - bug修改
|
2024-06-28 21:06:31 +08:00 |
|
water_xu
|
e75c8129ae
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-28 15:42:15 +08:00 |
|
water_xu
|
1dd9262cc4
|
bug 16519 断路作业 搜索框不显示文字 只有鼠标放上面才有
|
2024-06-28 15:41:52 +08:00 |
zy
|
7fe2e02c1b
|
八项作业前端新增是否删除列
|
2024-06-28 15:19:04 +08:00 |
|
zy
|
eb0fddec8e
|
八项作业前端新增是否删除列
|
2024-06-28 15:14:57 +08:00 |
|
guoyuepeng
|
900c362a1c
|
1.输入框内容调试
|
2024-06-28 14:45:17 +08:00 |
|
guoyuepeng
|
c2a661976d
|
Merge remote-tracking branch 'origin/pet' into pet
# Conflicts:
# src/views/dangerousWork/hoisting/components/list.vue
# src/views/dangerousWork/hoisting/index.vue
|
2024-06-28 14:44:00 +08:00 |
|
water_xu
|
825cd9bffd
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-28 08:40:43 +08:00 |
|
zy
|
7bbb361e1b
|
危险作业-高处作业-吊装作业bug修改
|
2024-06-27 21:26:06 +08:00 |
|
guoyuepeng
|
2f58b6bf93
|
1.盲板bug修复
|
2024-06-27 21:22:06 +08:00 |
|
guoyuepeng
|
484c95f85b
|
1.吊装作业bug修复
|
2024-06-27 21:07:11 +08:00 |
|
guoyuepeng
|
f2a07c9b6b
|
1.其他公司的风险四色图
|
2024-06-27 20:52:05 +08:00 |
|
water_xu
|
3f39ad2548
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-27 20:45:42 +08:00 |
|
water_xu
|
21ba6983c3
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-06-27 20:44:08 +08:00 |
|
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 |