From 1cdca25e3ccc908c191e14167d6ed6d50931cfbb Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 7 Jun 2024 17:23:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B1=95=E7=A4=BA=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/hotworkFirst.vue | 22 +++++++++++++++++++---
 static/config.js                      |  4 ++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 7678907..8084bfc 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -141,13 +141,23 @@
       <tr>
         <td class="bbg-transparent">接受交底人</td>
         <td colspan="10">
-          <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+          <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
             <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-            <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
           </div>
         </td>
       </tr>
+<!--      <tr>-->
+<!--        <td class="bbg-transparent">接受交底人</td>-->
+<!--        <td colspan="10">-->
+<!--          <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">-->
+<!--            <span>签字：</span>-->
+<!--            <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">-->
+<!--            <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>-->
+<!--          </div>-->
+<!--        </td>-->
+<!--      </tr>-->
       <tr>
         <td class="bbg-transparent">监护人</td>
         <td colspan="3">
@@ -273,6 +283,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -320,6 +331,11 @@ export default {
             this.confessList.push(item)
           }
         })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
         for (let i = 0; i < data.measuresList.length; i++) {
           // 将字符串转成数组
           const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
diff --git a/static/config.js b/static/config.js
index d26df72..fc72a21 100644
--- a/static/config.js
+++ b/static/config.js
@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.0.45:8082/', // 前台地址
-  httpurl: 'http://192.168.151.43:8092/', // 后台地址
+  weburl: 'http://192.168.0.49:8092/', // 前台地址
+  httpurl: 'http://192.168.0.49:8092/', // 后台地址
   qyurl: 'http://192.168.0.45:8080/', // 企业前台
   fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址
   publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',