From df72d063326b979377a859a816f16c8ade53dc1a Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Mon, 8 Apr 2024 18:02:34 +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/request/safety_production_related.js      |  6 ++++++
 src/request/traffic_occupational_hazards.js   |  3 +++
 src/request/traffic_safety_production.js      |  4 ++++
 .../operation_vehicle/add.vue                 |  4 ++--
 .../operation_vehicle/edit.vue                |  4 ++--
 .../operation_vehicle/view.vue                |  8 ++-----
 src/views/occupational_hazards/details.vue    |  4 ++--
 .../firefightingmaintain.vue                  | 21 +++++++++++++++++--
 .../management_agreement/components/add.vue   |  1 -
 .../management_agreement/index.vue            |  4 ++--
 .../violation_registration/add.vue            | 15 ++++++-------
 .../safety_activities/components/add.vue      |  2 +-
 .../safety_manual/components/add.vue          |  2 +-
 src/views/safety_production/index.vue         |  9 ++++----
 .../course_management/view.vue                |  4 +++-
 15 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js
index 2000a2e..0aff50f 100644
--- a/src/request/safety_production_related.js
+++ b/src/request/safety_production_related.js
@@ -29,6 +29,10 @@ export const layoutFnGetNotificationsClassification = async () => {
   return ref(resData);
 };
 
+// 获取交通处罚从业人员列表
+export const getTrafficPenaltyUserList = (params) =>
+  post("/user/getTrafficPenaltyUserList", params);
+
 // 从业类型（人员类型）
 export const layoutFnGetSIGNEDSTATUSClassification = async () => {
   const resData = await getLevelsByObject({
@@ -36,4 +40,6 @@ export const layoutFnGetSIGNEDSTATUSClassification = async () => {
     BIANMA: "TRAFFIC_EMPLOYMENT",
   });
   return ref(resData);
+
+
 };
diff --git a/src/request/traffic_occupational_hazards.js b/src/request/traffic_occupational_hazards.js
index 83647d8..c59dbda 100644
--- a/src/request/traffic_occupational_hazards.js
+++ b/src/request/traffic_occupational_hazards.js
@@ -14,3 +14,6 @@ export const infoOccupationalHazardsView = (params) =>
 
 export const deleteOccupationalHazardsView = (params) =>
   post("/occupationalhazards/delete", params); // 删除 岗位安全责任书
+
+export const getSafetyOccupationalHazardsEdit = (params) =>
+  upload("/occupationalhazards/getSafetyOccupationalHazardsEdit", params); // 详情 职业危害告知书
diff --git a/src/request/traffic_safety_production.js b/src/request/traffic_safety_production.js
index aee9169..656998e 100644
--- a/src/request/traffic_safety_production.js
+++ b/src/request/traffic_safety_production.js
@@ -11,3 +11,7 @@ export const infoProductionView = (params) =>
 
 export const deleteProductionView = (params) =>
   upload("/production/delete", params); // 删除 安全生产目标
+
+
+export const getSafetyProductionEdit = (params) =>
+  upload("/production/getSafetyProductionEdit", params); // 详情 安全生产目标
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
index a06223a..42815c3 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
@@ -550,7 +550,7 @@ const fnSubmit = debounce(
         await fnUploadImage(
           currentOperatingVehicleId,
           form.value.DRIVINGLICENSE_PHOTO[i].raw,
-          131
+          121
         );
       }
     }
@@ -559,7 +559,7 @@ const fnSubmit = debounce(
         await fnUploadImage(
           currentOperatingVehicleId,
           form.value.OPERATING_CERTIFICATE_PHOTO[i].raw,
-          132
+          122
         );
       }
     }
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
index aec1834..2cb94e4 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
@@ -521,7 +521,7 @@ const fnSubmit = debounce(
         await fnUploadImage(
           currentOperatingVehicleId,
           form.value.DRIVINGLICENSE_PHOTO[i].raw,
-          131
+          121
         );
       }
     }
@@ -530,7 +530,7 @@ const fnSubmit = debounce(
         await fnUploadImage(
           currentOperatingVehicleId,
           form.value.OPERATING_CERTIFICATE_PHOTO[i].raw,
-          132
+          122
         );
       }
     }
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
index 28b6d3d..41f3023 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
@@ -160,12 +160,8 @@ const fnGetData = async () => {
   const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID });
   info.value = resData.pd;
   info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto);
-  info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(
-    resData.drivinglicensephoto
-  );
-  info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(
-    resData.operatingcertificatephoto
-  );
+  info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(resData.drivinglicensephoto);
+  info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(resData.operatingcertificatephoto);
 };
 fnGetData();
 </script>
diff --git a/src/views/occupational_hazards/details.vue b/src/views/occupational_hazards/details.vue
index 7b67e84..0b9307f 100644
--- a/src/views/occupational_hazards/details.vue
+++ b/src/views/occupational_hazards/details.vue
@@ -111,7 +111,7 @@ import Add from "@/views/occupational_hazards/components/add.vue";
 import LayoutPdf from "@/components/pdf/index.vue";
 import {
   deleteOccupationalHazardsView,
-  getSafetyOccupationalHazardsList,
+  getSafetyOccupationalHazardsEdit,
   getSafetyOccupationalHazardsUserList,
 } from "@/request/traffic_occupational_hazards.js";
 
@@ -155,7 +155,7 @@ const fnAddOrEdit = async (
   data.addOrEditDialog.type = type;
   data.addOrEditDialog.form = {};
   if (type === "edit" && OCCUPATIONALHAZARDS_ID) {
-    const resData = await getSafetyOccupationalHazardsList({
+    const resData = await getSafetyOccupationalHazardsEdit({
       OCCUPATIONALHAZARDS_ID,
     });
     if (resData && resData.varList && resData.varList.length > 0) {
diff --git a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
index f456c03..0974d35 100644
--- a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
+++ b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
@@ -2,6 +2,9 @@
   <layout-card>
     <el-divider content-position="left">基本信息</el-divider>
     <el-descriptions border>
+      <el-descriptions-item label="设备编号">
+        {{ data.FACILITY_NUMBER }}
+      </el-descriptions-item>
       <el-descriptions-item label="设施名称">
         {{ data.FACILITY_NAME }}
       </el-descriptions-item>
@@ -20,6 +23,18 @@
       <el-descriptions-item label="登记时间">
         {{ data.REGISTRATION_TIME }}
       </el-descriptions-item>
+      <el-descriptions-item label="设备设施">
+        <img
+          v-for="item in data.Images"
+          :key="item.FILEPATH"
+          v-viewer
+          :src="item.url"
+          width="100"
+          height="100"
+          alt=""
+          class="ml-10"
+        />
+      </el-descriptions-item>
     </el-descriptions>
     <el-divider content-position="left">保养记录</el-divider>
     <layout-table :data="list" :show-pagination="false">
@@ -84,15 +99,17 @@ import useListData from "@/assets/js/useListData.js";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import { debounce } from "throttle-debounce";
 import { ElMessage, ElMessageBox } from "element-plus";
+import { addingPrefixToFile } from "@/assets/js/utils.js";
 const route = useRoute();
 const router = useRouter();
 const { FIREFIGHTINGFACILITY_ID } = route.query;
 const data = ref({});
 const getData = async () => {
-  const { pd } = await getFirefightingEquipmentFacilityView({
+  const resData = await getFirefightingEquipmentFacilityView({
     FIREFIGHTINGFACILITY_ID,
   });
-  data.value = pd;
+  data.value = resData.pd;
+  data.value.Images = addingPrefixToFile(resData.firefightingequipmentImg);
 };
 getData();
 const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, {
diff --git a/src/views/production_course_regulate/management_agreement/components/add.vue b/src/views/production_course_regulate/management_agreement/components/add.vue
index e8cdb28..66a9980 100644
--- a/src/views/production_course_regulate/management_agreement/components/add.vue
+++ b/src/views/production_course_regulate/management_agreement/components/add.vue
@@ -6,7 +6,6 @@
   >
     <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
       <el-form-item
-        v-if="type === 'add'"
         label="名称"
         prop="MANAGEMENTAGREEMENTNAME"
       >
diff --git a/src/views/production_course_regulate/management_agreement/index.vue b/src/views/production_course_regulate/management_agreement/index.vue
index ffdbfee..75a26af 100644
--- a/src/views/production_course_regulate/management_agreement/index.vue
+++ b/src/views/production_course_regulate/management_agreement/index.vue
@@ -65,8 +65,8 @@
         </el-table-column>
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
-            <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
+            <el-tag v-if="row.VALIDSTATUS === '1'" type = "success">正常</el-tag>
+            <el-tag v-else-if="row.VALIDSTATUS === '0'" type = "error">未生效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
diff --git a/src/views/production_course_regulate/violation_registration/add.vue b/src/views/production_course_regulate/violation_registration/add.vue
index 2eb8290..e904303 100644
--- a/src/views/production_course_regulate/violation_registration/add.vue
+++ b/src/views/production_course_regulate/violation_registration/add.vue
@@ -107,7 +107,7 @@
 </template>
 
 <script setup>
-import { getUserListAll } from "@/request/safety_production_related.js";
+import { getTrafficPenaltyUserList } from "@/request/safety_production_related.js";
 import { onMounted, reactive, ref, toRaw } from "vue";
 import { PENALTYMETHODMENU, TRUCKMENU } from "@/assets/js/constant.js";
 import LayoutUpload from "@/components/upload/index.vue";
@@ -152,14 +152,9 @@ onMounted(async () => {
     REGISTRATION_ID: registrationId.value,
   }); */
 });
+const userList = await getTrafficPenaltyUserList();
 
 const router = useRouter();
-const fnGetUnitsList = async () => {
-  const resData = await getUserListAll({});
-  data.unitsList = resData.userList;
-};
-fnGetUnitsList();
-
 const data = reactive({
   form: {
     TRANSPORTVEHICLE: "",
@@ -172,6 +167,12 @@ const data = reactive({
     fileList: [],
   },
 });
+const fnGetUnitsList = async () => {
+  const resData = userList
+  data.unitsList = resData.userList.varList;
+};
+fnGetUnitsList();
+
 
 const fnSubmit = async () => {
   await useFormValidate(formRef);
diff --git a/src/views/safety_culture/safety_activities/components/add.vue b/src/views/safety_culture/safety_activities/components/add.vue
index 1c1764c..c958252 100644
--- a/src/views/safety_culture/safety_activities/components/add.vue
+++ b/src/views/safety_culture/safety_activities/components/add.vue
@@ -5,7 +5,7 @@
     :before-close="fnClose"
   >
     <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
-      <el-form-item v-if="type === 'add'" label="名称" prop="ACTIVITIESNAME">
+      <el-form-item label="名称" prop="ACTIVITIESNAME">
         <el-input
           v-model="form.ACTIVITIESNAME"
           placeholder="请输入名称"
diff --git a/src/views/safety_culture/safety_manual/components/add.vue b/src/views/safety_culture/safety_manual/components/add.vue
index b85e37a..145eb80 100644
--- a/src/views/safety_culture/safety_manual/components/add.vue
+++ b/src/views/safety_culture/safety_manual/components/add.vue
@@ -5,7 +5,7 @@
     :before-close="fnClose"
   >
     <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
-      <el-form-item v-if="type === 'add'" label="名称" prop="MANUALNAME">
+      <el-form-item label="名称" prop="MANUALNAME">
         <el-input
           v-model="form.MANUALNAME"
           placeholder="请输入名称"
diff --git a/src/views/safety_production/index.vue b/src/views/safety_production/index.vue
index 7c57538..60809a9 100644
--- a/src/views/safety_production/index.vue
+++ b/src/views/safety_production/index.vue
@@ -23,8 +23,8 @@
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>
-                <el-option label="正常" :value="1" />
-                <el-option label="未生效" :value="0" />
+                <el-option label="正常" value="1" />
+                <el-option label="未生效" value="2" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -62,7 +62,7 @@
         <el-table-column label="有效状态" prop="VALIDSTATUS">
           <template #default="{ row }">
             <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
-            <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
+            <el-tag v-else-if="row.VALIDSTATUS === '2'">未生效</el-tag>
           </template>
         </el-table-column>
         <!--        <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
@@ -129,6 +129,7 @@ import {
   deleteProductionView,
   getSafetyProductionList,
   infoProductionView,
+  getSafetyProductionEdit,
 } from "@/request/traffic_safety_production.js";
 import ViewInfo from "./components/view.vue";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -150,7 +151,7 @@ const fnAddOrEdit = async (SAFETYPRODUCTION_ID = "", type = "add") => {
   data.addOrEditDialog.visible = true;
   data.addOrEditDialog.type = type;
   if (type === "edit" && SAFETYPRODUCTION_ID) {
-    const resData = await getSafetyProductionList({ SAFETYPRODUCTION_ID });
+    const resData = await getSafetyProductionEdit({ SAFETYPRODUCTION_ID });
     if (resData && resData.varList && resData.varList.length > 0) {
       const detail = resData.varList[0];
       data.addOrEditDialog.form = {
diff --git a/src/views/training_resource_management/course_management/view.vue b/src/views/training_resource_management/course_management/view.vue
index 5914548..240f860 100644
--- a/src/views/training_resource_management/course_management/view.vue
+++ b/src/views/training_resource_management/course_management/view.vue
@@ -13,11 +13,13 @@
       </el-descriptions-item>
       <el-descriptions-item label="课程封面">
         <img
+          v-if="data.info.COVERPATH"
           v-viewer
           :src="VITE_FILE_URL + data.info.COVERPATH"
-          alt=""
           width="100"
           height="100"
+          alt=""
+          class="ml-10"
         />
       </el-descriptions-item>
     </el-descriptions>