diff --git a/src/views/hotwork_cfd/hotwork/components/detail.vue b/src/views/hotwork_cfd/hotwork/components/detail.vue
index 28381d7..6c90e95 100644
--- a/src/views/hotwork_cfd/hotwork/components/detail.vue
+++ b/src/views/hotwork_cfd/hotwork/components/detail.vue
@@ -35,6 +35,12 @@
           <td class="bbg">动火人及证书编号</td>
           <td colspan="3">{{ pd.WORK_USER }}</td>
         </tr>
+        <tr>
+          <td class="bbg">动火操作人图片</td>
+          <td colspan="3">
+            <img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
+          </td>
+        </tr>
         <tr>
           <td class="bbg">作业单位</td>
           <td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@@ -97,28 +103,33 @@
                   {{ item.CONFIRM_NAME }}
                 </td>
               </tr>
-              <tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
+              <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">
                 <td>{{ measuresList.length + 1 }}</td>
                 <td colspan="3">
-                  <div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
-                    <span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
+                  <div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
+                    <span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
                   </div>
+                  <div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
+                  </div>
+                  <div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
+                  </div>
+                  <!--                <div v-if="pd.GUARDIAN_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">-->
+                  <!--                  <span>属地监管单位：{{ pd.GUARDIAN_USER_MEASURES }}</span>-->
+                  <!--                </div>-->
                   <div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.LEADER_USER_NAME }}</span>
+                    <span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
                   </div>
                   <div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
+                    <span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
                   </div>
                   <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
+                    <span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
                   </div>
                   <div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
+                    <span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
                   </div>
                 </td>
               </tr>
@@ -128,10 +139,10 @@
         <tr>
           <td class="bbg">安全交底人</td>
           <td colspan="10">
-            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+            <div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.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>
@@ -155,6 +166,16 @@
             </div>
           </td>
         </tr>
+        <tr>
+          <td class="bbg">安全措施确认人</td>
+          <td colspan="3">
+            <div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
+              <span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
+            </div>
+          </td>
+        </tr>
         <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
           <td colspan="6">
             <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@@ -165,6 +186,16 @@
             </div>
           </td>
         </tr>
+        <tr v-if="pd.BELONGING_SIGNATURE">
+          <td colspan="6">
+            <div>项目主管部门负责人意见：{{ 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">
+              <span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
+            </div>
+          </td>
+        </tr>
         <tr v-if="pd.LEADER_USER_SIGNER_PATH">
           <td colspan="6">
             <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
@@ -197,7 +228,7 @@
         </tr>
         <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}</div>
+            <div>动火前验票负责人：{{ 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">
@@ -238,7 +269,8 @@ export default {
       gasList: [],
       imgList: [],
       imgList1: [],
-      otherProtectiveMeasures: []
+      otherProtectiveMeasures: [],
+      confessList: []
     }
   },
   created() {
@@ -278,6 +310,11 @@ export default {
         this.pd = data.pd // 参数map
         this.imgList = data.imgList
         this.imgList1 = data.imgList1
+        data.pd.confessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.confessList.push(item)
+          }
+        })
         for (let i = 0; i < data.measuresList.length; i++) {
           // 将字符串转成数组
           const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@@ -313,6 +350,13 @@ export default {
           this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
           this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
         }
+        const dongHuoCaoZuoRenPic = data.imgList2
+        if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+          this.pd.dongHuoCaoZuoRenPic = []
+          for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+            this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
+          }
+        }
       }).catch((e) => {
         this.listLoading = false
       })
diff --git a/src/views/hotwork_cfd/hotwork/components/list.vue b/src/views/hotwork_cfd/hotwork/components/list.vue
index 26917ef..2f092e8 100644
--- a/src/views/hotwork_cfd/hotwork/components/list.vue
+++ b/src/views/hotwork_cfd/hotwork/components/list.vue
@@ -51,12 +51,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==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==-2">作业负责人审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-4">属地监管单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
@@ -94,6 +96,12 @@
             <div>{{ pd.CONFIRM_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
+        <el-step title="项目主管部门意见">
+          <template slot="description">
+            <div>{{ pd.BELONGING_USER_NAME }}</div>
+            <div>{{ pd.BELONGING_SIGNATURE_TIME }}</div>
+          </template>
+        </el-step>
         <el-step title="属地监管单位意见">
           <template slot="description">
             <div>{{ pd.LEADER_USER_NAME }}</div>
@@ -209,12 +217,14 @@ export default {
         { ID: '', NAME: '请选择' },
         { ID: '0', NAME: '动火作业待提交' },
         { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '1.5', NAME: '项目负责人待审核' },
         { ID: '2', NAME: '属地监管单位待审核' },
         { ID: '4', NAME: '安全管理部门待审核' },
         { ID: '5', NAME: '动火审批人待审核' },
         { ID: '6', NAME: '班长待验票' },
         { ID: '7', NAME: '待验收' },
         { ID: '8', NAME: '验收归档' },
+        { ID: '-1.5', NAME: '项目负责人审核打回' },
         { ID: '-2', NAME: '作业负责人审核打回' },
         { ID: '-4', NAME: '属地监管单位审核打回' },
         { ID: '-5', NAME: '安全管理部门审核打回' },
@@ -304,23 +314,26 @@ export default {
       if (this.pd.APPLY_STATUS == '1') {
         return 1
       }
-      if (this.pd.APPLY_STATUS == '2') {
+      if (this.pd.APPLY_STATUS == '1.5') {
         return 2
       }
-      if (this.pd.APPLY_STATUS == '4') {
+      if (this.pd.APPLY_STATUS == '2') {
         return 3
       }
-      if (this.pd.APPLY_STATUS == '5') {
+      if (this.pd.APPLY_STATUS == '4') {
         return 4
       }
-      if (this.pd.APPLY_STATUS == '6') {
+      if (this.pd.APPLY_STATUS == '5') {
         return 5
       }
-      if (this.pd.APPLY_STATUS == '7') {
+      if (this.pd.APPLY_STATUS == '6') {
         return 6
       }
+      if (this.pd.APPLY_STATUS == '7') {
+        return 7
+      }
       if (this.pd.APPLY_STATUS == '8') {
-        return 8
+        return 9
       }
     },
     getProcessStatus() {
@@ -339,6 +352,13 @@ export default {
           OPERATTIME: this.pd.CREATTIME
         }
       }
+      if (this.pd.APPLY_STATUS == '-1.5') {
+        obj = {
+          title: '项目主管部门审核打回',
+          USER_NAME: this.pd.BELONGING_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
       if (this.pd.APPLY_STATUS == '-2') {
         obj = {
           title: '作业负责人审核打回',
diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 96da917..ec8c002 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -27,6 +27,12 @@
         <td class="bbg-transparent">动火人及证书编号</td>
         <td colspan="3">{{ pd.WORK_USER }}</td>
       </tr>
+      <tr>
+        <td class="bbg-transparent">动火操作人图片</td>
+        <td colspan="3">
+          <img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
+        </td>
+      </tr>
       <tr>
         <td class="bbg-transparent">作业单位</td>
         <td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@@ -44,7 +50,7 @@
         <tr :key="index">
           <td class="bbg-transparent">分析结果/%</td>
           <td>{{ item.ANALYZE_RESULT }}</td>
-          <td class="bbg-transparent">分析人</td>
+          <td class="bbg-transparent">气体单位负责人</td>
           <td>{{ item.ANALYZE_USER }}</td>
         </tr>
       </template>
@@ -89,28 +95,30 @@
                 {{ item.CONFIRM_NAME }}
               </td>
             </tr>
-            <tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
+            <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">
               <td>{{ measuresList.length + 1 }}</td>
               <td colspan="3">
-                <div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
-                  <span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
-                  <span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
+                <div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
+                  <span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
+                </div>
+                <div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                  <span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
+                </div>
+                <div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                  <span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
                 </div>
                 <div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                  <span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
-                  <span>编制人：{{ pd.LEADER_USER_NAME }}</span>
+                  <span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
                 </div>
                 <div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                  <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
-                  <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
+                  <span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
                 </div>
                 <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                  <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
-                  <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
+                  <span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
                 </div>
                 <div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                  <span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span>
-                  <span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
+                  <span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
                 </div>
               </td>
             </tr>
@@ -120,10 +128,10 @@
       <tr>
         <td class="bbg-transparent">安全交底人</td>
         <td colspan="10">
-          <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+          <div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
             <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-            <span>{{ pd.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>
@@ -147,6 +155,16 @@
           </div>
         </td>
       </tr>
+      <tr>
+        <td class="bbg-transparent">安全措施确认人</td>
+        <td colspan="3">
+          <div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
+            <span>签字：</span>
+            <img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
+            <span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
+          </div>
+        </td>
+      </tr>
       <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
         <td colspan="6">
           <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@@ -157,9 +175,19 @@
           </div>
         </td>
       </tr>
+      <tr v-if="pd.BELONGING_SIGNATURE">
+        <td colspan="6">
+          <div>项目主管部门负责人意见：{{ 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">
+            <span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
+          </div>
+        </td>
+      </tr>
       <tr v-if="pd.LEADER_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
+          <div>属地监管单位意见：{{ 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">
@@ -189,7 +217,7 @@
       </tr>
       <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}</div>
+          <div>动火前验票负责人：{{ 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">
@@ -242,7 +270,8 @@ export default {
       gasList: [],
       imgList: [],
       imgList1: [],
-      otherProtectiveMeasures: []
+      otherProtectiveMeasures: [],
+      confessList: []
     }
   },
   created() {
@@ -284,6 +313,11 @@ export default {
         this.pd = data.pd // 参数map
         this.imgList = data.imgList
         this.imgList1 = data.imgList1
+        data.pd.confessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.confessList.push(item)
+          }
+        })
         for (let i = 0; i < data.measuresList.length; i++) {
           // 将字符串转成数组
           const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@@ -319,6 +353,13 @@ export default {
           this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
           this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
         }
+        const dongHuoCaoZuoRenPic = data.imgList2
+        if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+          this.pd.dongHuoCaoZuoRenPic = []
+          for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+            this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
+          }
+        }
       }).catch((e) => {
         this.listLoading = false
       })