动火作业相关页面接受交底人由一个修改为展示多个，新增动火是否完成，作业现场是否清理，是否存在遗留火种三个字段显示

config/index.js

@@ -11,7 +11,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target: 'http://192.168.151.43:8091/',
+        target: 'http://192.168.0.49:8091/',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''

src/views/hotwork_cfd/hotwork/components/detail.vue

@@ -75,6 +75,25 @@
           <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 ==1">未清理</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">
@@ -149,13 +168,14 @@
         <tr>
           <td class="bbg">接受交底人</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">
+              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
             </div>
           </td>
         </tr>
+
         <tr>
           <td class="bbg">监护人</td>
           <td colspan="3">
@@ -270,6 +290,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -315,6 +336,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('')

src/views/hotwork_cfd/pigeonhole/components/detail.vue

@@ -74,7 +74,25 @@
             <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 ==1">未清理</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">
@@ -149,10 +167,10 @@
           <tr>
             <td class="bbg">接受交底人</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">
+                <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-                <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+                <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
               </div>
             </td>
           </tr>
@@ -274,6 +292,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -399,6 +418,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('')

src/views/map/dialog/hotworkFirst.vue

@@ -138,10 +138,10 @@
       <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">
+            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-            <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
           </div>
         </td>
       </tr>
@@ -271,6 +271,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -318,6 +319,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('')

static/config.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.151.43:8080/', // 前台地址
+  weburl: 'http://192.168.0.49:8080/', // 前台地址
-  httpurl: 'http://192.168.151.43:8091/', // 后台地址
+  httpurl: 'http://192.168.0.49:8091/', // 后台地址
   qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
   adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
   // 正式