From 8d91edbab0821dced4d145eed6b00e9dc0543bca Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Tue, 27 Feb 2024 16:33:44 +0800
Subject: [PATCH] =?UTF-8?q?BI=E9=A1=B5=E9=9D=A2=E5=9B=9B=E8=89=B2=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/hazard_investigation.js           |  1 -
 .../checklist_inspection_status/index.vue     | 13 ++----
 .../components/list.vue                       |  8 ++--
 .../inventory_management/components/list.vue  |  8 ++--
 .../components/situation.vue                  | 46 ++++++++++++++-----
 5 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js
index 60f720b..bfae359 100644
--- a/src/request/hazard_investigation.js
+++ b/src/request/hazard_investigation.js
@@ -130,4 +130,3 @@ export const setCustomInsuranceCoverageSave = (params) =>
   post("/hiddenstandardCustom/saveBaoBaoType", params); // 清单管理设置包保责任类型提交
 export const getCustomCheckListOtherHiddenList = (params) =>
   post("/customHidden/getCheckHidden", params); // 隐患清单检查情况检查记录查看其它隐患列表
-export const getCorpinfo = (params) => post("/corpinfo/goEdit", params); // 获取企业信息
diff --git a/src/views/hazard_investigation/checklist_inspection_status/index.vue b/src/views/hazard_investigation/checklist_inspection_status/index.vue
index 90ce654..7e5f189 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/index.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/index.vue
@@ -185,7 +185,6 @@
         <el-table-column
           v-if="data.WHETHER_HAZARDS === 1"
           label="是否包保责任人任务"
-          width="90"
         >
           <template #default="{ row }">
             <span v-if="row.BAO_BAO_TYPE !== '1'"> 否 </span>
@@ -234,13 +233,11 @@ import {
   layoutFnGetInventoryType,
   layoutFnGetTroubleshootingCycle,
 } from "@/assets/js/data_dictionary.js";
-import {
-  getCorpinfo,
-  getRiskStandardStatusList,
-} from "@/request/hazard_investigation.js";
+import { getRiskStandardStatusList } from "@/request/hazard_investigation.js";
 import { useRouter } from "vue-router";
 import dayjs from "dayjs";
 import { reactive } from "vue";
+import { getEnterpriseInfo } from "@/request/enterprise_management.js";
 
 const data = reactive({
   WHETHER_HAZARDS: "",
@@ -251,11 +248,11 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination } =
 const troubleshootingCycleList = await layoutFnGetTroubleshootingCycle();
 const inventoryLevelList = await layoutFnGetInventoryLevel();
 const inventoryTypeList = await layoutFnGetInventoryType();
-const fnGetCorpinfo = async () => {
-  const resData = await getCorpinfo();
+const fnGetCorpInfo = async () => {
+  const resData = await getEnterpriseInfo();
   data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS;
 };
-fnGetCorpinfo();
+fnGetCorpInfo();
 const fnGetDataTransfer = () => {
   fnGetData({
     DEPTIDS: searchForm.value.DEPTIDS?.join(","),
diff --git a/src/views/hazard_investigation/delete_inventory_management/components/list.vue b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
index c47e66e..e3cb181 100644
--- a/src/views/hazard_investigation/delete_inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
@@ -197,7 +197,6 @@ import {
   layoutFnGetTroubleshootingType,
 } from "@/assets/js/data_dictionary.js";
 import {
-  getCorpinfo,
   getDeleteCustomList,
   getDeleteInventoryManagementList,
   setCustomBatchDelete,
@@ -207,6 +206,7 @@ import {
 } from "@/request/hazard_investigation.js";
 import { useRouter } from "vue-router";
 import { reactive } from "vue";
+import { getEnterpriseInfo } from "@/request/enterprise_management.js";
 
 const tabName = defineProps({
   name: {
@@ -228,11 +228,11 @@ const buttonJurisdiction = await useButtonJurisdiction("stoplistmanager");
 const inventoryTypeList = await layoutFnGetInventoryType();
 const troubleshootingTypeList = await layoutFnGetTroubleshootingType();
 const inventoryLevelList = await layoutFnGetInventoryLevel();
-const fnGetCorpinfo = async () => {
-  const resData = await getCorpinfo();
+const fnGetCorpInfo = async () => {
+  const resData = await getEnterpriseInfo();
   data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS;
 };
-fnGetCorpinfo();
+fnGetCorpInfo();
 const fnGetDataTransfer = () => {
   fnGetData({
     DEPTIDS: searchForm.value.DEPTIDS?.join(","),
diff --git a/src/views/hazard_investigation/inventory_management/components/list.vue b/src/views/hazard_investigation/inventory_management/components/list.vue
index 28252d4..93d8711 100644
--- a/src/views/hazard_investigation/inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/inventory_management/components/list.vue
@@ -346,7 +346,6 @@ import {
 } from "@/assets/js/data_dictionary.js";
 import { useUserStore } from "@/pinia/user.js";
 import {
-  getCorpinfo,
   getCustomList,
   getInventoryManagementList,
   getInventoryManagementRouteView,
@@ -364,6 +363,7 @@ import ListQrCode from "./list_qr_code.vue";
 import InspectionRoute from "./inspection_route.vue";
 import { useRouter } from "vue-router";
 import ImportCustom from "./import_custom.vue";
+import { getEnterpriseInfo } from "@/request/enterprise_management.js";
 
 const tabName = defineProps({
   name: {
@@ -415,11 +415,11 @@ const data = reactive({
   },
   WHETHER_HAZARDS: "",
 });
-const fnGetCorpinfo = async () => {
-  const resData = await getCorpinfo();
+const fnGetCorpInfo = async () => {
+  const resData = await getEnterpriseInfo();
   data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS;
 };
-fnGetCorpinfo();
+fnGetCorpInfo();
 const fnGetDataTransfer = () => {
   fnGetData({
     DEPTIDS: searchForm.value.DEPTIDS?.join(","),
diff --git a/src/views/large_screen_data_display/components/situation.vue b/src/views/large_screen_data_display/components/situation.vue
index d9f9fad..8c9e473 100644
--- a/src/views/large_screen_data_display/components/situation.vue
+++ b/src/views/large_screen_data_display/components/situation.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="situation">
     <div class="title">双重预防建设情况</div>
-    <div class="map"></div>
+    <div class="carousel">
+      <el-carousel arrow="always">
+        <el-carousel-item v-for="item in fourImgs" :key="item.IMGFILES_ID">
+          <img :src="item.url" alt="" />
+        </el-carousel-item>
+      </el-carousel>
+    </div>
     <div class="statistics">
       <div class="item">
         <div>
@@ -43,6 +49,8 @@
 import { ref } from "vue";
 import { getHiddenCount } from "@/request/large_screen_data_display.js";
 import CountTo from "vue-countup-v3";
+import { getEnterpriseInfo } from "@/request/enterprise_management.js";
+import { addingPrefixToFile } from "@/assets/js/utils.js";
 
 const info = ref({
   all: 0,
@@ -50,20 +58,23 @@ const info = ref({
   yzg: 0,
   yys: 0,
 });
+const fourImgs = ref([]);
 const fnGetData = async () => {
-  const resData = await getHiddenCount();
-  for (let i = 0; i < resData.all.length; i++) {
-    info.value.all += Number(resData.all[i]);
+  const hiddenCountData = await getHiddenCount();
+  for (let i = 0; i < hiddenCountData.all.length; i++) {
+    info.value.all += Number(hiddenCountData.all[i]);
   }
-  for (let i = 0; i < resData.wzg.length; i++) {
-    info.value.wzg += Number(resData.wzg[i]);
+  for (let i = 0; i < hiddenCountData.wzg.length; i++) {
+    info.value.wzg += Number(hiddenCountData.wzg[i]);
   }
-  for (let i = 0; i < resData.yzg.length; i++) {
-    info.value.yzg += Number(resData.yzg[i]);
+  for (let i = 0; i < hiddenCountData.yzg.length; i++) {
+    info.value.yzg += Number(hiddenCountData.yzg[i]);
   }
-  for (let i = 0; i < resData.yys.length; i++) {
-    info.value.yys += Number(resData.yys[i]);
+  for (let i = 0; i < hiddenCountData.yys.length; i++) {
+    info.value.yys += Number(hiddenCountData.yys[i]);
   }
+  const enterpriseInfoData = await getEnterpriseInfo();
+  fourImgs.value = addingPrefixToFile(enterpriseInfoData.fourImgs);
 };
 fnGetData();
 </script>
@@ -88,8 +99,21 @@ fnGetData();
     left: 0;
   }
 
-  .map {
+  .carousel {
     flex: 1;
+    margin: 20px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+    :deep {
+      .el-carousel {
+        height: 100%;
+        .el-carousel__container {
+          height: 100%;
+        }
+      }
+    }
   }
 
   .statistics {