From a7c12b8a2093e2b0db68f2d1d637d85c88b41929 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 30 Apr 2024 01:56:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/safeManage.js               |  2 ++
 src/router/index.js                           | 12 +++++++++++
 .../safeSame/v2/inspectionRecord.vue          | 20 +++++++++----------
 .../safeSame/v2/projectSelfInspection.vue     |  2 +-
 .../projectFront/safeSame/v2/subTasklist.vue  | 10 +++++-----
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/assets/js/api/safeManage.js b/src/assets/js/api/safeManage.js
index a57eff94..bfafa40e 100644
--- a/src/assets/js/api/safeManage.js
+++ b/src/assets/js/api/safeManage.js
@@ -54,7 +54,9 @@ export const deleteSafeInspectTaskRecordApi = data => post('xmgl/xzSecurityInspe
 
 //子任务管理
 export const getinspectTaskItemRecordApi = data => post('xmgl/inspectTaskItemRecord/list', data);
+export const getSafeinspectTaskItemRecordApi = data => post('xmgl/SafeInspectTaskItemRecord/list', data);
 export const deleteinspectTaskItemRecordApi = data => post('xmgl/inspectTaskItemRecord/delete', data);
+export const deleteSafeinspectTaskItemRecordApi = data => post('xmgl/SafeInspectTaskItemRecord/delete', data);
 
 //隐患检查记录
 export const gethiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/list', data);
diff --git a/src/router/index.js b/src/router/index.js
index e65c4caf..6c7858aa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -695,6 +695,12 @@ const routes2 = [
         component: () =>
           import("@/views/projectFront/quality/v2/subTasklist.vue"),
       },
+      {
+        path: "/project/safeSame/subTasklist",
+        name: "质量管理_项目自检子任务1",
+        component: () =>
+          import("@/views/projectFront/safeSame/v2/subTasklist.vue"),
+      },
       //项目自检记录
       {
         path: "/project/safeManage/inspectionRecord",
@@ -709,6 +715,12 @@ const routes2 = [
         component: () =>
           import("@/views/projectFront/quality/v2/inspectionRecord.vue"),
       },
+      {
+        path: "/project/safeSame/inspectionRecord",
+        name: "安全管理_项目自检记录1",
+        component: () =>
+          import("@/views/projectFront/safeSame/v2/inspectionRecord.vue"),
+      },
       {
         path: "/project/safeManage/hiddenDangerLibrary",
         name: "安全管理_隐患库1",
diff --git a/src/views/projectFront/safeSame/v2/inspectionRecord.vue b/src/views/projectFront/safeSame/v2/inspectionRecord.vue
index 0c190924..753eede4 100644
--- a/src/views/projectFront/safeSame/v2/inspectionRecord.vue
+++ b/src/views/projectFront/safeSame/v2/inspectionRecord.vue
@@ -1940,14 +1940,14 @@
 </template>
 <script>
 import {
-  getInspectionRecordListApi,
+  getSafeInspectionRecordListApi,
   getQualityRegionListApi,
-  getDangerTypeRecordApi,
+  getSafeDangerTypeRecordApi,
   getSubcontractListApi,
-  addRecordApi,
+  addSafeRecordApi,
   getRoutineInspectApi,
-  selectRectifyRecordListApi,
-  addQualityRectifyRecordApi
+  selectSafeRectifyRecordListApi,
+  addSafeQualityRectifyRecordApi
 } from '@/assets/js/api/quality.js'
 import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js'
 import { VueCropper } from 'vue-cropper'
@@ -2213,7 +2213,7 @@ export default {
       this.replyData.qualityId = valId
       this.replyData.createUser = this.userIdInfo
       console.log('整改提交的表单数据：：：', this.replyData);
-      addQualityRectifyRecordApi(this.replyData).then(res => {
+      addSafeQualityRectifyRecordApi(this.replyData).then(res => {
         if (res.code == 200) {
           this.$message.success('提交成功')
           this.dialogDetil = false
@@ -2457,7 +2457,7 @@ export default {
     },
     //整改记录
     selectRectifyRecordList(id) {
-      selectRectifyRecordListApi({
+      selectSafeRectifyRecordListApi({
         qualityId: id
       }).then((res) => {
         this.rectifyRecordList = res.result
@@ -2585,7 +2585,7 @@ export default {
       data.pageNo = this.pageNo
       data.pageSize = this.pageSize
       data.itemId = this.$route.query.id
-      getInspectionRecordListApi(data).then((res) => {
+      getSafeInspectionRecordListApi(data).then((res) => {
         console.log('res----', res);
         if (res.code == 200) {
           this.statisticsValue = res.result.total
@@ -2652,7 +2652,7 @@ export default {
         projectSn: this.projectSn,
         recordStatus: 0,
       }
-      getDangerTypeRecordApi(data).then((res) => {
+      getSafeDangerTypeRecordApi(data).then((res) => {
         if (res.code == 200) {
           console.log(res)
           this.classifyList = res.result
@@ -3096,7 +3096,7 @@ export default {
           data.projectSn = this.projectSn
           console.log('data', data)
           data.inspectManId = this.$store.state.userInfo.userId
-          addRecordApi(data).then((res) => {
+          addSafeRecordApi(data).then((res) => {
             if (res.code == 200) {
               this.$message.success(this.$t('message.quality.newSuccess'))
               this.$refs.addForm1.resetFields() //清除所有验证
diff --git a/src/views/projectFront/safeSame/v2/projectSelfInspection.vue b/src/views/projectFront/safeSame/v2/projectSelfInspection.vue
index 6a9b02ee..9dab4db5 100644
--- a/src/views/projectFront/safeSame/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/safeSame/v2/projectSelfInspection.vue
@@ -557,7 +557,7 @@ export default {
       }
     },
     detailsPoint(item) {
-      this.$router.push('/project/qualityManage/subTasklist?id=' + item.id)
+      this.$router.push('/project/safeSame/subTasklist?id=' + item.id)
     },
     getCheckTypeList() {
       getInspectTypeListApi({
diff --git a/src/views/projectFront/safeSame/v2/subTasklist.vue b/src/views/projectFront/safeSame/v2/subTasklist.vue
index 82ba7bde..300e0553 100644
--- a/src/views/projectFront/safeSame/v2/subTasklist.vue
+++ b/src/views/projectFront/safeSame/v2/subTasklist.vue
@@ -117,8 +117,8 @@
 </template>
 <script>
 import {
-  getinspectTaskItemRecordApi,
-  deleteinspectTaskItemRecordApi
+  getSafeinspectTaskItemRecordApi,
+  deleteSafeinspectTaskItemRecordApi
 } from '@/assets/js/api/safeManage.js'
 export default {
   data() {
@@ -141,7 +141,7 @@ export default {
       this.$router.back()
     },
     loadList() {
-      getinspectTaskItemRecordApi(this.searchForm).then((result) => {
+      getSafeinspectTaskItemRecordApi(this.searchForm).then((result) => {
         this.recordList = result.result.records
         this.pageTotal = result.result.total
       })
@@ -172,7 +172,7 @@ export default {
           let data = {
             id: item.id
           }
-          deleteinspectTaskItemRecordApi(data).then((res) => {
+          deleteSafeinspectTaskItemRecordApi(data).then((res) => {
             if (res.code == 200) {
               if (this.recordList.length == 1 && this.searchForm.pageNo > 1) {
                 this.searchForm.pageNo = this.searchForm.pageNo - 1
@@ -199,7 +199,7 @@ export default {
     detailsPoint(item) {
       // this.$router.push('/project/safeManage/checkStandingBook?id=' + item.id)
       this.$router.push(
-        '/project/qualityManage/inspectionRecord?id=' +
+        '/project/safeSame/inspectionRecord?id=' +
           item.id +
           '&taskId=' +
           item.taskId