src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue

@@ -75,25 +75,6 @@
           <td class="bbg">动火作业实施时间</td>
           <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
-        <tr>
-          <td class="bbg">动火是否完成</td>
-          <td>
-            <span v-if="pd.FIRE_COMPLETED == 1">已完成</span>
-            <span v-else-if ="pd.FIRE_COMPLETED == 0">未完成</span>
-          </td>
-          <td class="bbg">作业现场是否清理</td>
-          <td>
-            <span v-if="pd.SITE_CLEANED == 1">已清理</span>
-            <span v-else-if ="pd.SITE_CLEANED == 0">未清理</span>
-          </td>
-        </tr>
-        <tr>
-          <td class="bbg">是否存在遗留火种</td>
-          <td>
-            <span v-if="pd.NO_REMAINING_EMBERS == 1">无遗留</span>
-            <span v-else-if ="pd.NO_REMAINING_EMBERS == 0">未确定无遗留火种</span>
-          </td>
-        </tr>
         <tr>
           <td colspan="4">
             <table class="table-ui">
@@ -165,23 +146,13 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</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">接受交底人</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">监护人</td>
           <td colspan="3">
@@ -296,7 +267,6 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
-      acceptConfessList: [],
       confessList: []
     }
   },
@@ -342,11 +312,6 @@ 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('')

src/views/map/dialog/hotworkFirst.vue

@@ -141,23 +141,13 @@
       <tr>
         <td class="bbg-transparent">接受交底人</td>
         <td colspan="10">
-          <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
+          <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
             <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</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="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">
@@ -283,7 +273,6 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
-      acceptConfessList: [],
       confessList: []
     }
   },
@@ -331,11 +320,6 @@ 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('')

static/config.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.0.49:8092/', // 前台地址
-  httpurl: 'http://192.168.0.49:8092/', // 后台地址
+  weburl: 'http://192.168.0.45:8082/', // 前台地址
+  httpurl: 'http://192.168.151.43:8092/', // 后台地址
   qyurl: 'http://192.168.0.45:8080/', // 企业前台
   fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址
   publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',