隐患排查bug修复

2024-02-20 17:25:15 +08:00 · 2024-02-20 17:25:15 +08:00 · b6bc893c88
parent 35efe19638
commit b6bc893c88
11 changed files with 43 additions and 15 deletions
--- 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";

--- 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) =>
--- 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>
--- 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,7 +53,12 @@ const loading = ref(false);
 const fnMapInit = async () => {
  loading.value = true;
  await nextTick();
-  const resData = await getChecklistInspectionStatusRecordMap({
+  const resData =
+    props.listType === "1"
+      ? await getChecklistInspectionStatusRecordMap({
+          CHECKRECORD_ID: props.id,
+        })
+      : await getCustomCheckRecordMap({
          CHECKRECORD_ID: props.id,
        });
  mapInstance = new window.BMapGL.Map("map_container");
--- 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,
--- 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;
--- 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,
+                    },
                  })
            "
          >
--- 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 }}
--- 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 }}
--- 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(
--- 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) => {