 shanao
|
f006206da8
|
Merge remote-tracking branch 'origin/dev' into dev-shanao
|
2024-11-05 09:18:12 +08:00 |
|
shanao
|
ccfd198041
|
增加安全环保检查暂存，增加动火强制结束后查询页面
|
2024-11-05 09:16:59 +08:00 |
 liujun
|
de46f7ea95
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-11-01 17:50:53 +08:00 |
|
liujun
|
11fd98003a
|
企业端人员定位优化
|
2024-11-01 17:50:30 +08:00 |
guoyuepeng
|
17b9fdcc9f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-31 16:08:41 +08:00 |
|
guoyuepeng
|
4cbef9b2fb
|
1.消防点位二维码
|
2024-10-31 16:08:29 +08:00 |
 huangyuxuan
|
9e8fbe60a2
|
Merge branch 'hyx_2024-10-30_new' into pet
|
2024-10-31 15:23:37 +08:00 |
|
huangyuxuan
|
504fdc7746
|
[BUG修复](hyx_2024-10-30_new)
新框架bug修复
|
2024-10-31 15:21:58 +08:00 |
|
huangyuxuan
|
4bfda5d7fc
|
[BUG修复](pet)
首页隐患类型统计，整改数量统计不显示问题
|
2024-10-29 18:42:56 +08:00 |
|
huangyuxuan
|
82d63b32db
|
Merge branch 'pet' into dev
|
2024-10-23 17:40:01 +08:00 |
|
shanao
|
8ca527e9b0
|
修复事故事件管理附件不显示的问题
|
2024-10-23 17:25:08 +08:00 |
|
huangyuxuan
|
97de0aaa08
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-10-23 14:36:30 +08:00 |
|
huangyuxuan
|
338158eb3b
|
[新增功能](pet)
用户信息修改页面用户名和身份证号校验
|
2024-10-23 14:36:14 +08:00 |
|
shanao
|
ef3c04dfb5
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-10-23 14:24:37 +08:00 |
|
shanao
|
04b6e8f93b
|
添加缓存页面排除
|
2024-10-23 14:23:31 +08:00 |
|
huangyuxuan
|
83e7cd595a
|
Merge branch 'hyx_2024-9-25_tongbu' into pet
|
2024-10-21 09:28:40 +08:00 |
|
huangyuxuan
|
ef06a7f9cd
|
[新增功能](hyx_2024-9-25_tongbu)
用户信息详情 民族字段修改
|
2024-10-21 08:49:40 +08:00 |
|
shanao
|
754501dfe9
|
11111
|
2024-10-19 17:34:00 +08:00 |
|
liujun
|
828dc50ee5
|
企业端点击待审批消息自动跳转至审批页面
|
2024-10-16 11:26:52 +08:00 |
|
shanao
|
aa65cf2832
|
11111
|
2024-10-15 18:15:00 +08:00 |
 fufeifei
|
b5f7c2e98e
|
测试提交
|
2024-10-14 17:19:22 +08:00 |
|
huangyuxuan
|
fa3bdadaed
|
[新增功能](hyx_2024-9-25_tongbu)
人员信息同步
|
2024-10-12 08:53:10 +08:00 |
|
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 |