From ae3cba5fb87723b710ce3bb8f0286401dfefaf45 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Wed, 10 Apr 2024 16:53:36 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/constant.js                     |  1 +
 src/request/data_dictionary.js                |  2 +-
 src/request/safety_production_related.js      |  2 +-
 src/request/scrap_manage.js                   |  2 +-
 src/views/mechanical_files/beidou/index.vue   | 22 +++++-----
 .../inspect_annually/index.vue                |  2 +-
 src/views/mechanical_files/insure/index.vue   | 30 +++++++-------
 .../mechanical_files/maintenance/index.vue    | 22 +++++-----
 .../mechanical_files/operations/index.vue     | 18 ++++----
 .../mechanical_files/scrap_manage/add.vue     | 16 ++++----
 .../security_notice/add.vue                   | 17 ++++----
 .../components/select_person.vue              |  5 ++-
 .../security_notice/details.vue               | 23 ++++++-----
 .../security_notice/index.vue                 | 41 ++++++++-----------
 .../security_notice/notice_info.vue           |  2 +-
 15 files changed, 100 insertions(+), 105 deletions(-)

diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js
index db31fd3..eded5e4 100644
--- a/src/assets/js/constant.js
+++ b/src/assets/js/constant.js
@@ -139,6 +139,7 @@ export const REMIND_DAYS = [
   { ID: "2", NAME: "90天", NUM: "90" },
 ];
 
+
 // export const MAINTENANCE_LEVEL_LIST = [
 //     //维保等级
 //     {ID:'1',NAME:'一级维保'},
diff --git a/src/request/data_dictionary.js b/src/request/data_dictionary.js
index 1d54e86..74a4d15 100644
--- a/src/request/data_dictionary.js
+++ b/src/request/data_dictionary.js
@@ -29,7 +29,7 @@ export const getLevelsCorp = (params) =>
   });
 // 获取数据字典
 export const getLevelsByParentId = (params) =>
-  post("/dictionaries/listDictToParId", {
+  post("/dictionaries/getLevels", {
     loading: false,
     ...params,
   });
diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js
index 3c81300..d8af733 100644
--- a/src/request/safety_production_related.js
+++ b/src/request/safety_production_related.js
@@ -29,7 +29,7 @@ export const issueSecurityNotice = (params) =>
 // 通知等级
 export const layoutFnGetNotificationsClassification = async () => {
   const resData = await getLevelsByParentId({
-    parentId: "aaecb47d95524b84904809671e48a777",
+    DICTIONARIES_ID: "aaaecb47d95524b84904809671e48a656",
   });
   return ref(resData);
 };
diff --git a/src/request/scrap_manage.js b/src/request/scrap_manage.js
index 4b16304..35effb3 100644
--- a/src/request/scrap_manage.js
+++ b/src/request/scrap_manage.js
@@ -4,7 +4,7 @@ import { post, upload } from "@/request/axios.js";
 
 export const layoutFnGetScrapType = async () => {
   const resData = await getLevelsByParentId({
-    parentId: "78452f4ec77e4d98ae8cdd9c3386ae0c",
+    DICTIONARIES_ID: "78452f4ec77e4d98ae8cdd9c3386ae0c",
   });
   return ref(resData);
 };
diff --git a/src/views/mechanical_files/beidou/index.vue b/src/views/mechanical_files/beidou/index.vue
index 6f09cf0..38c8704 100644
--- a/src/views/mechanical_files/beidou/index.vue
+++ b/src/views/mechanical_files/beidou/index.vue
@@ -87,19 +87,19 @@
           </template>
         </el-table-column>
         <el-table-column prop="NUM" label="编号" width="150" />
-        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" />
-        <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
-        <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
+        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
+        <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
+        <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
         <el-table-column
           prop="NETWORK_ACCESS_COMPANY"
           label="入网公司"
           width="150"
         />
-        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
-        <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
-        <el-table-column prop="REGISTRANT" label="登记人" width="150" />
+        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="120" />
+        <el-table-column prop="DUE_DATE" label="到期日期" width="120" />
+        <el-table-column prop="REGISTRANT" label="登记人" width="140" />
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
-        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
+        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="90">
           <template #default="{ row }">
             <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
               >开启</el-tag
@@ -109,7 +109,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
+        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="90">
           <template #default="{ row }">
             <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
               >未到期</el-tag
@@ -122,7 +122,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="90">
           <template #default="{ row }">
             <el-tag v-if="row.ARCHIVES_TYPE === '1'" type="error">报废</el-tag>
             <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
@@ -133,9 +133,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
-        <el-table-column prop="OPERATTIME" label="修改时间" width="150" />
-        <el-table-column label="操作" width="250">
+        <el-table-column label="操作" width="242">
           <template #default="{ row }">
             <el-button
               type="primary"
diff --git a/src/views/mechanical_files/inspect_annually/index.vue b/src/views/mechanical_files/inspect_annually/index.vue
index 9b15a55..17bb3b1 100644
--- a/src/views/mechanical_files/inspect_annually/index.vue
+++ b/src/views/mechanical_files/inspect_annually/index.vue
@@ -123,7 +123,7 @@
         <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
         <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
         <el-table-column prop="PROCESSING_DATE" label="办理日期" width="100" />
-        <el-table-column prop="NAME" label="年检周期" width="100" />
+        <el-table-column prop="NAME" label="年检周期" width="92" />
         <el-table-column prop="DUE_DATE" label="到期日期" width="100" />
         <el-table-column prop="REGISTRANT" label="登记人" width="100" />
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue
index 65cc2c8..41063b9 100644
--- a/src/views/mechanical_files/insure/index.vue
+++ b/src/views/mechanical_files/insure/index.vue
@@ -119,34 +119,34 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column prop="NUM" label="编号" width="150" />
-        <el-table-column prop="VEHICLE_MODEL" label="运营车型" width="150">
+        <el-table-column prop="NUM" label="编号" width="100" />
+        <el-table-column prop="VEHICLE_MODEL" label="运营车型" width="100">
           <template #default="{ row }">
             {{
               translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST)
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" />
-        <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
-        <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
+        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
+        <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
+        <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
         <el-table-column
           prop="PROCESSING_DATE_YEAR"
           label="保险年份"
-          width="150"
+          width="80"
         />
         <el-table-column
           prop="INSURANCE_COVERAGE"
           label="保险项目"
-          width="150"
+          width="100"
         />
-        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
-        <el-table-column prop="EFFECTIVE_DATE" label="生效日期" width="150" />
-        <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
-        <el-table-column prop="REGISTRANT" label="登记人" width="150" />
+        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="100" />
+        <el-table-column prop="EFFECTIVE_DATE" label="生效日期" width="100" />
+        <el-table-column prop="DUE_DATE" label="到期日期" width="100" />
+        <el-table-column prop="REGISTRANT" label="登记人" width="100" />
         <!--<el-table-column prop="NULLL" label="经营类型" width="150"/>-->
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
-        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
+        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
               >开启</el-tag
@@ -156,7 +156,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
+        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
               >未到期</el-tag
@@ -169,8 +169,8 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
-        <el-table-column prop="OPERATTIME" label="修改时间" width="150" />
+<!--        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
+        <el-table-column prop="OPERATTIME" label="修改时间" width="150" />-->
         <el-table-column label="操作" width="250">
           <template #default="{ row }">
             <el-button
diff --git a/src/views/mechanical_files/maintenance/index.vue b/src/views/mechanical_files/maintenance/index.vue
index e278687..c6b86eb 100644
--- a/src/views/mechanical_files/maintenance/index.vue
+++ b/src/views/mechanical_files/maintenance/index.vue
@@ -87,26 +87,26 @@
           </template>
         </el-table-column>
         <el-table-column prop="NUM" label="编号" width="150" />
-        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" />
-        <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
-        <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
-        <el-table-column prop="MAINTENANCE_LEVEL" label="维保等级" width="150">
+        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
+        <el-table-column prop="CAR_OWNERS" label="车主业户" width="100" />
+        <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
+        <el-table-column prop="MAINTENANCE_LEVEL" label="维保等级" width="100">
           <template #default="{ row }">
             {{
               translationStatus(row.MAINTENANCE_LEVEL, MAINTENANCE_LEVEL_LIST)
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
-        <el-table-column prop="MAINTENANCE_CYCLE" label="维保周期" width="150">
+        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="120" />
+        <el-table-column prop="MAINTENANCE_CYCLE" label="维保周期" width="80">
           <template #default="{ row }">
             {{ row.MAINTENANCE_CYCLE + "天" }}
           </template>
         </el-table-column>
         <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
-        <el-table-column prop="REGISTRANT" label="登记人" width="150" />
+        <el-table-column prop="REGISTRANT" label="登记人" width="100" />
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
-        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
+        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
               >开启</el-tag
@@ -116,7 +116,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
+        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
               >未到期</el-tag
@@ -129,7 +129,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废</el-tag>
             <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
@@ -140,8 +140,6 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
-        <el-table-column prop="OPERATTIME" label="修改时间" width="150" />
         <el-table-column label="操作" width="250">
           <template #default="{ row }">
             <el-button
diff --git a/src/views/mechanical_files/operations/index.vue b/src/views/mechanical_files/operations/index.vue
index 68d70d2..d8e676e 100644
--- a/src/views/mechanical_files/operations/index.vue
+++ b/src/views/mechanical_files/operations/index.vue
@@ -109,22 +109,22 @@
           </template>
         </el-table-column>
         <!--        <el-table-column prop="OPERATIONS_ID" label="编号" width="150" />-->
-        <el-table-column prop="VEHICLE_MODEL" label="运营车型" width="150">
+        <el-table-column prop="VEHICLE_MODEL" label="运营车型" width="95">
           <template #default="{ row }">
             {{
               translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST)
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="150" />
+        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="95" />
         <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
         <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
-        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
-        <el-table-column prop="CYCLE_NAME" label="运营周期" width="150" />
+        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="142" />
+        <el-table-column prop="CYCLE_NAME" label="运营周期" width="80" />
         <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
         <el-table-column prop="REGISTRANT" label="登记人" width="150" />
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
-        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
+        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
               >开启
@@ -134,7 +134,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
+        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
               >未到期
@@ -147,7 +147,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废</el-tag>
             <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
@@ -158,8 +158,8 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
-        <el-table-column label="操作" width="250">
+
+        <el-table-column label="操作" width="240">
           <template #default="{ row }">
             <el-button
               type="primary"
diff --git a/src/views/mechanical_files/scrap_manage/add.vue b/src/views/mechanical_files/scrap_manage/add.vue
index c18a7e6..37cadec 100644
--- a/src/views/mechanical_files/scrap_manage/add.vue
+++ b/src/views/mechanical_files/scrap_manage/add.vue
@@ -19,10 +19,10 @@
               @change="fnEditVehicleModel"
             >
               <el-option
-                v-for="item in getScrapVehicleModeList"
+                v-for="item in SCRAP_VEHICLE_MODEL"
                 :key="item.BIANMA"
-                :label="item.name"
-                :value="item.name"
+                :label="item.NAME"
+                :value="item.NAME"
               />
             </el-select>
           </el-form-item>
@@ -186,7 +186,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from "vue";
+import { ref } from "vue";
 import {
   setScrapManageAdd,
   setScrapManageEdit,
@@ -211,12 +211,9 @@ const router = useRouter();
 const getAllOperationVehicleList = await getScrapOperationVehicleList();
 const getAllFrailerList = await getScrapFreightTrailerList();
 
-const getScrapVehicleModeList = ref(null);
 
-onMounted(async () => {
-  const data = await layoutFnGetScrapType();
-  getScrapVehicleModeList.value = JSON.parse(data.value.zTreeNodes);
-});
+const VEHICLE_MODEL = await layoutFnGetScrapType();
+
 
 const SCRAP_ID = route.query.SCRAP_ID;
 const rules = {
@@ -396,6 +393,7 @@ const fnSubmit = debounce(
   },
   { atBegin: true }
 );
+const SCRAP_VEHICLE_MODEL = VEHICLE_MODEL.value.list
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/safety_production_related/security_notice/add.vue b/src/views/safety_production_related/security_notice/add.vue
index 927e748..37e4854 100644
--- a/src/views/safety_production_related/security_notice/add.vue
+++ b/src/views/safety_production_related/security_notice/add.vue
@@ -26,9 +26,9 @@
             >
               <el-option
                 v-for="item in relatedClassificationList"
-                :key="item.BIANMA"
+                :key="item.ID"
                 :label="item.NAME"
-                :value="item.BIANMA"
+                :value="item.NAME"
               />
             </el-select>
           </el-form-item>
@@ -98,7 +98,7 @@
     </div>
     <select-person
       v-model:visible="data.SelectPersonDialogVisible"
-      :list-data="data.listAll"
+      :selection-data="data.listAll"
       @submit="fnSelectPersonSubmit"
       @submitall="fnSelectAllRiskSubmit"
     />
@@ -133,12 +133,9 @@ const rules = {
     },
   ],
 };
-const relatedClassificationTempList =
-  await layoutFnGetNotificationsClassification();
-const relatedClassificationList = [];
-JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
-  relatedClassificationList.push({ name: e.id, BIANMA: e.name });
-});
+const relatedClassificationTempList = await layoutFnGetNotificationsClassification();
+
+
 const router = useRouter();
 const data = reactive({
   form: {
@@ -152,6 +149,7 @@ const data = reactive({
     allStatus: 0, // 是否全选
     REPLYSTATUS: "",
   },
+  SelectPersonDialogVisible: false,
 });
 
 const fnSubmit = async () => {
@@ -204,6 +202,7 @@ const fnSelectAllRiskSubmit = (allData) => {
   data.form.allStatus = 1;
   data.form.PERSON = "已全部选择";
 };
+const relatedClassificationList = relatedClassificationTempList.value.list;
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/safety_production_related/security_notice/components/select_person.vue b/src/views/safety_production_related/security_notice/components/select_person.vue
index 89a8a48..7eb7237 100644
--- a/src/views/safety_production_related/security_notice/components/select_person.vue
+++ b/src/views/safety_production_related/security_notice/components/select_person.vue
@@ -78,7 +78,7 @@ const props = defineProps({
     required: true,
     default: false,
   },
-  listData: {
+  selectionData: {
     type: Array,
     required: true,
     default: () => [],
@@ -105,6 +105,9 @@ const stop = watch(
   () => props.visible,
   (value) => {
     if (value) {
+      props.selectionData.forEach((row) => {
+        tableRef.value.toggleRowSelection(row, undefined);
+      });
       fnResetPagination();
       stop && stop();
     }
diff --git a/src/views/safety_production_related/security_notice/details.vue b/src/views/safety_production_related/security_notice/details.vue
index 979085f..4156dab 100644
--- a/src/views/safety_production_related/security_notice/details.vue
+++ b/src/views/safety_production_related/security_notice/details.vue
@@ -28,7 +28,7 @@
                 v-for="item in relatedClassificationList"
                 :key="item.BIANMA"
                 :label="item.NAME"
-                :value="item.BIANMA"
+                :value="item.NAME"
               />
             </el-select>
           </el-form-item>
@@ -45,7 +45,7 @@
               <el-button
                 class="ml-10"
                 type="primary"
-                @click="data.SelectPersonDialogVisible = true"
+                @click="data.dialog.SelectPersonDialogVisible = true"
               >
                 选择
               </el-button>
@@ -97,8 +97,8 @@
       <el-button type="primary" @click="fnSubmit"> 确定 </el-button>
     </div>
     <select-person
-      v-model:visible="data.SelectPersonDialogVisible"
-      :list-data="data.listAll"
+      v-model:visible="data.dialog.SelectPersonDialogVisible"
+      :selection-data="data.dialog.selectionData"
       @submit="fnSelectPersonSubmit"
       @submitall="fnSelectAllRiskSubmit"
     />
@@ -141,23 +141,23 @@ const rules = {
 };
 const relatedClassificationTempList =
   await layoutFnGetNotificationsClassification();
-const relatedClassificationList = [];
-JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
-  relatedClassificationList.push({ name: e.id, BIANMA: e.name });
-});
 const router = useRouter();
 const data = reactive({
   form: {
     TITLE: "",
     CORPINFO_ID: "",
     LEVEL: "",
-    PERSON: "",
+    PERSON: [],
     fileList: [],
     videoList: [],
     NOTIFICATIONCONTENT: "",
     allStatus: 0, // 是否全选
     REPLYSTATUS: "",
   },
+  dialog: {
+    SelectPersonDialogVisible: false,
+    selectionData: [],
+  },
 });
 
 const fnSubmit = async () => {
@@ -211,7 +211,7 @@ const fnGetData = async () => {
   if (!NOTIFICATION_ID) return;
   const resData = await getSecurityNoticeInfo({ NOTIFICATION_ID });
   data.form = resData.pd;
-  data.form.PERSON = resData.names[0].NAME;
+  data.dialog.selectionData = resData.pd.PERSON_ID?.split(",");
   data.form.fileList = addingPrefixToFile([
     {
       FILEPATH: data.form.ATTACHMENT_ROUTE,
@@ -222,8 +222,11 @@ const fnGetData = async () => {
       FILEPATH: data.form.VIDEO_ROUTE,
     },
   ]);
+  const names = resData.pd.names;
+  data.form.PERSON = names.map((item) => item.NAME).join(",");
 };
 fnGetData();
+const relatedClassificationList = relatedClassificationTempList.value.list;
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/safety_production_related/security_notice/index.vue b/src/views/safety_production_related/security_notice/index.vue
index 4fa1358..ff00fcd 100644
--- a/src/views/safety_production_related/security_notice/index.vue
+++ b/src/views/safety_production_related/security_notice/index.vue
@@ -28,8 +28,8 @@
                 <el-option
                   v-for="item in relatedClassificationList"
                   :key="item.BIANMA"
-                  :label="item.name"
-                  :value="item.BIANMA"
+                  :label="item.NAME"
+                  :value="item.NAME"
                 />
               </el-select>
             </el-form-item>
@@ -61,34 +61,30 @@
         <el-table-column prop="TITLE" label="通知标题" width="400" />
         <el-table-column label="通知等级" width="200">
           <template #default="{ row }">
-            <el-tag>{{ row.LEVEL }}</el-tag>
+            <el-tag v-if="row.LEVEL === '紧急通知'" type="error">{{
+              row.LEVEL
+            }}</el-tag>
+            <el-tag v-if="row.LEVEL === '一般通知'">{{ row.LEVEL }}</el-tag>
+            <el-tag v-if="row.LEVEL === '重要通知'" type="warning">{{
+              row.LEVEL
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="POSTSTATUS" label="发布状态" width="200">
           <template #default="{ row }">
-            <el-tag v-if="row.POSTSTATUS === '0'" type="warning "
-              >待发布</el-tag
-            >
+            <el-tag v-if="row.POSTSTATUS === '0'" type="warning">待发布</el-tag>
             <el-tag v-else type="success">已发布</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="回复情况" width="150">
           <template #default="{ row }">
-            {{
-              row.REPLYSTATUSNUM
-                ? row.REPLYSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
-                : "0/" + row.TOTALREADDETAIL + "人"
-            }}
+            {{ row.COUNT_REPLY + "/" + row.TOTALREADDETAIL + "人" }}
           </template>
         </el-table-column>
 
         <el-table-column label="签收情况" width="150">
           <template #default="{ row }">
-            {{
-              row.SIGNEDSTATUSNUM
-                ? row.SIGNEDSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
-                : "0/" + row.TOTALREADDETAIL + "人"
-            }}
+            {{ row.COUNT_SIGNING + "/" + row.TOTALREADDETAIL + "人" }}
           </template>
         </el-table-column>
         <el-table-column prop="CREATETIME" label="创建时间" width="200" />
@@ -169,7 +165,7 @@
 <script setup>
 import { serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
-import { onMounted, ref } from "vue";
+import { ref } from "vue";
 import {
   getSecurityNoticeList,
   layoutFnGetNotificationsClassification,
@@ -192,6 +188,10 @@ const fnResetPaginationTransfer = () => {
     DEPTIDS: searchForm.value.DEPTIDS?.join(","),
   });
 };
+
+const relatedClassificationTempList =
+  await layoutFnGetNotificationsClassification();
+
 const fnBatchDelete = debounce(
   1000,
   async () => {
@@ -211,7 +211,6 @@ const fnBatchDelete = debounce(
   },
   { atBegin: true }
 );
-const relatedClassificationList = ref(null);
 
 // 删除事件
 const deleteItem = async (value) => {
@@ -231,11 +230,7 @@ const issueItem = async (value) => {
   ElMessage.success("发布成功");
   fnGetData();
 };
-
-onMounted(async () => {
-  const data = await layoutFnGetNotificationsClassification();
-  relatedClassificationList.value = JSON.parse(data.value.zTreeNodes);
-});
+const relatedClassificationList = relatedClassificationTempList.value.list;
 </script>
 
 <style scoped></style>
diff --git a/src/views/safety_production_related/security_notice/notice_info.vue b/src/views/safety_production_related/security_notice/notice_info.vue
index f50da16..5f64f0c 100644
--- a/src/views/safety_production_related/security_notice/notice_info.vue
+++ b/src/views/safety_production_related/security_notice/notice_info.vue
@@ -83,7 +83,7 @@ const detailItems = ref({
 const fnGetData = async () => {
   const response = await getSecurityNoticeInfo({ NOTIFICATION_ID });
   detailItems.value = response.pd;
-  console.log("detail",detailItems);
+  console.log("detail",response);
 };
 fnGetData();
 </script>