 shanao
|
c96e907b56
|
Merge remote-tracking branch 'origin/dev' into dev-shanao
# Conflicts:
# src/views/accident/records/components/addOrEdit.vue
|
2024-10-08 17:14:49 +08:00 |
|
shanao
|
f565276ed7
|
将事故/事件分离开
|
2024-09-27 18:06:51 +08:00 |
guoyuepeng
|
ff4e34a9b6
|
1.还原隐患验收图片不能上传问题
|
2024-09-26 16:22:49 +08:00 |
 liujun
|
92b6345e62
|
bug修复-企业端查看相关方人员详情时不显示背面照片
|
2024-09-25 11:38:56 +08:00 |
 huangyuxuan
|
7ab1922a52
|
[BUG修复](hyx_2024-9-11)
优化 重点工程操作后不跳转到首页
|
2024-09-24 17:05:46 +08:00 |
|
guoyuepeng
|
980aa64706
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-23 10:37:43 +08:00 |
|
guoyuepeng
|
315e75323a
|
1.二维码地址错误
|
2024-09-23 10:37:29 +08:00 |
|
huangyuxuan
|
ce96201c0d
|
[BUG修复](hyx_2024-9-11)
代码版本回退
|
2024-09-20 17:23:14 +08:00 |
|
huangyuxuan
|
8749c308ad
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-20 16:15:03 +08:00 |
|
huangyuxuan
|
0249ce3782
|
Merge branch 'hyx_2024-9-11_changeUpload' into pet
# Conflicts:
# src/views/safetyenvironmental/archive/components/accept.vue
# src/views/safetyenvironmental/inspected/components/list.vue
# src/views/safetyenvironmental/inspection/components/add.vue
|
2024-09-20 16:14:31 +08:00 |
|
huangyuxuan
|
f89c653d8d
|
[BUG修复](hyx_2024-9-11)
代码版本回退
|
2024-09-20 16:09:00 +08:00 |
|
guoyuepeng
|
300c387e83
|
1.修改消防检查二维码
|
2024-09-20 15:51:11 +08:00 |
|
guoyuepeng
|
1ac1777da3
|
Merge branch 'dev' into pet
|
2024-09-20 15:48:11 +08:00 |
|
guoyuepeng
|
5163d5ca32
|
Merge remote-tracking branch 'origin/pet' into pet
# Conflicts:
# src/views/corpInfo/user/components/edit.vue
|
2024-09-20 14:59:13 +08:00 |
|
huangyuxuan
|
1f1d39949f
|
[BUG修复](hyx_2024-9-11)
修复新增消防点位检查时检查器材添加多个问题
|
2024-09-20 09:09:16 +08:00 |
|
guoyuepeng
|
60591eab21
|
`1.点位二维码
|
2024-09-19 17:20:51 +08:00 |
water_xu
|
883106bd51
|
Reapply "[BUG修复](dev)"
This reverts commit 715f12c80e.
|
2024-09-19 15:41:08 +08:00 |
 LiuJiaNan
|
4a02fdefd8
|
消防点位维护扫码
|
2024-09-19 10:45:35 +08:00 |
|
guoyuepeng
|
b574bd137f
|
1.消防检查二维码
|
2024-09-19 08:47:41 +08:00 |
|
huangyuxuan
|
1e2f9ae668
|
[新增流程](hyx_2024-9-11)
动火作业操作后保留在本页
|
2024-09-18 11:00:03 +08:00 |
|
huangyuxuan
|
248ae576a1
|
[新增流程](hyx_2024-9-11)
- 新增企业端安全环保检查新增后三端同步
- 隐患整改上传图片到服务器改为新上传流程
|
2024-09-18 10:59:19 +08:00 |
|
shanao
|
a286a49261
|
测试完成
|
2024-09-14 21:55:55 +08:00 |
|
shanao
|
2c9e52b933
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-09-14 20:18:35 +08:00 |
|
shanao
|
c7f0e51961
|
测试完成
|
2024-09-14 20:17:40 +08:00 |
|
water_xu
|
0606dd135e
|
Merge branch 'refs/heads/pet' into dev
|
2024-09-14 16:14:20 +08:00 |
|
water_xu
|
e57940b6f5
|
Reapply "[代码更新](dev)"
This reverts commit 03225846fc.
|
2024-09-14 10:26:33 +08:00 |
|
water_xu
|
715f12c80e
|
Revert "[BUG修复](dev)"
This reverts commit aec58b0f91.
|
2024-09-14 10:22:40 +08:00 |
|
water_xu
|
f9dc492fec
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-09-14 10:21:52 +08:00 |
|
water_xu
|
7c766ad93c
|
Revert "[代码更新](pet)"
This reverts commit 5c21788daf.
|
2024-09-14 10:15:52 +08:00 |
WenShiJun
|
c6406f8191
|
消防安全检查添加检查记录二维码逻辑
|
2024-09-14 10:04:58 +08:00 |
|
water_xu
|
03225846fc
|
Revert "[代码更新](dev)"
This reverts commit 95525221d5.
|
2024-09-14 10:02:22 +08:00 |
|
water_xu
|
811071680d
|
Revert "[代码更新](pet)"
This reverts commit 5c21788daf.
|
2024-09-14 10:02:05 +08:00 |
|
guoyuepeng
|
db1586eff9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-09-14 09:41:55 +08:00 |
|
huangyuxuan
|
6304bcfceb
|
[BUG修复](hyx_2024-9-11)
重点工程管理 新增工程信息时，企业监督部门选择部门将子类部门连同勾选
|
2024-09-14 09:31:54 +08:00 |
|
WenShiJun
|
68f7e673d7
|
消防安全检查添加检查记录二维码逻辑
|
2024-09-14 09:24:34 +08:00 |
|
water_xu
|
41d7b44c00
|
Merge branch 'pet' into dev
|
2024-09-13 18:27:59 +08:00 |
|
water_xu
|
90ec5cb987
|
Merge branch 'dev' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj-vue into dev
|
2024-09-13 18:27:50 +08:00 |
|
shanao
|
40ff86424f
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-13 18:00:12 +08:00 |
|
shanao
|
09e64d39c0
|
Merge remote-tracking branch 'origin/dev-shanao' into pet
# Conflicts:
# config/index.js
# package-lock.json
# package.json
# static/config.js
|
2024-09-13 18:00:03 +08:00 |
|
shanao
|
fdbb4d78da
|
测试完成
|
2024-09-13 17:57:57 +08:00 |
|
shanao
|
15a8303e21
|
修复全部问题
|
2024-09-13 17:57:57 +08:00 |
|
shanao
|
84451f1c7b
|
修复全部问题
|
2024-09-13 17:57:56 +08:00 |
 mengfanliang
|
54845b2422
|
feat: 调试事故信息查询菜单图片回显路径问题
|
2024-09-13 17:57:49 +08:00 |
|
shanao
|
164f70a0a4
|
修复导出相关问题
|
2024-09-13 17:57:44 +08:00 |
|
shanao
|
a116151652
|
导出还没通
|
2024-09-13 17:57:44 +08:00 |
|
mengfanliang
|
06920346f8
|
feat: 事故信息查询模块接口对接
|
2024-09-13 17:57:40 +08:00 |
shanao
|
a77e81bbf0
|
调试
|
2024-09-13 17:57:35 +08:00 |
|
shanao
|
7847b69c62
|
事故调查管理代码提交
|
2024-09-13 17:57:30 +08:00 |
|
mengfanliang
|
6dbdf598c7
|
feat: 事故信息管理菜单重构
|
2024-09-13 17:57:17 +08:00 |
|
shanao
|
f921dd8c52
|
事故调查管理代码提交
|
2024-09-13 17:57:02 +08:00 |