From 3db91701d06ad94703763e4d0b49719782743294 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Mon, 11 Mar 2024 18:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E5=B2=97=E4=BD=8D=E5=AE=89=E5=85=A8=E6=89=BF?=
 =?UTF-8?q?=E8=AF=BA=E4=B9=A6=E5=BC=80=E5=8F=91=20=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=B4=A3=E4=BB=BB=E4=B9=A6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/traffic_safety_commitment.js      |  3 +++
 src/views/labor_contract/details.vue          | 24 +++++++++++++------
 src/views/occupational_hazards/details.vue    | 19 +++++++++++----
 src/views/occupational_hazards/index.vue      |  2 +-
 .../safety_meeting/meeting_info.vue           |  6 ++---
 src/views/safety_responsibility/details.vue   | 21 ++++++++++++----
 src/views/safety_responsibility/index.vue     |  2 +-
 src/views/security_commitment/details.vue     | 22 ++++++++++++-----
 8 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/src/request/traffic_safety_commitment.js b/src/request/traffic_safety_commitment.js
index a2db6a1..1a2713f 100644
--- a/src/request/traffic_safety_commitment.js
+++ b/src/request/traffic_safety_commitment.js
@@ -6,3 +6,6 @@ export const addCommitmentView = (params) => upload("/commitment/add", params);
 
 export const editCommitmentView = (params) =>
   upload("/commitment/edit", params); // 修改 承诺书
+
+export const infoCommitmentView = (params) =>
+  upload("/commitment/goEdit", params); // 详情 承诺书
diff --git a/src/views/labor_contract/details.vue b/src/views/labor_contract/details.vue
index 25df689..e2e4cf3 100644
--- a/src/views/labor_contract/details.vue
+++ b/src/views/labor_contract/details.vue
@@ -1,9 +1,14 @@
 <template>
   <div>
     <layout-card>
-      <!-- 内容，可能是一个加载中的提示或其他内容 -->
       <div v-if="loading">加载中...</div>
-      <div v-else>文件已尝试打开，请检查您的下载文件夹或弹出窗口设置。</div>
+      <div v-else>
+        <layout-pdf
+          v-model:visible="pdfDialog.visible"
+          :src="pdfDialog.src"
+          append-to-body
+        ></layout-pdf>
+      </div>
     </layout-card>
   </div>
 </template>
@@ -11,17 +16,22 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
-import { infoStaffingView } from "@/request/traffic_safety_staffing.js";
+import LayoutPdf from "@/components/pdf/index.vue";
+import { infoContractView } from "@/request/traffic_safety_contract.js";
 
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 const route = useRoute();
-const STAFFING_ID = route.query.STAFFING_ID;
+const LABORCONTRACT_ID = route.query.LABORCONTRACT_ID;
 const loading = ref(true); // 用于指示文件是否正在加载
+const pdfDialog = ref({ visible: false, src: "" });
 
 onMounted(async () => {
-  const response = await infoStaffingView({ STAFFING_ID });
+  const response = await infoContractView({ LABORCONTRACT_ID });
+  if (response.pd && response.pd.ATTACHMENT_ROUTE) {
+    pdfDialog.value.src = VITE_FILE_URL + response.pd.ATTACHMENT_ROUTE;
+    pdfDialog.value.visible = true;
+  }
   loading.value = false; // 加载完成
-  console.log(response.pd.ATTACHMENT_ROUTE, "111111111111111111111111111");
-  window.open(response.pd.ATTACHMENT_ROUTE, "_blank");
 });
 </script>
 
diff --git a/src/views/occupational_hazards/details.vue b/src/views/occupational_hazards/details.vue
index 20406c9..a052be9 100644
--- a/src/views/occupational_hazards/details.vue
+++ b/src/views/occupational_hazards/details.vue
@@ -1,9 +1,14 @@
 <template>
   <div>
     <layout-card>
-      <!-- 内容，可能是一个加载中的提示或其他内容 -->
       <div v-if="loading">加载中...</div>
-      <div v-else>文件已尝试打开，请检查您的下载文件夹或弹出窗口设置。</div>
+      <div v-else>
+        <layout-pdf
+          v-model:visible="pdfDialog.visible"
+          :src="pdfDialog.src"
+          append-to-body
+        ></layout-pdf>
+      </div>
     </layout-card>
   </div>
 </template>
@@ -12,18 +17,24 @@
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
 import { infoOccupationalHazardsView } from "@/request/traffic_occupational_hazards.js";
+import LayoutPdf from "@/components/pdf/index.vue";
 
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 const route = useRoute();
 const OCCUPATIONALHAZARDS_ID = route.query.OCCUPATIONALHAZARDS_ID;
 const loading = ref(true); // 用于指示文件是否正在加载
+const pdfDialog = ref({ visible: false, src: "" });
 
 onMounted(async () => {
   const response = await infoOccupationalHazardsView({
     OCCUPATIONALHAZARDS_ID,
   });
+
+  if (response.pd && response.pd.ATTACHMENT_ROUTE) {
+    pdfDialog.value.src = VITE_FILE_URL + response.pd.ATTACHMENT_ROUTE;
+    pdfDialog.value.visible = true;
+  }
   loading.value = false; // 加载完成
-  console.log(response.pd.ATTACHMENT_ROUTE, "111111111111111111111111111");
-  window.open(response.pd.ATTACHMENT_ROUTE, "_blank");
 });
 </script>
 
diff --git a/src/views/occupational_hazards/index.vue b/src/views/occupational_hazards/index.vue
index a4cc04a..3a635cc 100644
--- a/src/views/occupational_hazards/index.vue
+++ b/src/views/occupational_hazards/index.vue
@@ -82,7 +82,7 @@
               link
               @click="
                 router.push({
-                  path: '/labor_contract/details',
+                  path: '/occupational_hazards/details',
                   query: {
                     OCCUPATIONALHAZARDS_ID: row.OCCUPATIONALHAZARDS_ID,
                   },
diff --git a/src/views/safety_production_related/safety_meeting/meeting_info.vue b/src/views/safety_production_related/safety_meeting/meeting_info.vue
index 879bad0..d66621a 100644
--- a/src/views/safety_production_related/safety_meeting/meeting_info.vue
+++ b/src/views/safety_production_related/safety_meeting/meeting_info.vue
@@ -47,14 +47,14 @@
       >
         <el-table-column label="头像" align="center">
           <template #default="{ row }">
-            <img :src="row.USERAVATARURL" alt="Avatar" />
+            <img :src="VITE_FILE_URL + row.USERAVATARURL" alt="Avatar" />
           </template>
         </el-table-column>
         <el-table-column label="姓名" align="center">
           <template #default="{ row }"> {{ row.NAME }}<br /> </template>
         </el-table-column>
-        <el-table-column label="手机号" align="center">
-          <template #default="{ row }"> {{ row.USERNAME }}<br /> </template>
+        <el-table-column label="参会时间" align="center">
+          <template #default="{ row }"> {{ row.OPERATTIME }}<br /> </template>
         </el-table-column>
         <el-table-column label="参会地址" align="center">
           <template #default="{ row }">
diff --git a/src/views/safety_responsibility/details.vue b/src/views/safety_responsibility/details.vue
index af4143e..7868c45 100644
--- a/src/views/safety_responsibility/details.vue
+++ b/src/views/safety_responsibility/details.vue
@@ -1,9 +1,14 @@
 <template>
   <div>
     <layout-card>
-      <!-- 内容，可能是一个加载中的提示或其他内容 -->
       <div v-if="loading">加载中...</div>
-      <div v-else>文件已尝试打开，请检查您的下载文件夹或弹出窗口设置。</div>
+      <div v-else>
+        <layout-pdf
+          v-model:visible="pdfDialog.visible"
+          :src="pdfDialog.src"
+          append-to-body
+        ></layout-pdf>
+      </div>
     </layout-card>
   </div>
 </template>
@@ -11,16 +16,22 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
-import { infoStaffingView } from "@/request/traffic_safety_staffing.js";
+import LayoutPdf from "@/components/pdf/index.vue";
+import { infoResponsibilityView } from "@/request/traffic_safety_responsibility.js";
 
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 const route = useRoute();
 const SAFETYRESPONSIBILITY_ID = route.query.SAFETYRESPONSIBILITY_ID;
 const loading = ref(true); // 用于指示文件是否正在加载
+const pdfDialog = ref({ visible: false, src: "" });
 
 onMounted(async () => {
-  const response = await infoStaffingView({ SAFETYRESPONSIBILITY_ID });
+  const response = await infoResponsibilityView({ SAFETYRESPONSIBILITY_ID });
+  if (response.pd && response.pd.ATTACHMENT_ROUTE) {
+    pdfDialog.value.src = VITE_FILE_URL + response.pd.ATTACHMENT_ROUTE;
+    pdfDialog.value.visible = true;
+  }
   loading.value = false; // 加载完成
-  window.open(response.pd.ATTACHMENT_ROUTE, "_blank");
 });
 </script>
 
diff --git a/src/views/safety_responsibility/index.vue b/src/views/safety_responsibility/index.vue
index 2fa0225..165cd35 100644
--- a/src/views/safety_responsibility/index.vue
+++ b/src/views/safety_responsibility/index.vue
@@ -82,7 +82,7 @@
               link
               @click="
                 router.push({
-                  path: '/labor_contract/details',
+                  path: '/safety_responsibility/details',
                   query: {
                     SAFETYRESPONSIBILITY_ID: row.SAFETYRESPONSIBILITY_ID,
                   },
diff --git a/src/views/security_commitment/details.vue b/src/views/security_commitment/details.vue
index 41f729e..7f9a588 100644
--- a/src/views/security_commitment/details.vue
+++ b/src/views/security_commitment/details.vue
@@ -1,9 +1,14 @@
 <template>
   <div>
     <layout-card>
-      <!-- 内容，可能是一个加载中的提示或其他内容 -->
       <div v-if="loading">加载中...</div>
-      <div v-else>文件已尝试打开，请检查您的下载文件夹或弹出窗口设置。</div>
+      <div v-else>
+        <layout-pdf
+          v-model:visible="pdfDialog.visible"
+          :src="pdfDialog.src"
+          append-to-body
+        ></layout-pdf>
+      </div>
     </layout-card>
   </div>
 </template>
@@ -11,17 +16,22 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
-import { infoStaffingView } from "@/request/traffic_safety_staffing.js";
+import LayoutPdf from "@/components/pdf/index.vue"; // 确保已经正确导入LayoutPdf组件
+import { infoCommitmentView } from "@/request/traffic_safety_commitment.js";
 
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 const route = useRoute();
 const SECURITYCOMMITMENT_ID = route.query.SECURITYCOMMITMENT_ID;
 const loading = ref(true); // 用于指示文件是否正在加载
+const pdfDialog = ref({ visible: false, src: "" }); // 控制PDF预览对话框的显示和PDF源地址
 
 onMounted(async () => {
-  const response = await infoStaffingView({ SECURITYCOMMITMENT_ID });
+  const response = await infoCommitmentView({ SECURITYCOMMITMENT_ID });
+  if (response.pd && response.pd.ATTACHMENT_ROUTE) {
+    pdfDialog.value.src = VITE_FILE_URL + response.pd.ATTACHMENT_ROUTE; // 设置PDF文件的路径
+    pdfDialog.value.visible = true; // 显示PDF预览对话框
+  }
   loading.value = false; // 加载完成
-  console.log(response.pd.ATTACHMENT_ROUTE, "111111111111111111111111111");
-  window.open(response.pd.ATTACHMENT_ROUTE, "_blank");
 });
 </script>