From 626c1a4bb92ceb950e15ae4aa7a554b33b274315 Mon Sep 17 00:00:00 2001
From: zhangqihang <zhangqihang>
Date: Fri, 23 Feb 2024 18:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/inspection/hidden_view.vue                | 2 +-
 .../hazard_assignment_acceptance/hidden_list.vue                | 2 +-
 .../safety_environmental/components/defense.vue                 | 2 +-
 src/views/safety_meeting/meeting/index.vue                      | 1 +
 src/views/safety_meeting/meeting/view.vue                       | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/keyprojects/inspection/hidden_view.vue b/src/views/keyprojects/inspection/hidden_view.vue
index b87b617..d04efb5 100644
--- a/src/views/keyprojects/inspection/hidden_view.vue
+++ b/src/views/keyprojects/inspection/hidden_view.vue
@@ -4,7 +4,7 @@
       <div id="printContent">
         <el-divider content-position="left">检查信息</el-divider>
         <el-descriptions border :column="2">
-          <el-descriptions-item label="隐患照片	">
+          <el-descriptions-item label="隐患照片">
             <img
               v-for="item in data.hiddenImgs"
               :key="item.IMGFILES_ID"
diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
index ed2b64b..10f8ff2 100644
--- a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
+++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
@@ -84,7 +84,7 @@ import ViewHidden from "../safety_environmental/components/view_hidden.vue";
 import { reactive } from "vue";
 
 const stateList = [
-  { ID: "101", NAME: "待整改" },
+  { ID: "101", NAME: "待指派整改人" },
   { ID: "1", NAME: "待整改" },
   { ID: "2", NAME: "待验收" },
   { ID: "10", NAME: "验收打回" },
diff --git a/src/views/safety_environmental_management/safety_environmental/components/defense.vue b/src/views/safety_environmental_management/safety_environmental/components/defense.vue
index ad8e666..81b61b4 100644
--- a/src/views/safety_environmental_management/safety_environmental/components/defense.vue
+++ b/src/views/safety_environmental_management/safety_environmental/components/defense.vue
@@ -108,7 +108,7 @@ const fnSubmit = debounce(
   async () => {
     await useFormValidate(formRef);
     if (form.INSPECTION_STATUS === "3") {
-      await setSafetyEnvironmentalDefense({ ...props.info, ...form.value });
+      await setSafetyEnvironmentalDefense({ ...props.info, ...form });
       ElMessage.success("申辩处理成功");
       fnClose();
       emits("get-data");
diff --git a/src/views/safety_meeting/meeting/index.vue b/src/views/safety_meeting/meeting/index.vue
index fe20cfe..326770b 100644
--- a/src/views/safety_meeting/meeting/index.vue
+++ b/src/views/safety_meeting/meeting/index.vue
@@ -65,6 +65,7 @@
               详情
             </el-button>
             <el-button
+              v-if="row.SIGNATURES === 0"
               type="primary"
               text
               link
diff --git a/src/views/safety_meeting/meeting/view.vue b/src/views/safety_meeting/meeting/view.vue
index d774a45..c2de99e 100644
--- a/src/views/safety_meeting/meeting/view.vue
+++ b/src/views/safety_meeting/meeting/view.vue
@@ -43,6 +43,7 @@
           <img
             v-for="(item, index) in data.form.file"
             :key="index"
+            v-viewer
             :src="item.url"
             style="width: 200px; height: 200px"
           />
@@ -63,6 +64,7 @@
             <template #default="{ row }">
               <img
                 v-if="row.FILEPATH"
+                v-viewer
                 :src="FILE_URL + row.FILEPATH"
                 style="width: 100px; height: 100px"
               />