From b6bc893c88a20a34125b40512c29a64fcc601906 Mon Sep 17 00:00:00 2001
From: zhangyanli <zhangyanli@zcloudchina.com>
Date: Tue, 20 Feb 2024 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/data_dictionary.js              |  3 ++-
 src/request/hazard_investigation.js           |  2 ++
 .../components/inspection_record_view.vue     |  1 +
 .../components/map.vue                        | 21 +++++++++++++++----
 .../hidden_danger_view.vue                    |  4 ++--
 .../components/checkstandard_add.vue          |  5 +++--
 .../inventory_management/components/list.vue  | 10 +++++++--
 .../insurance_coverage.vue                    |  2 +-
 .../insurance_coverage_custom.vue             |  2 +-
 .../components/qualified.vue                  |  1 +
 .../inspect_custom.vue                        |  7 +++++--
 11 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js
index 10dd289..23738a8 100644
--- a/src/assets/js/data_dictionary.js
+++ b/src/assets/js/data_dictionary.js
@@ -6,7 +6,8 @@ import {
   getDepartmentTree,
   getLevelsCorp,
   getElectronicFenceTree,
-  getListSelectTree, getDepartmentzTree
+  getListSelectTree,
+  getDepartmentzTree,
 } from "@/request/data_dictionary.js";
 import { ref } from "vue";
 
diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js
index a95d76a..60f720b 100644
--- a/src/request/hazard_investigation.js
+++ b/src/request/hazard_investigation.js
@@ -95,6 +95,8 @@ export const setCheckStandardSupplementaryRecordingSubmit = (params) =>
   post("/customCheckrecord/recording", params); // 隐患排查清单检查情况检查记录补录提交
 export const setCheckStandardSubmit = (params) =>
   post("/customCheckrecord/add", params); // 清单排查提交
+export const getCustomCheckRecordMap = (params) =>
+  post("/customCheckrecord/goMap", params); // 清单检查情况检查记录查看地图
 export const setCommonItemEdit = (params) =>
   post("/hiddenstandardCommon/edit", params); // 隐患排查检查标准修改
 export const setCustomImport = (params) =>
diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
index fb84122..3ecb81e 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
@@ -293,6 +293,7 @@
       v-model:visible="data.mapDialogVisible"
       :id="checkRecordId"
       :list="inspectionList"
+      :list-type="listType"
     />
     <div v-html="PRINT_STYLE" />
   </div>
diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/map.vue b/src/views/hazard_investigation/checklist_inspection_status/components/map.vue
index efc194a..1778ccf 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/components/map.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/components/map.vue
@@ -16,7 +16,10 @@
 <script setup>
 import { useVModel } from "@vueuse/core";
 import { nextTick, onBeforeUnmount, ref, watch } from "vue";
-import { getChecklistInspectionStatusRecordMap } from "@/request/hazard_investigation.js";
+import {
+  getChecklistInspectionStatusRecordMap,
+  getCustomCheckRecordMap,
+} from "@/request/hazard_investigation.js";
 
 const aPng = new URL("/src/assets/images/map/h.png", import.meta.url).href;
 const bPng = new URL("/src/assets/images/map/50.png", import.meta.url).href;
@@ -37,6 +40,11 @@ const props = defineProps({
     required: true,
     default: () => [],
   },
+  listType: {
+    type: String,
+    required: true,
+    default: "",
+  },
 });
 const emits = defineEmits(["update:visible"]);
 const visible = useVModel(props, "visible", emits);
@@ -45,9 +53,14 @@ const loading = ref(false);
 const fnMapInit = async () => {
   loading.value = true;
   await nextTick();
-  const resData = await getChecklistInspectionStatusRecordMap({
-    CHECKRECORD_ID: props.id,
-  });
+  const resData =
+    props.listType === "1"
+      ? await getChecklistInspectionStatusRecordMap({
+          CHECKRECORD_ID: props.id,
+        })
+      : await getCustomCheckRecordMap({
+          CHECKRECORD_ID: props.id,
+        });
   mapInstance = new window.BMapGL.Map("map_container");
   mapInstance.centerAndZoom(
     new window.BMapGL.Point(
diff --git a/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue b/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue
index 01f5afc..9454204 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/hidden_danger_view.vue
@@ -1,7 +1,7 @@
 <template>
   <layout-card>
     <div id="printContent">
-      <layout-hidden-view :hidden-id="HIDDEN_ID" />
+      <layout-hidden-view :hidden-id="HIDDEN_ID" :list-type="LIST_TYPE" />
     </div>
     <div class="tc mt-10" v-if="print">
       <el-button type="primary" v-print="'#printContent'">打印</el-button>
@@ -14,7 +14,7 @@ import LayoutHiddenView from "@/components/hidden_view/index.vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
-const { HIDDEN_ID } = route.query;
+const { HIDDEN_ID, LIST_TYPE } = route.query;
 defineProps({
   print: {
     type: Boolean,
diff --git a/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue b/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue
index df3ab47..3939a5e 100644
--- a/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue
+++ b/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue
@@ -76,7 +76,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24"
+          >{{ form.OPERATION_TYPE }}
           <el-form-item label="操作类型" prop="OPERATION_TYPE">
             <el-select v-model="form.OPERATION_TYPE">
               <el-option :value="1" label="选择" />
@@ -216,7 +217,7 @@ const rules = {
   ],
 };
 const fnClose = () => {
-  formRef.value.resetFields();
+  // formRef.value.resetFields();
   data.CHECK_CATEGORY_NAME = "";
   data.CHECK_ITEM_NAME = "";
   visible.value = false;
diff --git a/src/views/hazard_investigation/inventory_management/components/list.vue b/src/views/hazard_investigation/inventory_management/components/list.vue
index baab0a6..f8a0106 100644
--- a/src/views/hazard_investigation/inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/inventory_management/components/list.vue
@@ -186,11 +186,17 @@
               name === 'risk'
                 ? router.push({
                     path: '/hazard_investigation/inventory_management/edit',
-                    query: { LISTMANAGER_ID: row.LISTMANAGER_ID },
+                    query: {
+                      LISTMANAGER_ID: row.LISTMANAGER_ID,
+                      WHETHER_HAZARDS: data.WHETHER_HAZARDS,
+                    },
                   })
                 : router.push({
                     path: '/hazard_investigation/inventory_management/edit_custom',
-                    query: { ID: row.CUSTOM_ID },
+                    query: {
+                      ID: row.CUSTOM_ID,
+                      WHETHER_HAZARDS: data.WHETHER_HAZARDS,
+                    },
                   })
             "
           >
diff --git a/src/views/hazard_investigation/inventory_management/insurance_coverage.vue b/src/views/hazard_investigation/inventory_management/insurance_coverage.vue
index fdc2c4b..84a2aa6 100644
--- a/src/views/hazard_investigation/inventory_management/insurance_coverage.vue
+++ b/src/views/hazard_investigation/inventory_management/insurance_coverage.vue
@@ -1,6 +1,6 @@
 <template>
   <layout-card>
-    <el-divider content-position="left">清单信息</el-divider>
+    <el-divider content-position="left">风险管控清单信息</el-divider>
     <el-descriptions :column="2" border>
       <el-descriptions-item label="清单名称">
         {{ info.NAME }}
diff --git a/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue b/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue
index ca0c50e..d60fc8e 100644
--- a/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue
@@ -1,6 +1,6 @@
 <template>
   <layout-card>
-    <el-divider content-position="left">清单信息</el-divider>
+    <el-divider content-position="left">隐患排查清单信息</el-divider>
     <el-descriptions :column="2" border>
       <el-descriptions-item label="清单名称">
         {{ info.NAME }}
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue b/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue
index 866e27a..f7c5380 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue
@@ -70,6 +70,7 @@ const { visible, form } = useVModels(props, emits);
 const formRef = ref(null);
 const fnClose = () => {
   formRef.value.resetFields();
+  form.value.CHECK_RESULT = "";
   visible.value = false;
 };
 const fnSubmit = debounce(
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
index c12ee30..1e06659 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
@@ -367,7 +367,11 @@ onMounted(() => {
 const fnResultsSubmit = (CHECK_RESULT, index) => {
   if (CHECK_RESULT) {
     inspectionList.value[index].CHECK_RESULT = CHECK_RESULT;
+  } else {
+    inspectionList.value[index].CHECK_RESULT =
+      inspectionList.value[index].CHECK_QUALIFIED;
   }
+  inspectionList.value[index].ISNORMAL = 0;
 };
 const fnHiddenSubmit = (currentHiddenId, HIDDENDESCR) => {
   const { hiddenType, index } = data.unQualifiedDialog;
@@ -396,7 +400,6 @@ const fnQualified = async (index, row) => {
   if (row.HASHIDDEN > 0) return;
   //  选择还是填写  OPERATION_TYPE 1选择 2填写
   if (row.OPERATION_TYPE === 1) {
-    row.CHECK_RESULT = row.CHECK_QUALIFIED;
     data.qualifiedDialog.writeresults = false;
   } else {
     data.qualifiedDialog.writeresults = true;
@@ -415,7 +418,7 @@ const fnQualified = async (index, row) => {
     });
     data.qualifiedDialog.form.file = addingPrefixToFile(resData.imgs);
   }
-  inspectionList.value[index].ISNORMAL = 0;
+  // inspectionList.value[index].ISNORMAL = 0;
 };
 // 不涉及
 const fnNotInvolved = (index, row) => {