diff --git a/pages/application/gf-eight-work/high-work/home.vue b/pages/application/gf-eight-work/high-work/home.vue
index d39954e..9e395b0 100644
--- a/pages/application/gf-eight-work/high-work/home.vue
+++ b/pages/application/gf-eight-work/high-work/home.vue
@@ -181,7 +181,6 @@
 						if ("success" == res.data.result) {
 							_this.count = res.data.count;
 						}
-
 					}
 				})
 			},
diff --git a/pages/application/high-risk-work/home.vue b/pages/application/high-risk-work/home.vue
index cd1a62e..14d2d1f 100644
--- a/pages/application/high-risk-work/home.vue
+++ b/pages/application/high-risk-work/home.vue
@@ -10,6 +10,12 @@
           <navigator class="a" hover-class="none" :url="item.url">
             <view class="image">
               <image :src="item.image" mode=""></image>
+              <view v-if="item.hotWorkCount > 0" class="badge">{{ item.hotWorkCount }}</view>
+              <view v-if="item.hightWorkCount > 0" class="badge">{{ item.hightWorkCount }}</view>
+              <view v-if="item.blindBoardCount > 0" class="badge">{{ item.blindBoardCount }}</view>
+              <view v-if="item.HoistingCount > 0" class="badge">{{ item.HoistingCount }}</view>
+              <view v-if="item.confinedSpaceCount > 0" class="badge">{{ item.confinedSpaceCount }}</view>
+              <view v-if="item.electricityCount > 0" class="badge">{{ item.electricityCount }}</view>
             </view>
             <view class="title">
               <text>{{ item.title }}</text>
@@ -22,51 +28,126 @@
 </template>
 
 <script>
+import { basePath, loginUser } from '@/common/tool.js';
+
 export default {
   data() {
     return {
-      highRiskList:[
+      highRiskList: [
         {
-          title:'动火作业',
-          url:'/pages/application/eight-assignments/index',
-          image:require('../../../static/new_images/i1.png'),
-        },
-        // {
-        //   title: '新动火作业',
-        //   url:'/pages/application/hotwork_cfd/home',
-        //   image:require('../../../static/new_images/i1.png'),
-        // },
-        {
-          title:'高处作业',
-          url:'/pages/application/gf-eight-work/high-work/home',
-          image:require('../../../static/new_images/i2.png'),
+          title: '动火作业',
+          url: '/pages/application/eight-assignments/index',
+          image: require('../../../static/new_images/i1.png'),
+          hotWorkCount: 0,
         },
         {
-          title:'盲板作业',
-          url:'/pages/application/gf-eight-work/blind-board/home',
-          image:require('../../../static/new_images/i3.png'),
+          title: '高处作业',
+          url: '/pages/application/gf-eight-work/high-work/home',
+          image: require('../../../static/new_images/i2.png'),
+          hightWorkCount: 0,
         },
         {
-          title:'吊装作业',
-          url:'/pages/application/gf-eight-work/hoisting/home',
-          image:require('../../../static/new_images/i4.png'),
+          title: '盲板作业',
+          url: '/pages/application/gf-eight-work/blind-board/home',
+          image: require('../../../static/new_images/i3.png'),
+          blindBoardCount: 0,
         },
         {
-          title:'有限空间安全作业',
-          url:'/pages/application/gf-eight-work/confinedspace/home',
-          image:require('../../../static/new_images/i5.png'),
+          title: '吊装作业',
+          url: '/pages/application/gf-eight-work/hoisting/home',
+          image: require('../../../static/new_images/i4.png'),
+          HoistingCount: 0,
         },
         {
-          title:'临时用电安全作业',
-          url:'/pages/application/gf-eight-work/electricity/home',
-          image:require('../../../static/new_images/i6.png'),
+          title: '有限空间安全作业',
+          url: '/pages/application/gf-eight-work/confinedspace/home',
+          image: require('../../../static/new_images/i5.png'),
+          confinedSpaceCount: 0,
+        },
+        {
+          title: '临时用电安全作业',
+          url: '/pages/application/gf-eight-work/electricity/home',
+          image: require('../../../static/new_images/i6.png'),
+          electricityCount: 0,
         },
       ],
-    }
+    };
   },
-}
+  onShow() {
+    this.updateWorkCounts('/app/hotwork/cfd/countCheck', '动火作业', 'hotWorkCount');
+    this.updateWorkCounts('/app/gfHighwork/countCheck', '高处作业', 'hightWorkCount');
+    this.updateWorkCounts('/app/gfBlindBoard/countCheck', '盲板作业', 'blindBoardCount');
+    this.updateWorkCounts('/app/gfHoisting/countCheck', '吊装作业', 'blindBoardCount');
+    this.updateWorkCounts('/app/gfConfinedSpace/countCheck', '有限空间安全作业', 'blindBoardCount');
+    this.updateWorkCounts('//app/gfElectricity/countCheck', '临时用电安全作业', 'electricityCount');
+  },
+  methods: {
+    updateWorkCounts(url, title, countKey) {
+      uni.showLoading({ title: "加载中..." }); // 加载中动画
+      uni.request({
+        url: basePath + url,
+        method: 'POST',
+        dataType: 'json',
+        header: { 'Content-type': 'application/x-www-form-urlencoded' },
+        data: {
+          tm: new Date().getTime(),
+          CORPINFO_ID: loginUser.CORPINFO_ID,
+          USER_ID: loginUser.USER_ID,
+        },
+        success: (res) => {
+          uni.hideLoading(); // 结束加载中动画
+          if (res.data.result === "success") {
+            let totalCount = res.data.count.SUMCOUNT;
+            this.highRiskList = this.highRiskList.map(item => {
+              if (item.title === title) {
+                return { ...item, [countKey]: totalCount };
+              }
+              return item;
+            });
+          }
+        }
+      });
+    }
+  }
+};
 </script>
 
 <style>
+.new-apps-box {
+  padding: 20upx;
+}
 
+.new-apps-warp {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.new-apps-item {
+  position: relative;
+  width: 30%;
+  margin-bottom: 20upx;
+  text-align: center;
+}
+
+.new-apps-item .image {
+  position: relative;
+  width: 100%;
+  height: 100upx;
+}
+
+.new-apps-item .badge {
+  position: absolute;
+  top: -10px;
+  right: 0;
+  background-color: #dd514c;
+  color: white;
+  border-radius: 50%;
+  padding: 2px 5px;
+  font-size: 12px;
+}
+
+.new-apps-item .title {
+  margin-top: -5upx;
+}
 </style>
diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
index ae51c24..9ba82bb 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
@@ -454,7 +454,7 @@
 				<!--					<view class="title">监护人</view>-->
 				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 				<!--				</view>-->
-        <view v-if="pd.APPROVAL_SIGNATURE">
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">项目主管部门负责意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
index b5305b4..b39339e 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -101,10 +101,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
@@ -253,11 +255,11 @@
 			</view>
 			<view class="wui-form-list">
 
-
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">作业负责人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
-				</view>
+        <view v-if="pd.CONFIRM_USER_SIGNER_PATH">
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">作业负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
+        </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">作业负责人</view>
@@ -267,10 +269,11 @@
 						<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
 					</view>
 				</view>
-
+        </view>
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
         <view class="cu-form-textarea" style="border: none;">
-          <view class="cu-form-title">项目主管部门负责人意见</view>
-          <textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
+          <view class="cu-form-title">项目主管部门负责意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
         </view>
         <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
           <view class="cu-form-group" >
@@ -281,26 +284,27 @@
             <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
           </view>
         </view>
-
-
-        <view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">属地监管单位意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
-				</view>
-				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-					<view class="cu-form-group" >
-						<view class="title">属地监管单位负责人</view>
-						{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
-					</view>
-					<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-						<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
-					</view>
-				</view>
+        </view>
+        <view v-if="pd.LEADER_CONTENT  && pd.LEADER_CONTENT !== '无'">
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">属地监管单位意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group" >
+              <view class="title">属地监管单位负责人</view>
+              {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
+            </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+              <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
+            </view>
+          </view>
+        </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">安全管理部门意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
-				</view>
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">安全管理部门意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
+          </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">安全管理部门负责人</view>
@@ -312,10 +316,10 @@
 				</view>
 				</view>
 				<view v-if="pd.APPROVE_USER_SIGNER_PATH">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">动火审批人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
-				</view>
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">动火审批人意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
+          </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">动火审批人</view>
@@ -326,10 +330,10 @@
 					</view>
 				</view>
 				</view>
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">动火前验票负责人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
-				</view>
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">动火前验票负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
+        </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">动火前验票负责人</view>
@@ -340,6 +344,27 @@
 					</view>
 				</view>
 
+        <view class="cu-form-group">
+          <view class="title">动火已完成：</view>
+          <radio-group @change="updateRadioValue('FIRE_COMPLETED', $event)">
+            <radio value="0" :checked="pd.FIRE_COMPLETED === '0'">否</radio>
+            <radio value="1" :checked="pd.FIRE_COMPLETED === '1'">是</radio>
+          </radio-group>
+        </view>
+        <view class="cu-form-group">
+          <view class="title">作业现场已清理：</view>
+          <radio-group @change="updateRadioValue('SITE_CLEANED', $event)">
+            <radio value="0" :checked="pd.SITE_CLEANED === '0'">否</radio>
+            <radio value="1" :checked="pd.SITE_CLEANED === '1'">是</radio>
+          </radio-group>
+        </view>
+        <view class="cu-form-group">
+          <view class="title">无遗留火种：</view>
+          <radio-group @change="updateRadioValue('NO_REMAINING_EMBERS', $event)">
+            <radio value="0" :checked="pd.NO_REMAINING_EMBERS === '0'">否</radio>
+            <radio value="1" :checked="pd.NO_REMAINING_EMBERS === '1'">是</radio>
+          </radio-group>
+        </view>
 
 				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
 					<view class="cu-form-title">完工验收</view>
@@ -382,735 +407,769 @@
 </template>
 
 <script>
-	import {
-		basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
-	} from '@/common/tool.js';
-	import tkiTree from "@/components/select-tree/select-tree.vue"
-	import writingBoard from "@/components/writing-board/writing-board.vue"
-	import gcoord from '@/common/gcoord.js'
-	import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
-	export default {
-		components: {
-			tkiTree,ruiDatePicker,writingBoard
-		},
-		data() {
-			return {
-				baseImgPath:baseImgPath,
-				buttonloading: false,
-				isUps:false,
-				forbidEdit:true,// 禁止修改
-				msg:'add',
-				files: [],
-				noClick:true,
-				treeNode:[],//部门下拉数据
-				levelList:[
-					{id:'特级',name:'特级'},
-					{id:'一级',name:'一级'},
-					{id:'二级',name:'二级'},
-				],
-				levelindex:-1,
+import {
+  basePath, corpinfoId, deptId, loginUser, formatDate, loginSession, baseImgPath
+} from '@/common/tool.js';
+import tkiTree from "@/components/select-tree/select-tree.vue";
+import writingBoard from "@/components/writing-board/writing-board.vue";
+import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
 
-				analyzeUserList:[],
-				analyzeindex:-1,
-				confirmUserList:[],
-				confirmindex:-1,
-				guardianUserList:[],
-				guardianindex:-1,
-                leaderUserList:[],
-                leaderindex:-1,
-				auditUserList:[],
-				auditindex:-1,
-				approveUserList:[],
-				approveindex:-1,
-                monitorUserList:[],
-                monitorindex:-1,
-                acceptUserList:[],
-				acceptindex:-1,
-				pd:{
-					OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;'
-					},// 数据
-				measuresList:[],
-				gasList:[],
-				rules:[
-					{name:'CHECK_NO',message:'请输入编号'},
-					{name:'WORK_CONTENT',message:'请输入作业内容'},
-					{name:'WORK_PLACE',message:'请输入作业地点'},
-					{name:'WORK_LEVEL',message:'请选择动火级别'},
-					{name:'WORK_FUNCTION',message:'请输入动火方式'},
-					{name:'WORK_START_DATE',message:'请选择工作开始时间'},
-					{name:'WORK_START_DATE',message:'请选择工作结束时间'},
-					{name:'WORK_MANAGER',message:'请输入作业负责人'},
-					{name:'WORK_USER',message:'请输入作业人'},
-					{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
-					{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
-					{name:'CONFESS_USER',message:'请输入安全交底人'},
-					{name:'EDUCATE_USER',message:'请输入安全教育人'},
-					{name:'ACCEPT_EDUCATE_USER',message:'请输入接受交底、教育人'},
-					{name:'TRIAL_USER',message:'请输入动火措施初审人'},
-					{name:'ANALYZE_USER_ID',message:'请选择气体分析单位负责人'},
-					{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
-					{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
-					{name:'LEADER_USER_ID',message:'请选择动火点车间负责人'},
-					{name:'AUDIT_USER_ID',message:'请选择安全管理部门负责人'},
-					{name:'APPROVE_USER_ID',message:'请选择审批人'},
-					{name:'MONITOR_USER_ID',message:'请选择验票班长'},
-					{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}
-				],
-				todayDate:'',
-				modalName:null,
-				signModalShow: false,
-				imgList:[],
-			}
-		},
-		onLoad(event){
-			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
-			this.pd.HOTWORK_ID = event.HOTWORK_ID;
-			if(this.pd.HOTWORK_ID){
-				this.msg="edit";
-				this.getData();
-			}else {
-				// 初始化作业负责人
-				this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
-				this.pd.APPLY_DEPARTMENT_NAME = loginUser.DEPARTMENT_NAME;
-				this.pd.APPLY_USER_ID = loginUser.USER_ID;
-				this.pd.APPLY_USER_NAME = loginUser.NAME;
-				this.forbidEdit = false;
-			}
-			// 初始化现场作业负责人
-			this.getDept();
-			this.getLimitSpace();
-			loginSession();
+export default {
+  components: {
+    tkiTree, ruiDatePicker, writingBoard
+  },
+  data() {
+    return {
+      baseImgPath: baseImgPath,
+      buttonloading: false,
+      isUps: false,
+      forbidEdit: true,
+      msg: 'add',
+      files: [],
+      noClick: true,
+      treeNode: [],
+      levelList: [
+        { id: '特级', name: '特级' },
+        { id: '一级', name: '一级' },
+        { id: '二级', name: '二级' },
+      ],
+      levelindex: -1,
+      analyzeUserList: [],
+      analyzeindex: -1,
+      confirmUserList: [],
+      confirmindex: -1,
+      guardianUserList: [],
+      guardianindex: -1,
+      leaderUserList: [],
+      leaderindex: -1,
+      auditUserList: [],
+      auditindex: -1,
+      approveUserList: [],
+      approveindex: -1,
+      monitorUserList: [],
+      monitorindex: -1,
+      acceptUserList: [],
+      acceptindex: -1,
+      pd: {
+        FIRE_COMPLETED: '0',
+        SITE_CLEANED: '0',
+        NO_REMAINING_EMBERS: '0',
+        OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;'
+      },
+      measuresList: [],
+      gasList: [],
+      rules: [
+        { name: 'CHECK_NO', message: '请输入编号' },
+        { name: 'WORK_CONTENT', message: '请输入作业内容' },
+        { name: 'WORK_PLACE', message: '请输入作业地点' },
+        { name: 'WORK_LEVEL', message: '请选择动火级别' },
+        { name: 'WORK_FUNCTION', message: '请输入动火方式' },
+        { name: 'WORK_START_DATE', message: '请选择工作开始时间' },
+        { name: 'WORK_START_DATE', message: '请选择工作结束时间' },
+        { name: 'WORK_MANAGER', message: '请输入作业负责人' },
+        { name: 'WORK_USER', message: '请输入作业人' },
+        { name: 'SPECIAL_WORK', message: '请输入关联的其他特殊作业及安全作业票编号' },
+        { name: 'RISK_IDENTIFICATION', message: '请输入风险辨识结果' },
+        { name: 'CONFESS_USER', message: '请输入安全交底人' },
+        { name: 'EDUCATE_USER', message: '请输入安全教育人' },
+        { name: 'ACCEPT_EDUCATE_USER', message: '请输入接受交底、教育人' },
+        { name: 'TRIAL_USER', message: '请输入动火措施初审人' },
+        { name: 'ANALYZE_USER_ID', message: '请选择气体分析单位负责人' },
+        { name: 'CONFIRM_USER_ID', message: '请选择作业负责人' },
+        { name: 'GUARDIAN_USER_ID', message: '请选择监护人' },
+        { name: 'LEADER_USER_ID', message: '请选择动火点车间负责人' },
+        { name: 'AUDIT_USER_ID', message: '请选择安全管理部门负责人' },
+        { name: 'APPROVE_USER_ID', message: '请选择审批人' },
+        { name: 'MONITOR_USER_ID', message: '请选择验票班长' },
+        { name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人' }
+      ],
+      todayDate: '',
+      modalName: null,
+      signModalShow: false,
+      imgList: [],
+    }
+  },
+  computed: {
+    formattedConfirmContent() {
+      return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+    },
+    formattedExamineApprovalOpinions() {
+      return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+    },
+    formattedLeaderContent() {
+      return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+    },
+    formattedAuditContent() {
+      return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+    },
+    formattedApproveContent() {
+      return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
+    },
+    formattedMonitorContent() {
+      return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
+    }
+  },
+  onLoad(event) {
+    this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
+    this.pd.HOTWORK_ID = event.HOTWORK_ID;
+    if (this.pd.HOTWORK_ID) {
+      this.msg = "edit";
+      this.getData();
+    } else {
+      // 初始化作业负责人
+      this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
+      this.pd.APPLY_DEPARTMENT_NAME = loginUser.DEPARTMENT_NAME;
+      this.pd.APPLY_USER_ID = loginUser.USER_ID;
+      this.pd.APPLY_USER_NAME = loginUser.NAME;
+      this.forbidEdit = false;
+    }
+    // 初始化现场作业负责人
+    this.getDept();
+    this.getLimitSpace();
+    loginSession();
+  },
+  methods: {
+    updateRadioValue(key, event) {
+      this.pd[key] = event.detail.value;
+    },
+    goToDetail(e) {
+      uni.navigateTo({
+        url: '/pages/application/hotwork_cfd/hotwork-gas/gas-list?HOTWORK_ID=' + e
+      });
+    },
+    getData() {
+      var _this = this;
+      uni.showLoading({
+        title: '请稍候'
+      })
+      uni.request({
+        url: basePath + '/app/hotwork/cfd/goEdit',
+        method: 'POST',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        data: {
+          HOTWORK_ID: _this.pd.HOTWORK_ID,
+        },
+        success: (res) => {
+          if ("success" == res.data.result) {
+            uni.hideLoading();
+            _this.pd = res.data.pd; //参数map
+            _this.pd = Object.assign(_this.pd,
+                {
+                  "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
+                  "GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
+                  "LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
+                  "AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
+                  "APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
+                  "MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
+                })
+            _this.pd.OTHER_PROTECTIVE_MEASURES = ''
+            _this.files = res.data.imgList;
+            _this.measuresList = res.data.measuresList
+            _this.gasList = res.data.gasList
+            if (_this.pd.APPLY_STATUS < 1) {
+              _this.forbidEdit = false;
+            }
 
-		},
-		methods: {
-			//跳转事件
-			goToDetail(e) {
-				uni.navigateTo({
-					url: '/pages/application/hotwork_cfd/hotwork-gas/gas-list?HOTWORK_ID='+e
-				});
-			},
-			getData() {
-				var _this = this;
-				uni.showLoading({
-					title: '请稍候'
-				})
-				uni.request({
-					url: basePath + '/app/hotwork/cfd/goEdit',
-					method: 'POST',
- 					header: {
-						'Content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						HOTWORK_ID: _this.pd.HOTWORK_ID,
-					},
-					success: (res) => {
-						if ("success" == res.data.result) {
-							uni.hideLoading();
-							_this.pd = res.data.pd; //参数map
-							_this.pd = Object.assign(_this.pd,
-							{
-								"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
-								"GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
-								"LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
-								"AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
-								"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
-								"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
-							})
-							_this.pd.OTHER_PROTECTIVE_MEASURES = ''
-							_this.files = res.data.imgList;
-							_this.measuresList = res.data.measuresList
-							_this.gasList = res.data.gasList
-							if(_this.pd.APPLY_STATUS < 1){
-								_this.forbidEdit = false;
-							}
-
-              let dongHuoCaoZuoRenPic = res.data.imgList2
-              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
-                _this.pd.dongHuoCaoZuoRenPic = []
-                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
-                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
-                }
+            let dongHuoCaoZuoRenPic = res.data.imgList2
+            if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+              _this.pd.dongHuoCaoZuoRenPic = []
+              for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
               }
-						} else if ("exception" == data.result) {
-							uni.showToast({
-								title: '错误',
-								duration: 2000
-							});
-						}
-					}
-				});
-			},
-			ViewShowImage(url) {
-				let files = [];
-				files.push(url)
-				uni.previewImage({
-					urls: files,
-					current: 0
-				});
-			},
-      async goSubmit(STATUS) {
-        var _this = this;
-        let required = true
-        uni.showLoading({
-          title: '请稍候'
-        })
-        if (STATUS == 8) {
-          if (_this.imgList.length <= 0) {
+            }
+          } else if ("exception" == data.result) {
             uni.showToast({
-              icon: 'none',
-              title: '请签字',
-              duration: 1500
+              title: '错误',
+              duration: 2000
             });
-            return;
           }
         }
-        var fileList = [];
-        var signtime = [];
-        const formData = {}
-        Object.keys(this.pd).map(key => {
-          formData[key] = this.pd[key]
-        })
-        this.uploadImgFaults(fileList, signtime)
-        formData.SIGNTIME = signtime.join(",")
-        formData.CORPINFO_ID = corpinfoId
-        formData.CREATOR = loginUser.USER_ID
-        formData.OPERATOR = loginUser.USER_ID
-        formData.ACTION_USER = loginUser.NAME
-        formData.APPLY_STATUS = STATUS
-        if (STATUS == 8) {
-          if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {
-            uni.showModal({
-              title: '',
-              content: '作业未开始之前不能进行验收',
-              cancelColor: "#000000",
-              cancelText: '取消',
-              confirmText: '确定',
-              success: res => {
-                this.buttonloading = false
-                _this.goback()
-              }
-            })
-          } else {
-            formData.STATUS = STATUS
-            this.buttonloading = true
-            uni.uploadFile({
-              url: basePath + '/app/hotwork/cfd/editAcceptStatus',
-              files: fileList,
-              formData: formData,
-              success: (res) => {
-                uni.showToast({
-                  icon: 'none',
-                  title: '保存成功',
-                  duration: 2000
-                });
-                _this.goback()
-                this.buttonloading = false
-              },
-              fail: (err) => {
-                uni.hideLoading();
-                uni.showModal({
-                  content: err.errMsg,
-                  showCancel: false
-                });
-              }
-            })
-          }
+      });
+    },
+    ViewShowImage(url) {
+      let files = [];
+      files.push(url)
+      uni.previewImage({
+        urls: files,
+        current: 0
+      });
+    },
+    async goSubmit(STATUS) {
+      var _this = this;
+      let required = true;
+      uni.showLoading({
+        title: '请稍候'
+      });
+      this.buttonloading = true; // 开始加载
+
+      if (STATUS == 8) {
+        if (_this.pd.FIRE_COMPLETED === "0") {
+          uni.showModal({
+            title: "提示",
+            content: "动火已完成为“否”，不允许通过。",
+            showCancel: false,
+            confirmText: "知道了"
+          });
+          this.buttonloading = false; // 重置加载状态
+          uni.hideLoading(); // 隐藏加载动画
+          return;
+        }
+        if (_this.pd.SITE_CLEANED === "0") {
+          uni.showModal({
+            title: "提示",
+            content: "作业现场已清理为“否”，不允许通过。",
+            showCancel: false,
+            confirmText: "知道了"
+          });
+          this.buttonloading = false; // 重置加载状态
+          uni.hideLoading(); // 隐藏加载动画
+          return;
+        }
+        if (_this.pd.NO_REMAINING_EMBERS === "0") {
+          uni.showModal({
+            title: "提示",
+            content: "无遗留火种为“否”，不允许通过。",
+            showCancel: false,
+            confirmText: "知道了"
+          });
+          this.buttonloading = false; // 重置加载状态
+          uni.hideLoading(); // 隐藏加载动画
+          return;
+        }
+        if (_this.imgList.length <= 0) {
+          uni.showToast({
+            icon: 'none',
+            title: '请签字',
+            duration: 1500
+          });
+          this.buttonloading = false; // 重置加载状态
+          uni.hideLoading(); // 隐藏加载动画
+          return;
+        }
+      }
+
+      var fileList = [];
+      var signtime = [];
+      const formData = {}
+      Object.keys(this.pd).map(key => {
+        formData[key] = this.pd[key]
+      });
+      this.uploadImgFaults(fileList, signtime);
+      formData.SIGNTIME = signtime.join(",");
+      formData.CORPINFO_ID = corpinfoId;
+      formData.CREATOR = loginUser.USER_ID;
+      formData.OPERATOR = loginUser.USER_ID;
+      formData.ACTION_USER = loginUser.NAME;
+      formData.APPLY_STATUS = STATUS;
+
+      if (STATUS == 8) {
+        if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {
+          uni.showModal({
+            title: '',
+            content: '作业未开始之前不能进行验收',
+            cancelColor: "#000000",
+            cancelText: '取消',
+            confirmText: '确定',
+            success: res => {
+              this.buttonloading = false; // 重置加载状态
+              this.goback();
+            }
+          });
         } else {
-          formData.STATUS = STATUS
-          this.buttonloading = true
-          uni.request({
-            url: basePath + "/app/hotwork/cfd/editStatus",
-            method: 'POST',
-            dataType: 'json',
-            header: {
-              'Content-type': 'application/x-www-form-urlencoded'
-            },
-            data: formData,
+          formData.STATUS = STATUS;
+          this.buttonloading = true;
+          uni.uploadFile({
+            url: basePath + '/app/hotwork/cfd/editAcceptStatus',
+            files: fileList,
+            formData: formData,
             success: (res) => {
               uni.showToast({
                 icon: 'none',
                 title: '保存成功',
                 duration: 2000
               });
-              _this.goback()
-              this.buttonloading = false
+              this.goback();
+              this.buttonloading = false; // 重置加载状态
+              uni.hideLoading(); // 隐藏加载动画
             },
             fail: (err) => {
-              uni.hideLoading();
+              uni.hideLoading(); // 隐藏加载动画
+              this.buttonloading = false; // 重置加载状态
               uni.showModal({
                 content: err.errMsg,
                 showCancel: false
               });
             }
-          })
+          });
         }
-      },
-			getGasFlag(){
-				return new Promise((resolve,reject)=> {
-					if (this.gasList.length < 1) {
-						uni.showModal({
-							title: '',
-							content: '没有进行气体检测,是否继续验收？',
-							cancelColor: "#000000",
-							cancelText: '取消',
-							confirmText: '确定',
-							success: res => {
-								uni.hideLoading();
-								if (res.confirm) {
-									resolve(true)
-								} else {
-									resolve(false)
-								}
-							}
-						})
-					} else {
-						resolve(true)
-					}
-				})
-			},
-			uploadImgFaults(fileList,signtime) {
-				this.imgList.map(item => {
-					var img = {}
-					img.name = 'file'+(fileList.length)
-					img.uri = item.filePath
-					// img.SIGNER_TIME = item.SIGNER_TIME
-					fileList.push(img)
-					signtime.push(item.SIGNER_TIME)
-				})
-			},
-			getConfess(){
-				return new Promise((resolve,reject)=> {
-					if (!this.pd.CONFESS_USER_SIGNER_PATH) {
-						uni.showModal({
-							title: '',
-							content: '没有进行安全交底人签字,是否继续验收？',
-							cancelColor: "#000000",
-							cancelText: '取消',
-							confirmText: '确定',
-							success: res => {
-								this.buttonloading = false
-								if (res.confirm) {
-									resolve(true)
-								} else {
-									resolve(false)
-								}
-							}
-						})
-					} else {
-						resolve(true)
-					}
-				})
-			},
-			getAcceptconfess(){
-				return new Promise((resolve,reject)=> {
-					if (!this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH) {
-						uni.showModal({
-							title: '',
-							content: '没有进行接受交底人签字,是否继续验收？',
-							cancelColor: "#000000",
-							cancelText: '取消',
-							confirmText: '确定',
-							success: res => {
-								this.buttonloading = false
-								if (res.confirm) {
-									resolve(true)
-								} else {
-									resolve(false)
-								}
-							}
-						})
-					} else {
-						resolve(true)
-					}
-				})
-			},
-			getGuardian(){
-				return new Promise((resolve,reject)=> {
-					if (!this.pd.GUARDIAN_USER_SIGNER_PATH) {
-						uni.showModal({
-							title: '',
-							content: '没有进行监护人签字,是否继续验收？',
-							cancelColor: "#000000",
-							cancelText: '取消',
-							confirmText: '确定',
-							success: res => {
-								this.buttonloading = false
-								if (res.confirm) {
-									resolve(true)
-								} else {
-									resolve(false)
-								}
-							}
-						})
-					} else {
-						resolve(true)
-					}
-				})
-			},
-			// 获取动火列表
-			getLimitSpace(){
-				var _this = this;
-				uni.request({
-					method: 'POST',
-					dataType: 'json',
-					header: {
-						'Content-type': 'application/x-www-form-urlencoded'
-					},
-					url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(),
-					data: {CORPINFO_ID: corpinfoId},
-					success: function (res) {
-						_this.limitSpaceList = res.data.varList;
-					}
-				});
-			},
-			levelChange(e){
-				this.levelindex = e.detail.value;
-				this.pd.WORK_LEVEL=this.levelList[this.levelindex].name;
-				this.$forceUpdate();//强制刷新
-			},
-			getDept() {
-				var _this = this;
-				uni.request({
-					url: basePath + '/app/sys/listTree',//部门下拉接口
-					method: 'POST',
-					dataType: 'json',
-					header: {
-						'Content-type':'application/x-www-form-urlencoded'
-					},
-					data: {
-						CORPINFO_ID : corpinfoId,
-					},
-					success: (res) => {
-						if("success" == res.data.result){
-							_this.treeNode=eval(res.data.zTreeNodes);
-						} else {
-							uni.showToast({
-								title: res.data.message,
-								duration: 2000
-							});
-						}
-					}
-				});
-			},
-			//获取人员列表
-			getUserList(dept,list,i){
-				//发送 post 请求
-				var _this=this
-				uni.request({
-					method: 'POST',
-					dataType: 'json',
-					header: {
-						'Content-type':'application/x-www-form-urlencoded'
-					},
-					url: basePath+'/app/sys/listUser',
-					data: {DEPARTMENT_ID:dept,tm:new Date().getTime()},
-					success: function(res){
-						if("success" == res.data.result){
-							if(i>-1) {
-								_this[list][i] = [];
-								_this[list][i] = res.data.userList;
-								_this.$forceUpdate();//强制刷新
-							}else{
-								_this[list]=res.data.userList;
-							}
-						}else{
-							uni.showToast({
-								title: res.data.message,
-								duration: 2000
-							});
-						}
-					}
-				})
-			},
-
-			/*
-         *手写板
-         */
-			showModal(ISSELF) {
-				this.ISSELF = ISSELF
-				this.modalName = 'Modal'
-			},
-			hideModal(e) {
-				this.modalName = null
-			},
-			//完成
-
-			subCanvas(e) {
-				e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
-				this.imgList.push(e);
-				this.hideModal();
-				this.signModalShow = false;
-			},
-			ViewImage(e) {
-				let files =[];
-				files.push(e.currentTarget.dataset.url)
-				uni.previewImage({
-					urls: files,
-					current: e.currentTarget.dataset.url
-				});
-			},
-			DelImg(index){
-				this.imgList.splice(index,1)
-			},
-			/*
-			*分析人
-			 */
-			// 确定回调事件
-			analyzetreeConfirm(e) {
-				this.isUps=false;
-				this.pd.ANALYZE_DEPARTMENT_ID=e[0].id;
-				this.pd.ANALYZE_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'analyzeUserList');
-			},
-			// 取消回调事件
-			analyzetreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showAnalyzeTree() {
-				this.isUps=true
-				this.$refs.tkiTree_analyze._show();
-			},
-			PickerAnalyze(e) {
-				this.analyzeindex = e.detail.value;
-				this.pd.ANALYZE_USER_ID=this.analyzeUserList[this.analyzeindex].USER_ID;
-				this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			/*
-			*确认人
-		 	*/
-			// 确定回调事件
-			confirmtreeConfirm(e) {
-				this.isUps=false;
-				this.pd.CONFIRM_DEPARTMENT_ID=e[0].id;
-				this.pd.CONFIRM_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'confirmUserList');
-			},
-			// 取消回调事件
-			confirmtreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showConfirmTree() {
-				this.isUps=true
-				this.$refs.tkiTree_confirm._show();
-			},
-			PickerConfirm(e) {
-				this.confirmindex = e.detail.value;
-				this.pd.CONFIRM_USER_ID=this.confirmUserList[this.confirmindex].USER_ID;
-				this.pd.CONFIRM_USER_NAME=this.confirmUserList[this.confirmindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			/*
-			*监护人
-			 */
-			// 确定回调事件
-			guardiantreeConfirm(e) {
-				this.isUps=false;
-				this.pd.GUARDIAN_DEPARTMENT_ID=e[0].id;
-				this.pd.GUARDIAN_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'guardianUserList');
-			},
-			// 取消回调事件
-			guardiantreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showGuardianTree() {
-				this.isUps=true
-				this.$refs.tkiTree_guardian._show();
-			},
-			PickerGuardian(e) {
-				this.guardianindex = e.detail.value;
-				this.pd.GUARDIAN_USER_ID=this.guardianUserList[this.guardianindex].USER_ID;
-				this.pd.GUARDIAN_USER_NAME=this.guardianUserList[this.guardianindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-
-            /*
-            *单位领导
-            */
-// 确定回调事件
-            leadertreeConfirm(e) {
-                this.isUps=false;
-                this.pd.LEADER_DEPARTMENT_ID=e[0].id;
-                this.pd.LEADER_DEPARTMENT_NAME=e[0].name;
-                this.$forceUpdate();//强制刷新
-                this.getUserList(e[0].id,'leaderUserList');
-            },
-// 取消回调事件
-            leadertreeCancel(e) {
-                this.isUps=false;
-            },
-// 显示树形选择器
-            showLeaderTree() {
-                this.isUps=true
-                this.$refs.tkiTree_leader._show();
-            },
-            PickerLeader(e) {
-                this.leaderindex = e.detail.value;
-                this.pd.LEADER_USER_ID=this.leaderUserList[this.leaderindex].USER_ID;
-                this.pd.LEADER_USER_NAME=this.leaderUserList[this.leaderindex].NAME;
-                this.$forceUpdate();//强制刷新
-            },
-
-			/*
-			*安全管理部门负责人
-		 	*/
-			// 确定回调事件
-			audittreeConfirm(e) {
-				this.isUps=false;
-				this.pd.AUDIT_DEPARTMENT_ID=e[0].id;
-				this.pd.AUDIT_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'auditUserList');
-			},
-			// 取消回调事件
-			audittreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showAuditTree() {
-				this.isUps=true
-				this.$refs.tkiTree_audit._show();
-			},
-			PickerAudit(e) {
-				this.auditindex = e.detail.value;
-				this.pd.AUDIT_USER_ID=this.auditUserList[this.auditindex].USER_ID;
-				this.pd.AUDIT_USER_NAME=this.auditUserList[this.auditindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			/*
-			*审批人
-		 	*/
-			// 确定回调事件
-			approvetreeConfirm(e) {
-				this.isUps=false;
-				this.pd.APPROVE_DEPARTMENT_ID=e[0].id;
-				this.pd.APPROVE_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'approveUserList');
-			},
-			// 取消回调事件
-			approvetreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showApproveTree() {
-				this.isUps=true
-				this.$refs.tkiTree_approve._show();
-			},
-			PickerApprove(e) {
-				this.approveindex = e.detail.value;
-				this.pd.APPROVE_USER_ID=this.approveUserList[this.approveindex].USER_ID;
-				this.pd.APPROVE_USER_NAME=this.approveUserList[this.approveindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-            /*
-*在岗班长
-*/
-// 确定回调事件
-            monitortreeConfirm(e) {
-                this.isUps=false;
-                this.pd.MONITOR_DEPARTMENT_ID=e[0].id;
-                this.pd.MONITOR_DEPARTMENT_NAME=e[0].name;
-                this.$forceUpdate();//强制刷新
-                this.getUserList(e[0].id,'monitorUserList');
-            },
-// 取消回调事件
-            monitortreeCancel(e) {
-                this.isUps=false;
-            },
-// 显示树形选择器
-            showMonitorTree() {
-                this.isUps=true
-                this.$refs.tkiTree_monitor._show();
-            },
-            PickerMonitor(e) {
-                this.monitorindex = e.detail.value;
-                this.pd.MONITOR_USER_ID=this.monitorUserList[this.monitorindex].USER_ID;
-                this.pd.MONITOR_USER_NAME=this.monitorUserList[this.monitorindex].NAME;
-                this.$forceUpdate();//强制刷新
-            },
-			/*
-			*验收部门
-			*/
-// 确定回调事件
-			accepttreeConfirm(e) {
-				this.isUps=false;
-				this.pd.ACCEPT_DEPARTMENT_ID=e[0].id;
-				this.pd.ACCEPT_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'acceptUserList');
-			},
-// 取消回调事件
-			accepttreeCancel(e) {
-				this.isUps=false;
-			},
-// 显示树形选择器
-			showAcceptTree() {
-				this.isUps=true
-				this.$refs.tkiTree_accept._show();
-			},
-			PickerAccept(e) {
-				this.acceptindex = e.detail.value;
-				this.pd.ACCEPT_USER_ID=this.acceptUserList[this.acceptindex].USER_ID;
-				this.pd.ACCEPT_USER_NAME=this.acceptUserList[this.acceptindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			changeStartDate(e) {
-				this.pd.WORK_START_DATE = e
-				this.$forceUpdate();//强制刷新
-			},
-			changeEndDate(e) {
-				this.pd.WORK_END_DATE = e
-				this.$forceUpdate();//强制刷新
-			},
-
-			changeRadio(i,value){
-				this.measuresList[i].STATUS=value
-			},
-
-			goback(){
-				var pages = getCurrentPages();	// 获取当前页面栈
-				var prePage = pages[pages.length - 2];	// 上二级页面
-				prePage.$vm.initflag = true;    // A 页面 init方法 为true
-				uni.navigateBack({delta: 1});
-				uni.hideLoading();
-			},
-			radioType(e){
-				this.HASINSTRUCTOR = e.detail.value
-			},
-			goToEdit(){
-				this.forbidEdit = false;
-			}
-		}
-	}
+      } else {
+        formData.STATUS = STATUS;
+        this.buttonloading = true;
+        uni.request({
+          url: basePath + "/app/hotwork/cfd/editStatus",
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type': 'application/x-www-form-urlencoded'
+          },
+          data: formData,
+          success: (res) => {
+            uni.showToast({
+              icon: 'none',
+              title: '保存成功',
+              duration: 2000
+            });
+            this.goback();
+            this.buttonloading = false; // 重置加载状态
+            uni.hideLoading(); // 隐藏加载动画
+          },
+          fail: (err) => {
+            uni.hideLoading(); // 隐藏加载动画
+            this.buttonloading = false; // 重置加载状态
+            uni.showModal({
+              content: err.errMsg,
+              showCancel: false
+            });
+          }
+        });
+      }
+    },
+    getGasFlag() {
+      return new Promise((resolve, reject) => {
+        if (this.gasList.length < 1) {
+          uni.showModal({
+            title: '',
+            content: '没有进行气体检测,是否继续验收？',
+            cancelColor: "#000000",
+            cancelText: '取消',
+            confirmText: '确定',
+            success: res => {
+              uni.hideLoading();
+              if (res.confirm) {
+                resolve(true)
+              } else {
+                resolve(false)
+              }
+            }
+          })
+        } else {
+          resolve(true)
+        }
+      })
+    },
+    uploadImgFaults(fileList, signtime) {
+      this.imgList.map(item => {
+        var img = {}
+        img.name = 'file' + (fileList.length)
+        img.uri = item.filePath
+        // img.SIGNER_TIME = item.SIGNER_TIME
+        fileList.push(img)
+        signtime.push(item.SIGNER_TIME)
+      })
+    },
+    getConfess() {
+      return new Promise((resolve, reject) => {
+        if (!this.pd.CONFESS_USER_SIGNER_PATH) {
+          uni.showModal({
+            title: '',
+            content: '没有进行安全交底人签字,是否继续验收？',
+            cancelColor: "#000000",
+            cancelText: '取消',
+            confirmText: '确定',
+            success: res => {
+              this.buttonloading = false
+              if (res.confirm) {
+                resolve(true)
+              } else {
+                resolve(false)
+              }
+            }
+          })
+        } else {
+          resolve(true)
+        }
+      })
+    },
+    getAcceptconfess() {
+      return new Promise((resolve, reject) => {
+        if (!this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH) {
+          uni.showModal({
+            title: '',
+            content: '没有进行接受交底人签字,是否继续验收？',
+            cancelColor: "#000000",
+            cancelText: '取消',
+            confirmText: '确定',
+            success: res => {
+              this.buttonloading = false
+              if (res.confirm) {
+                resolve(true)
+              } else {
+                resolve(false)
+              }
+            }
+          })
+        } else {
+          resolve(true)
+        }
+      })
+    },
+    getGuardian() {
+      return new Promise((resolve, reject) => {
+        if (!this.pd.GUARDIAN_USER_SIGNER_PATH) {
+          uni.showModal({
+            title: '',
+            content: '没有进行监护人签字,是否继续验收？',
+            cancelColor: "#000000",
+            cancelText: '取消',
+            confirmText: '确定',
+            success: res => {
+              this.buttonloading = false
+              if (res.confirm) {
+                resolve(true)
+              } else {
+                resolve(false)
+              }
+            }
+          })
+        } else {
+          resolve(true)
+        }
+      })
+    },
+    getLimitSpace() {
+      var _this = this;
+      uni.request({
+        method: 'POST',
+        dataType: 'json',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(),
+        data: { CORPINFO_ID: corpinfoId },
+        success: function (res) {
+          _this.limitSpaceList = res.data.varList;
+        }
+      });
+    },
+    levelChange(e) {
+      this.levelindex = e.detail.value;
+      this.pd.WORK_LEVEL = this.levelList[this.levelindex].name;
+      this.$forceUpdate();//强制刷新
+    },
+    getDept() {
+      var _this = this;
+      uni.request({
+        url: basePath + '/app/sys/listTree',//部门下拉接口
+        method: 'POST',
+        dataType: 'json',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        data: {
+          CORPINFO_ID: corpinfoId,
+        },
+        success: (res) => {
+          if ("success" == res.data.result) {
+            _this.treeNode = eval(res.data.zTreeNodes);
+          } else {
+            uni.showToast({
+              title: res.data.message,
+              duration: 2000
+            });
+          }
+        }
+      });
+    },
+    getUserList(dept, list, i) {
+      //发送 post 请求
+      var _this = this
+      uni.request({
+        method: 'POST',
+        dataType: 'json',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        url: basePath + '/app/sys/listUser',
+        data: { DEPARTMENT_ID: dept, tm: new Date().getTime() },
+        success: function (res) {
+          if ("success" == res.data.result) {
+            if (i > -1) {
+              _this[list][i] = [];
+              _this[list][i] = res.data.userList;
+              _this.$forceUpdate();//强制刷新
+            } else {
+              _this[list] = res.data.userList;
+            }
+          } else {
+            uni.showToast({
+              title: res.data.message,
+              duration: 2000
+            });
+          }
+        }
+      })
+    },
+    //手写板
+    showModal(ISSELF) {
+      this.ISSELF = ISSELF
+      this.modalName = 'Modal'
+    },
+    hideModal(e) {
+      this.modalName = null
+    },
+    //完成
+    subCanvas(e) {
+      e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
+      this.imgList.push(e);
+      this.hideModal();
+      this.signModalShow = false;
+    },
+    ViewImage(e) {
+      let files = [];
+      files.push(e.currentTarget.dataset.url)
+      uni.previewImage({
+        urls: files,
+        current: e.currentTarget.dataset.url
+      });
+    },
+    DelImg(index) {
+      this.imgList.splice(index, 1)
+    },
+    //分析人
+    // 确定回调事件
+    analyzetreeConfirm(e) {
+      this.isUps = false;
+      this.pd.ANALYZE_DEPARTMENT_ID = e[0].id;
+      this.pd.ANALYZE_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'analyzeUserList');
+    },
+    // 取消回调事件
+    analyzetreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showAnalyzeTree() {
+      this.isUps = true
+      this.$refs.tkiTree_analyze._show();
+    },
+    PickerAnalyze(e) {
+      this.analyzeindex = e.detail.value;
+      this.pd.ANALYZE_USER_ID = this.analyzeUserList[this.analyzeindex].USER_ID;
+      this.pd.ANALYZE_USER_NAME = this.analyzeUserList[this.analyzeindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //确认人
+    // 确定回调事件
+    confirmtreeConfirm(e) {
+      this.isUps = false;
+      this.pd.CONFIRM_DEPARTMENT_ID = e[0].id;
+      this.pd.CONFIRM_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'confirmUserList');
+    },
+    // 取消回调事件
+    confirmtreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showConfirmTree() {
+      this.isUps = true
+      this.$refs.tkiTree_confirm._show();
+    },
+    PickerConfirm(e) {
+      this.confirmindex = e.detail.value;
+      this.pd.CONFIRM_USER_ID = this.confirmUserList[this.confirmindex].USER_ID;
+      this.pd.CONFIRM_USER_NAME = this.confirmUserList[this.confirmindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //监护人
+    // 确定回调事件
+    guardiantreeConfirm(e) {
+      this.isUps = false;
+      this.pd.GUARDIAN_DEPARTMENT_ID = e[0].id;
+      this.pd.GUARDIAN_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'guardianUserList');
+    },
+    // 取消回调事件
+    guardiantreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showGuardianTree() {
+      this.isUps = true
+      this.$refs.tkiTree_guardian._show();
+    },
+    PickerGuardian(e) {
+      this.guardianindex = e.detail.value;
+      this.pd.GUARDIAN_USER_ID = this.guardianUserList[this.guardianindex].USER_ID;
+      this.pd.GUARDIAN_USER_NAME = this.guardianUserList[this.guardianindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //单位领导
+    // 确定回调事件
+    leadertreeConfirm(e) {
+      this.isUps = false;
+      this.pd.LEADER_DEPARTMENT_ID = e[0].id;
+      this.pd.LEADER_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'leaderUserList');
+    },
+    // 取消回调事件
+    leadertreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showLeaderTree() {
+      this.isUps = true
+      this.$refs.tkiTree_leader._show();
+    },
+    PickerLeader(e) {
+      this.leaderindex = e.detail.value;
+      this.pd.LEADER_USER_ID = this.leaderUserList[this.leaderindex].USER_ID;
+      this.pd.LEADER_USER_NAME = this.leaderUserList[this.leaderindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //安全管理部门负责人
+    // 确定回调事件
+    audittreeConfirm(e) {
+      this.isUps = false;
+      this.pd.AUDIT_DEPARTMENT_ID = e[0].id;
+      this.pd.AUDIT_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'auditUserList');
+    },
+    // 取消回调事件
+    audittreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showAuditTree() {
+      this.isUps = true
+      this.$refs.tkiTree_audit._show();
+    },
+    PickerAudit(e) {
+      this.auditindex = e.detail.value;
+      this.pd.AUDIT_USER_ID = this.auditUserList[this.auditindex].USER_ID;
+      this.pd.AUDIT_USER_NAME = this.auditUserList[this.auditindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //审批人
+    // 确定回调事件
+    approvetreeConfirm(e) {
+      this.isUps = false;
+      this.pd.APPROVE_DEPARTMENT_ID = e[0].id;
+      this.pd.APPROVE_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'approveUserList');
+    },
+    // 取消回调事件
+    approvetreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showApproveTree() {
+      this.isUps = true
+      this.$refs.tkiTree_approve._show();
+    },
+    PickerApprove(e) {
+      this.approveindex = e.detail.value;
+      this.pd.APPROVE_USER_ID = this.approveUserList[this.approveindex].USER_ID;
+      this.pd.APPROVE_USER_NAME = this.approveUserList[this.approveindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //在岗班长
+    // 确定回调事件
+    monitortreeConfirm(e) {
+      this.isUps = false;
+      this.pd.MONITOR_DEPARTMENT_ID = e[0].id;
+      this.pd.MONITOR_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'monitorUserList');
+    },
+    // 取消回调事件
+    monitortreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showMonitorTree() {
+      this.isUps = true
+      this.$refs.tkiTree_monitor._show();
+    },
+    PickerMonitor(e) {
+      this.monitorindex = e.detail.value;
+      this.pd.MONITOR_USER_ID = this.monitorUserList[this.monitorindex].USER_ID;
+      this.pd.MONITOR_USER_NAME = this.monitorUserList[this.monitorindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    //验收部门
+    // 确定回调事件
+    accepttreeConfirm(e) {
+      this.isUps = false;
+      this.pd.ACCEPT_DEPARTMENT_ID = e[0].id;
+      this.pd.ACCEPT_DEPARTMENT_NAME = e[0].name;
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'acceptUserList');
+    },
+    // 取消回调事件
+    accepttreeCancel(e) {
+      this.isUps = false;
+    },
+    // 显示树形选择器
+    showAcceptTree() {
+      this.isUps = true
+      this.$refs.tkiTree_accept._show();
+    },
+    PickerAccept(e) {
+      this.acceptindex = e.detail.value;
+      this.pd.ACCEPT_USER_ID = this.acceptUserList[this.acceptindex].USER_ID;
+      this.pd.ACCEPT_USER_NAME = this.acceptUserList[this.acceptindex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
+    changeStartDate(e) {
+      this.pd.WORK_START_DATE = e
+      this.$forceUpdate();//强制刷新
+    },
+    changeEndDate(e) {
+      this.pd.WORK_END_DATE = e
+      this.$forceUpdate();//强制刷新
+    },
+    changeRadio(i, value) {
+      this.measuresList[i].STATUS = value
+    },
+    goback() {
+      var pages = getCurrentPages(); // 获取当前页面栈
+      var prePage = pages[pages.length - 2]; // 上二级页面
+      prePage.$vm.initflag = true; // A 页面 init方法 为true
+      uni.navigateBack({ delta: 1 });
+      uni.hideLoading();
+    },
+    radioType(e) {
+      this.HASINSTRUCTOR = e.detail.value
+    },
+    goToEdit() {
+      this.forbidEdit = false;
+    }
+  }
+}
 </script>
 <style scoped>
-	.wui-sign-box1{
-		margin-top: 20upx;
-		display: block;
-	}
-	.sign-img{
-		position: relative;
-		border-bottom: 1px dashed #eee;
-		padding-top: 20upx;
-	}
-	.cu-tag{
-		position: absolute;
-		right: 20upx;
-		top: 20upx;
-	}
+.wui-sign-box1 {
+  margin-top: 20upx;
+  display: block;
+}
+.sign-img {
+  position: relative;
+  border-bottom: 1px dashed #eee;
+  padding-top: 20upx;
+}
+.cu-tag {
+  position: absolute;
+  right: 20upx;
+  top: 20upx;
+}
 </style>
 
diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
index 815b8a1..244f590 100644
--- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
@@ -88,10 +88,12 @@
 						<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 							<!-- 表头行 -->
 							<uni-tr>
+                <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 								<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 								<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 							</uni-tr>
 							<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+                <uni-td align="center">{{ index + 1 }}</uni-td>
 								<uni-td>
 									<view style="margin-bottom: 20upx;">
 										{{item.PROTECTIVE_MEASURES}}
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
index 53d7c51..9da69f4 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
@@ -446,7 +446,7 @@
 						</view>
 					</view>
 				</view>
-        <view v-if="pd.APPROVAL_SIGNATURE">
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">项目主管部门负责意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
index 46f55fe..e549ab6 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
@@ -107,10 +107,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
@@ -247,10 +249,10 @@
 				</view>
 			</view>
 			<view class="wui-form-list">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">作业负责人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
-				</view>
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">作业负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
+        </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">作业负责人</view>
@@ -260,11 +262,22 @@
 						<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
 					</view>
 				</view>
-
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">属地监管单位意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
-				</view>
+        <view>
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">项目主管部门负责意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+            </view>
+          </view>
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+          </view>
+        </view>
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">属地监管单位意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
+        </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">属地监管单位负责人</view>
@@ -275,10 +288,10 @@
 					</view>
 				</view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">安全管理部门意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
-				</view>
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">安全管理部门意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
+          </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">安全管理部门负责人</view>
@@ -409,6 +422,20 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      },
+      formattedLeaderContent() {
+        return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+      },
+      formattedAuditContent() {
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
index 4f879ca..e236682 100644
--- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
@@ -454,7 +454,7 @@
 				<!--					<view class="title">监护人</view>-->
 				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 				<!--				</view>-->
-        <view v-if="pd.APPROVAL_SIGNATURE">
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">项目主管部门负责意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
index 8f7ba0a..f3d7fe6 100644
--- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
@@ -131,10 +131,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
@@ -269,10 +271,10 @@
 				</view>
 			</view>
 			<view class="wui-form-list">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">作业负责人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
-				</view>
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">作业负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
+        </view>
 <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;;">-->
 <!--					<view class="title">作业负责人</view>-->
 <!--					{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@@ -295,11 +297,23 @@
 <!--					<view class="title">监护人</view>-->
 <!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 <!--				</view>-->
-
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">属地监管单位意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
-				</view>
+        <view>
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">项目主管部门负责意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+            </view>
+          </view>
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+          </view>
+        </view>
+        <view>
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">属地监管单位意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
+        </view>
 <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;;">-->
 <!--					<view class="title">动火点属地监管单位负责人</view>-->
 <!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
@@ -313,7 +327,7 @@
 						<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
 					</view>
 				</view>
-
+        </view>
 				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
 					<view class="cu-form-title">安全管理部门意见</view>
 					<textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>
@@ -432,6 +446,17 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      },
+      formattedLeaderContent() {
+        return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
index 289e240..082f76c 100644
--- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
@@ -131,10 +131,12 @@
 						<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 							<!-- 表头行 -->
 							<uni-tr>
+                <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 								<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 								<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 							</uni-tr>
 							<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+                <uni-td align="center">{{ index + 1 }}</uni-td>
 								<uni-td>
 									<view style="margin-bottom: 20upx;">
 										{{item.PROTECTIVE_MEASURES}}
diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
index 861643c..0fa6bc8 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
@@ -442,7 +442,7 @@
 						</view>
 					</view>
 				</view>
-        <view v-if="pd.APPROVAL_SIGNATURE">
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">项目主管部门负责意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
index ec275a2..2b1fadf 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -102,10 +102,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 80px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
index b1940e0..8033222 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
@@ -107,10 +107,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
index 8053f0e..d9b4d2a 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
@@ -659,7 +659,7 @@
         return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
       },
       formattedAuditContent() {
-        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '' ? this.pd.AUDIT_CONTENT : '同意';
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
       },
       formattedApproveContent() {
         return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
index 6868f17..1e6a20d 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -102,10 +102,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
@@ -264,10 +266,9 @@
 				</view>
 			</view>
 			<view class="wui-form-list">
-
         <view class="cu-form-textarea" style="border: none;">
           <view class="cu-form-title">作业负责人意见</view>
-          <textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
         </view>
         <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
           <view class="cu-form-group" >
@@ -278,9 +279,11 @@
             <image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
           </view>
         </view>
-        <view class="cu-form-textarea" style="border: none;">
-          <view class="cu-form-title">项目主管部门负责人意见</view>
-          <textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
+        <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">项目主管部门负责意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+          </view>
         </view>
         <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
           <view class="cu-form-group" >
@@ -410,6 +413,14 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
index be85b84..286a428 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
@@ -136,10 +136,12 @@
 					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
 						<!-- 表头行 -->
 						<uni-tr>
+              <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
 							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
 						</uni-tr>
 						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+              <uni-td align="center">{{ index + 1 }}</uni-td>
 							<uni-td>
 								<view style="margin-bottom: 20upx;">
 								    {{item.PROTECTIVE_MEASURES}}
@@ -452,7 +454,7 @@
 				<!--					<view class="title">监护人</view>-->
 				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 				<!--				</view>-->
-        <view v-if="pd.APPROVAL_SIGNATURE">
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">项目主管部门负责意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
index ff380e5..d980720 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -262,10 +262,10 @@
 			</view>
 			<view class="wui-form-list">
 
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">作业负责人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
-				</view>
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">作业负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
+        </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">作业负责人</view>
@@ -276,24 +276,23 @@
 					</view>
 				</view>
 
-        <view class="cu-form-textarea" style="border: none;">
-          <view class="cu-form-title">项目主管部门负责人意见</view>
-          <textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
-        </view>
-        <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">项目主管部门负责意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+            </view>
+          </view>
           <view class="cu-form-group" >
             <view class="title">项目主管部门负责人</view>
-            {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
-          </view>
-          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+            {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
         </view>
-
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">属地监管单位意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
-				</view>
+        <view v-if="pd.AUDIT_USER_SIGNER_PATH">
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">属地监管单位意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
+        </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">属地监管单位负责人</view>
@@ -303,11 +302,12 @@
 						<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
 					</view>
 				</view>
+        </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">安全管理部门意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
-				</view>
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">安全管理部门意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
+          </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">安全管理部门负责人</view>
@@ -319,10 +319,10 @@
 				</view>
 				</view>
 				<view v-if="pd.APPROVE_USER_SIGNER_PATH">
-				<view class="cu-form-textarea" style="border: none;">
-					<view class="cu-form-title">动火审批意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
-				</view>
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">动火审批人意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
+          </view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">动火审批人</view>
@@ -453,6 +453,23 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      },
+      formattedLeaderContent() {
+        return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+      },
+      formattedAuditContent() {
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+      },
+      formattedApproveContent() {
+        return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
index 26fe6db..4151fee 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
@@ -446,7 +446,7 @@
 						</view>
 					</view>
 				</view>
-        <view v-if="pd.APPROVAL_SIGNATURE">
+        <view>
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">项目主管部门负责意见</view>
@@ -659,7 +659,7 @@
         return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
       },
       formattedAuditContent() {
-        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '' ? this.pd.AUDIT_CONTENT : '同意';
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
       },
       formattedApproveContent() {
         return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
index 2b5bc41..6b8f499 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
@@ -102,10 +102,12 @@
             <uni-table name='measuresList' border stripe emptyText="暂无更多数据">
               <!-- 表头行 -->
               <uni-tr>
+                <uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
                 <uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
                 <uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
               </uni-tr>
               <uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+                <uni-td align="center">{{ index + 1 }}</uni-td>
                 <uni-td>
                   <view style="margin-bottom: 20upx;">
                     {{ item.PROTECTIVE_MEASURES }}
@@ -274,7 +276,7 @@
         <view class="wui-form-list">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">作业负责人意见</view>
-            <textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
           </view>
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group">
@@ -409,6 +411,11 @@ export default {
       imgList: [],
     }
   },
+  computed: {
+    formattedConfirmContent() {
+      return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+    }
+  },
   onLoad(event) {
     this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
     this.pd.HOTWORK_ID = event.HOTWORK_ID;
diff --git a/pages/basics/home.vue b/pages/basics/home.vue
index 63e4ff8..2063235 100644
--- a/pages/basics/home.vue
+++ b/pages/basics/home.vue
@@ -20,6 +20,7 @@
               <navigator class="a" hover-class="none" :url="item.url">
                 <view class="image">
                   <image :src="item.image" mode=""></image>
+                  <view v-if="item.title === '高危作业' && totalUnreadCount > 0" class="badge">{{ totalUnreadCount }}</view>
                 </view>
                 <view class="title">
                   <text>{{ item.title }}</text>
@@ -274,6 +275,7 @@
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 		data() {
 			return {
+        totalUnreadCount: 0,
         girdList:[
           {
             title:'基本资料',
@@ -398,6 +400,7 @@
 			this.getData()
 			this.getHiddenData()
 			this.getSafetyEnvironmentalCount()
+      this.getSumCount();
 			// this.getListData()
 			console.info(loginUser)
 			// this._freshing = false;
@@ -603,6 +606,42 @@
 				// 	}
 				// });
 			},
+      async getSumCount() {
+        const hotWorkCount = await this.getCount('/app/hotwork/cfd/countCheck');
+        const highWorkCount = await this.getCount('/app/gfHighwork/countCheck');
+        const blindBoardCount = await this.getCount('/app/gfBlindBoard/countCheck');
+        const hoistingCount = await this.getCount('/app/gfHoisting/countCheck');
+        const confinedSpaceCount = await this.getCount('/app/gfConfinedSpace/countCheck');
+        const electricityCount = await this.getCount('/app/gfElectricity/countCheck');
+
+        this.totalUnreadCount = hotWorkCount + highWorkCount + blindBoardCount + hoistingCount + confinedSpaceCount + electricityCount;
+      },
+      getCount(url) {
+        return new Promise((resolve, reject) => {
+          uni.request({
+            url: basePath + url,
+            method: 'POST',
+            dataType: 'json',
+            header: { 'Content-type': 'application/x-www-form-urlencoded' },
+            data: {
+              tm: new Date().getTime(),
+              CORPINFO_ID: loginUser.CORPINFO_ID,
+              USER_ID: loginUser.USER_ID,
+            },
+            success: (res) => {
+              if (res.data.result === "success") {
+                resolve(res.data.count.SUMCOUNT || 0);
+              } else {
+                resolve(0);
+              }
+            },
+            fail: (err) => {
+              console.error(err);
+              resolve(0);
+            },
+          });
+        });
+      },
 			// 隐患播报
 			getHiddenData() {
 				return new Promise((resolve, reject) => {
@@ -812,17 +851,17 @@
 </script>
 <style lang="scss" scoped>
 .status_bar {
-    height: var(--status-bar-height);
-    width: 100%;
-    background-color: #022267;
+  height: var(--status-bar-height);
+  width: 100%;
+  background-color: #022267;
 }
 .top_view {
-    height: var(--status-bar-height);
-    width: 100%;
-    position: fixed;
-    background-color: #022267;
-    top: 0;
-    z-index: 999;
+  height: var(--status-bar-height);
+  width: 100%;
+  position: fixed;
+  background-color: #022267;
+  top: 0;
+  z-index: 999;
 }
 .banner{
   background-image: url("/static/new_images/banner.png");
@@ -851,10 +890,21 @@
         .image{
           flex-basis: 100%;
           text-align: center;
+          position: relative; // 添加相对定位
           image{
             width: 84upx;
             height: 84upx;
           }
+          .badge {
+            position: absolute;
+            top: -10px; // 调整位置
+            right: 0; // 调整位置
+            background-color: #dd514c;
+            color: white;
+            border-radius: 50%;
+            padding: 2px 5px;
+            font-size: 12px;
+          }
         }
         .title{
           flex-basis: 100%;