Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求

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

@@ -75,23 +75,20 @@
           <td class="bbg">动火作业实施时间</td>
           <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
-        <tr>
+        <tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
           <td class="bbg">动火是否完成</td>
           <td>
-            <span v-if="pd.FIRE_COMPLETED == 1">已完成</span>
+            <span>已完成</span>
-            <span v-else-if ="pd.FIRE_COMPLETED == 0">未完成</span>
           </td>
-          <td class="bbg">作业现场是否清理</td>
+          <td class="bbg">动火是否完成</td>
           <td>
-            <span v-if="pd.SITE_CLEANED == 1">已清理</span>
+            <span>已清理</span>
-            <span v-else-if ="pd.SITE_CLEANED == 0">未清理</span>
           </td>
         </tr>
-        <tr>
+        <tr v-if="pd.NO_REMAINING_EMBERS === '1'">
           <td class="bbg">是否存在遗留火种</td>
           <td>
-            <span v-if="pd.NO_REMAINING_EMBERS == 1">无遗留</span>
+            <span>无遗留火种</span>
-            <span v-else-if ="pd.NO_REMAINING_EMBERS == 0">未确定无遗留火种</span>
           </td>
         </tr>
         <tr>
@@ -204,7 +201,7 @@
         </tr>
         <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT  }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -214,7 +211,7 @@
         </tr>
         <tr v-if="pd.BELONGING_SIGNATURE">
           <td colspan="6">
-            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@@ -224,7 +221,7 @@
         </tr>
         <tr v-if="pd.LEADER_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
+            <div>所在单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -234,7 +231,7 @@
         </tr>
         <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -244,7 +241,7 @@
         </tr>
         <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -254,7 +251,7 @@
         </tr>
         <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -264,7 +261,7 @@
         </tr>
         <tr v-if="imgList1.length>0">
           <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
             <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -347,23 +344,23 @@ export default {
             this.acceptConfessList.push(item)
           }
         })
-        for (let i = 0; i < data.measuresList.length; i++) {
+        // for (let i = 0; i < data.measuresList.length; i++) {
-          // 将字符串转成数组
+        //   // 将字符串转成数组
-          const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
+        //   const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
-          for (let j = 1; j <= 3; j++) {
+        //   for (let j = 1; j <= 3; j++) {
-            // 判断字符串是否存在
+        //     // 判断字符串是否存在
-            if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
+        //     if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
-              // 给字符串后面添加上需要的数据
+        //       // 给字符串后面添加上需要的数据
-              PROTECTIVE_MEASURES.splice(
+        //       PROTECTIVE_MEASURES.splice(
-                this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
+        //         this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
-                0,
+        //         0,
-                data.measuresList[i]['ANSWER' + j]
+        //         data.measuresList[i]['ANSWER' + j]
-              )
+        //       )
-            }
+        //     }
-          }
+        //   }
-          // 将数组转回字符串
+        //   // 将数组转回字符串
-          data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
+        //   data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
-        }
+        // }
         this.measuresList = data.measuresList // 参数map
         this.gasList = data.gasList // 参数map
         if (this.pd.WORK_LEVEL === '二级') {

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

@@ -52,14 +52,14 @@
         <template slot-scope="{row}">
           <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
           <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
-          <span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
+          <span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</span>
           <span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
           <span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
           <span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
           <span v-else-if="row.APPLY_STATUS==6">班长待验票</span>
           <span v-else-if="row.APPLY_STATUS==7">待验收</span>
           <span v-else-if="row.APPLY_STATUS==8">验收归档</span>
-          <span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</span>
+          <span v-else-if="row.APPLY_STATUS==-1.5">项目主管部门审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-4">所在单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>

src/views/map/dialog/hotworkFirst.vue

@@ -73,27 +73,31 @@
             <tr>
               <td>序号</td>
               <td>安全措施</td>
-              <td style="width: 80px; text-align: center">是否涉及</td>
+              <td style="width: 80px; text-align: center;">是否涉及</td>
-              <td style="width: 80px; text-align: center">确认人</td>
+              <td style="width: 80px; text-align: center;">确认人</td>
             </tr>
-            <tr v-for="(item,index) in measuresList" :key="index">
+            <tr v-for="(item, index) in measuresList" :key="index">
-              <td>{{ index + 1 }}</td>
+              <td style="text-align: center;">{{ index + 1 }}</td>
               <td>
                 {{ item.PROTECTIVE_MEASURES }}
-                <!--                  <template v-if="item.QUESTION1">-->
+                <!--
-                <!--                    {{ item.QUESTION1 }}({{ item.ANSWER1 }})-->
+                <template v-if="item.QUESTION1">
-                <!--                  </template>-->
+                  {{ item.QUESTION1 }}({{ item.ANSWER1 }})
-                <!--                  <template v-if="item.QUESTION2">-->
+                </template>
-                <!--                    、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }})-->
+                <template v-if="item.QUESTION2">
-                <!--                  </template>-->
+                  、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }})
+                </template>
+                -->
               </td>
-              <td>
+              <td style="text-align: center;">
-                <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
+                <span v-if="item.STATUS == '1'">
-                <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
+                  <input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及
-              </td>
+                </span>
-              <td>
+                <span v-if="item.STATUS == '-1'">
-                {{ item.CONFIRM_NAME }}
+                  <input type="radio" disabled checked>不涉及
+                </span>
               </td>
+              <td style="text-align: center;">{{ item.CONFIRM_NAME }}</td>
             </tr>
             <tr v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES
             || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">