guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
520 Commits
35 Branches
3 Tags
56 MiB
Commit Graph

488 Commits (zhy_new_1203)

Author SHA1 Message Date
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
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 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
wangpeng f58761937f 事故调查管理代码提交 2024-09-13 17:57:02 +08:00
LiuJiaNan 76a6aad1b4 地图四色图和便捷单独控制是否显示 2024-09-13 17:56:35 +08:00
shanao 0f75e526de 测试完成 2024-09-13 17:18:25 +08:00
shanao 8062274b39 修复全部问题 2024-09-12 17:32:07 +08:00
huangyuxuan aec58b0f91 [BUG修复](dev) 
修复删除检查记录主账号掉线BUG
 2024-09-12 14:15:08 +08:00
shanao 270d0d3c86 修复全部问题 2024-09-12 14:10:14 +08:00
mengfanliang b29e9ed249 feat: 调试事故信息查询菜单图片回显路径问题 2024-09-12 11:40:32 +08:00
guoyuepeng 290c566c73 1.代码格式优化 2024-09-11 17:43:28 +08:00
guoyuepeng c0667c8b46 1.删除info打印 2024-09-11 17:37:58 +08:00
guoyuepeng a8128a0e56 1.移植门口门禁系统和 
2.升级js
3.还原安全环保检查
 2024-09-11 17:35:16 +08:00
water_xu 4a314fc646 用户管理 - 人脸图像提示语修改 2024-09-11 08:48:24 +08:00
water_xu 952384269f 用户管理 - 人脸图像提示语修改 2024-09-10 19:14:15 +08:00
water_xu 537c7e129f 人员中台 - 暂时调整ISPUSH为2 2024-09-10 18:54:34 +08:00
huangyuxuan cfc84cfced [BUG修复](dev) 
取消是否为相关方选项
 2024-09-10 18:45:20 +08:00
shanao 4933738b6d 修复导出相关问题 2024-09-10 14:09:40 +08:00
shanao f7cb02d681 导出还没通 2024-09-09 18:04:04 +08:00
huangyuxuan 71cb404eb4 [BUG修复](hyx_2024-9-9_prevention) 
修复新增安全环保检查时检察人员名字变为idbug
 2024-09-09 16:50:28 +08:00
huangyuxuan d2d3d2d6f8 Merge remote-tracking branch 'origin/dev' into dev 2024-09-09 16:33:43 +08:00
huangyuxuan 98d69362b1 [代码更新](dev) 
回退代码版本
 2024-09-09 16:33:36 +08:00
guoyuepeng 1696e625be 1.还原人员信息查询条件 2024-09-09 16:30:29 +08:00
huangyuxuan 95525221d5 [代码更新](dev) 
回退代码版本
 2024-09-09 16:28:36 +08:00
mengfanliang d07eaa7cfc feat: 事故信息查询模块接口对接 2024-09-09 15:17:43 +08:00
shanao 6e97caf3a4 调试 2024-09-08 22:08:29 +08:00
shanao 5aa6676248 事故调查管理代码提交 2024-09-06 19:38:37 +08:00
mengfanliang 2c930b42b2 feat: 事故信息管理菜单重构 2024-09-06 18:17:09 +08:00
shanao 991ef9ea52 事故调查管理代码提交 2024-09-06 16:19:59 +08:00
water_xu 5d9fa4685c Merge branch 'dev' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj-vue into dev 2024-09-06 15:48:04 +08:00
guoyuepeng e764e8a945 1.修改代码格式 2024-09-06 14:25:05 +08:00
guoyuepeng 071fe616ca 1.修改代码格式 2024-09-06 14:24:12 +08:00
water_xu 9883455926 人员中台 - 暂时调整ISPUSH字段值为2(允许查询所有用户) 2024-09-06 14:23:06 +08:00
huangyuxuan d0390f864f Merge branch 'pet' into dev 2024-09-06 11:44:41 +08:00
huangyuxuan e6020b5976 [代码更新](pet) 
- 用户管理 导出功能隐藏
 - 用户管理 取消邮箱，身份证，民族，性别，上传人脸照片必填项
 - 人员中台 推送功能隐藏
 - 人员中台 导出功能隐藏
 2024-09-06 11:43:25 +08:00
liujun 2b54822d58 Merge branch 'liujun-2024-09-05-九公司人员定位' into dev 2024-09-05 18:31:39 +08:00
huangyuxuan 2572f05bf9 [代码更新](pet) 
- list.vue
   - 导入功能未同步人员中台，暂时屏蔽
 2024-09-05 17:07:49 +08:00
huangyuxuan f033a6c128 [代码更新](pet) 
- add.vue
   - 安全环保检查新增 是否为相关方按钮 更新部门人员下拉树逻辑
 - edit.vue
   - 新增用户取消邮箱必填，取消邮箱校验
 2024-09-05 14:48:47 +08:00
liujun 7662675179 就公司人员定位系统功能更新 2024-09-05 10:19:49 +08:00
guoyuepeng eb90049369 1.修改提示 2024-09-05 08:39:34 +08:00
guoyuepeng 876c870efc 1.修改前端显示,强制回档 2024-09-04 11:27:24 +08:00
guoyuepeng 605feeceb8 Merge remote-tracking branch 'origin/dev' into dev 2024-09-04 11:23:59 +08:00
guoyuepeng 1354982c6a 1.八项作业强制回档 2024-09-04 11:23:38 +08:00
WenShiJun 202af29c01 消防安全管理添加扫码查看检查记录 2024-09-03 18:07:42 +08:00
wangpeng 3d576a33ca 事故调查管理代码提交 2024-08-30 18:22:13 +08:00
huangyuxuan d5edfcdaf7 [代码更新](pet) 
safetyenvironmental相关接口更新为V2版本
 2024-08-19 17:04:49 +08:00
huangyuxuan 5c21788daf [代码更新](pet) 
safetyenvironmental相关接口更新为V2版本
 2024-08-19 17:03:34 +08:00
water_xu 1bc847fea9 人员中台 - 推送按钮不显示bug修复 2024-08-12 14:09:21 +08:00
water_xu bfb78fcb90 人员中台对接内容 2024-07-24 08:44:58 +08:00