diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue
index 33b51a9c..b0839187 100644
--- a/pages/projectEnd/specialOperations/fireWork/detail.vue
+++ b/pages/projectEnd/specialOperations/fireWork/detail.vue
@@ -64,67 +64,12 @@
 											<view class="item-col" style="margin-bottom: 5rpx;background-color: lightgray;">分析人</view>
 										</view>
 										<view class="teble-item" v-for="(item,i) in detailData.xzGasAnalyzeList" :key="i">
-											<view class="item-col" style="background-color: lightgray;"><text>{{item.gasAnalyzeTime||'暂无数据'}}</text></view>
-											<view class="item-col"><text>{{item.representativeGas||'暂无数据'}}</text></view>
-											<view class="item-col"><text>{{item.analyzeResult||'暂无数据'}}</text></view>
-											<view class="item-col" style="margin-bottom: 5rpx;"><text>{{item.analyzer||'暂无数据'}}</text></view>
-										</view><!-- 
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzer:''}}</view>
-										</view> -->
-										<!-- <view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzer:''}}</view>
+											<view class="item-col" style="background-color: lightgray;"><text>{{item.gasAnalyzeTime||'--'}}</text></view>
+											<view class="item-col"><text>{{item.representativeGas||'--'}}</text></view>
+											<view class="item-col"><text>{{item.analyzeResult||'--'}}</text></view>
+											<view class="item-col" style="margin-bottom: 5rpx;"><text>{{item.analyzer||'--'}}</text></view>
 										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view> -->
-										
 									</scroll-view>
-								<!-- </view> -->
-								
-								<!-- <uni-table emptyText="暂无更多数据" class="uni-table-font">
-									<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
-										<uni-tr>气体取样分析时间</uni-tr>
-										<uni-tr>代表性气体</uni-tr>
-										<uni-tr>分析结果/%</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr class="uni-tr-font">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
-									</uni-td>
-								</uni-table> -->
 							</view>
 							<view class="safe-mesure">
 								<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
diff --git a/pages/projectEnd/specialOperations/groundSafe/detail.vue b/pages/projectEnd/specialOperations/groundSafe/detail.vue
index a7bef9fc..b84cdea2 100644
--- a/pages/projectEnd/specialOperations/groundSafe/detail.vue
+++ b/pages/projectEnd/specialOperations/groundSafe/detail.vue
@@ -11,36 +11,48 @@
 						<view class="list-info">
 							作业票编号：<text class="detail-data">{{detailData.workTicketCode}}</text>
 						</view>
+						<view class="list-info">
+							作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+						</view>
+						<view class="list-info">
+							作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+						</view>
+						<view class="list-info">
+							作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+						</view>
 						<view class="" v-if="isShow">
+							<view class="list-info">
+								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
+							</view>
 							<view class="list-info">
 								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
 							</view>
+							<view class="list-info">
+								作业人：<text class="detail-data">{{detailData.jobPersonName}}</text>
+							</view>
+							<view class="list-info">
+								作业地点：<text class="detail-data">{{detailData.jobPlace}}</text>
+							</view>
+							<view class="list-info">
+								作业范围、内容、方式（包括深度、面积）：<text class="detail-data">{{detailData.jobRangeContent}}</text>
+							</view>
+							<view class="list-info">
+								作业范围、内容、方式的简图：<text class="detail-data">{{detailData.jobRangeContentPic}}</text>
+							</view>
+							<view class="list-info">
+								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
+							</view>
 							<view class="list-info">
 								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
 							</view>
 							<view class="list-info">
-								作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+								关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
 							</view>
-							<view class="list-info">
-								作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
-							</view>
-							<view class="list-info">
-								作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
-							</view>
-							<view class="list-info">
-								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
-							</view>
-							<!-- <view class="list-info">
-								证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
-							</view> -->
-							<!-- <view class="list-info">
-								安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
-							</view> -->
 							<view class="list-info">
 								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
 							</view>
+							
 							<view class="table-info" style="">
-								<!-- <view class="teble-list"> -->
 									<scroll-view :scroll-x="true" class="teble-list">
 										<view class="teble-item">
 											<view class="item-col" style="background-color: lightgray;">气体取样分析时间</view>
@@ -49,67 +61,12 @@
 											<view class="item-col" style="margin-bottom: 5rpx;background-color: lightgray;">分析人</view>
 										</view>
 										<view class="teble-item" v-for="(item,i) in detailData.xzGasAnalyzeList" :key="i">
-											<view class="item-col" style="background-color: lightgray;"><text>{{item.gasAnalyzeTime||'暂无数据'}}</text></view>
-											<view class="item-col"><text>{{item.representativeGas||'暂无数据'}}</text></view>
-											<view class="item-col"><text>{{item.analyzeResult||'暂无数据'}}</text></view>
-											<view class="item-col" style="margin-bottom: 5rpx;"><text>{{item.analyzer||'暂无数据'}}</text></view>
-										</view><!-- 
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzer:''}}</view>
-										</view> -->
-										<!-- <view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzer:''}}</view>
+											<view class="item-col" style="background-color: lightgray;"><text>{{item.gasAnalyzeTime||'--'}}</text></view>
+											<view class="item-col"><text>{{item.representativeGas||'--'}}</text></view>
+											<view class="item-col"><text>{{item.analyzeResult||'--'}}</text></view>
+											<view class="item-col" style="margin-bottom: 5rpx;"><text>{{item.analyzer||'--'}}</text></view>
 										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view> -->
-										
 									</scroll-view>
-								<!-- </view> -->
-								
-								<!-- <uni-table emptyText="暂无更多数据" class="uni-table-font">
-									<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
-										<uni-tr>气体取样分析时间</uni-tr>
-										<uni-tr>代表性气体</uni-tr>
-										<uni-tr>分析结果/%</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr class="uni-tr-font">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
-									</uni-td>
-								</uni-table> -->
 							</view>
 							<view class="safe-mesure">
 								<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
diff --git a/pages/projectEnd/specialOperations/hoistSafe/detail.vue b/pages/projectEnd/specialOperations/hoistSafe/detail.vue
index adf3e4c9..5a28ab81 100644
--- a/pages/projectEnd/specialOperations/hoistSafe/detail.vue
+++ b/pages/projectEnd/specialOperations/hoistSafe/detail.vue
@@ -11,36 +11,62 @@
 						<view class="list-info">
 							作业票编号：<text class="detail-data">{{detailData.workTicketCode}}</text>
 						</view>
+						<view class="list-info">
+							作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+						</view>
+						<view class="list-info">
+							作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+						</view>
+						<view class="list-info">
+							作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+						</view>
 						<view class="" v-if="isShow">
 							<view class="list-info">
-								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
+								指挥人员：<text class="detail-data">{{detailData.commanderName}}</text>
+							</view>
+							<view class="list-info">
+								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
+							</view>
+							<view class="list-info">
+								安全隐患总数：<text class="detail-data">{{detailData.hiddenDangerNum}}</text>
+							</view>
+							<view class="list-info">
+								吊物内容：<text class="detail-data">{{detailData.hoistContent}}</text>
+							</view>
+							<view class="list-info">
+								吊装作业人：<text class="detail-data">{{detailData.hoistJobPersonName}}</text>
+							</view>
+							<view class="list-info">
+								吊具名称：<text class="detail-data">{{detailData.hoistName}}</text>
+							</view>
+							<view class="list-info">
+								吊装地点：<text class="detail-data">{{detailData.hoistPlace}}</text>
+							</view>
+							<view class="list-info">
+								吊物质量(t)：<text class="detail-data">{{detailData.hoistWeight}}</text>
+							</view>
+							<view class="list-info">
+								作业级别：<text class="detail-data">{{detailData.jobLevel}}</text>
 							</view>
 							<view class="list-info">
 								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
 							</view>
 							<view class="list-info">
-								作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+								安全作业票编号：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
 							</view>
 							<view class="list-info">
-								作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+								司索人名称：<text class="detail-data">{{detailData.siSuoPersonName}}</text>
 							</view>
 							<view class="list-info">
-								作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+								作业实施时间：<text class="detail-data" v-if="detailData.workExecutionBeginTime && detailData.workExecutionEndTime">{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}}</text>
 							</view>
-							<view class="list-info">
-								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
-							</view>
-							<!-- <view class="list-info">
-								证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
-							</view> -->
-							<!-- <view class="list-info">
-								安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
-							</view> -->
 							<view class="list-info">
 								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
 							</view>
+							<!-- <view class="list-info">
+								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
+							</view> -->
 							<view class="table-info" style="">
-								<!-- <view class="teble-list"> -->
 									<scroll-view :scroll-x="true" class="teble-list">
 										<view class="teble-item">
 											<view class="item-col" style="background-color: lightgray;">气体取样分析时间</view>
@@ -53,63 +79,8 @@
 											<view class="item-col"><text>{{item.representativeGas||'暂无数据'}}</text></view>
 											<view class="item-col"><text>{{item.analyzeResult||'暂无数据'}}</text></view>
 											<view class="item-col" style="margin-bottom: 5rpx;"><text>{{item.analyzer||'暂无数据'}}</text></view>
-										</view><!-- 
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzer:''}}</view>
-										</view> -->
-										<!-- <view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzer:''}}</view>
 										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view>
-										<view class="teble-item">
-											<view class="item-col" style="background-color: lightgray;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</view>
-											<view class="item-col">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</view>
-											<view class="item-col" style="margin-bottom: 5rpx;">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</view>
-										</view> -->
-										
 									</scroll-view>
-								<!-- </view> -->
-								
-								<!-- <uni-table emptyText="暂无更多数据" class="uni-table-font">
-									<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
-										<uni-tr>气体取样分析时间</uni-tr>
-										<uni-tr>代表性气体</uni-tr>
-										<uni-tr>分析结果/%</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr class="uni-tr-font">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</uni-tr>
-									</uni-td>
-									<uni-td class="uni-td-font" align="center">
-										<uni-tr style="">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
-										<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
-									</uni-td>
-								</uni-table> -->
 							</view>
 							<view class="safe-mesure">
 								<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
index c9ed212e..3d2a44bc 100644
--- a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
+++ b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
@@ -78,29 +78,89 @@
 											</view>
 											<view class="table-item-inner">
 												<view class="item-col" style="">分析项目</view>
-												<view class="item-col" style="">二氧化硫</view>
-												<view class="item-col" style="">氧化硫</view>
-												<view class="item-col" style="">甲烷</view>
-												<view class="item-col" style="">氢气</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].name||'--'}}</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].name||'--'}}</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[0].name||'--'}}</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[1].name||'--'}}</view>
 												<view class="item-col" style="">--</view>
 												<view class="item-col" style="">--</view>
 												<view class="item-col" style="">--</view>
 												<view class="item-col" style="margin-right: 5rpx;">--</view>
 											</view>
 											<view class="table-item-inner">
-												<view class="item-col" style="margin-bottom: 5rpx;">合格标准</view>
-												<view class="item-col" style="margin-bottom: 5rpx;">5%</view>
+												<view class="item-col" style="">合格标准</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].standard||'--'}}</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].standard||'--'}}</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[0].standard||'--'}}</view>
+												<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[1].standard||'--'}}</view>
+												<view class="item-col" style="">19.5%~21%(体积分数)</view>
+												<view class="item-col" style="">--</view>
+												<view class="item-col" style="">--</view>
+												<view class="item-col" style="margin-right: 5rpx;">--</view>
+											</view>
+											<view :class="{'table-item-inner':true,'last-row':(i+1) === JSON.parse(detailData.gasAnalysisData).length}" 
+											v-for="(item,i) in JSON.parse(detailData.gasAnalysisData)" :key="i">
+												<view class="item-col" style="">分析数据</view>
+												<view class="item-col" style="">{{item.name1}}</view>
+												<view class="item-col" style="">{{item.name2}}</view>
+												<view class="item-col" style="">{{item.name3}}</view>
+												<view class="item-col" style="">{{item.name4}}</view>
+												<view class="item-col" style="">{{item.name5}}</view>
+												<view class="item-col" style="">{{item.time}}</view>
+												<view class="item-col" style="">{{item.local}}</view>
+												<view class="item-col" style="margin-right: 5rpx;">{{item.person}}</view>
+											</view>
+											<!-- <view class="table-item-inner">
+												<view class="item-col" style="margin-bottom: 5rpx;">分析数据</view>
 												<view class="item-col" style="margin-bottom: 5rpx;">5%</view>
 												<view class="item-col" style="margin-bottom: 5rpx;">5%</view>
 												<view class="item-col" style="margin-bottom: 5rpx;">5%</view>
 												<view class="item-col" style="margin-bottom: 5rpx;">5%</view>
+												<view class="item-col" style="margin-bottom: 5rpx;">19.5%~21%(体积分数)</view>
 												<view class="item-col" style="margin-bottom: 5rpx;">--</view>
 												<view class="item-col" style="margin-bottom: 5rpx;">--</view>
 												<view class="item-col" style="margin-right: 5rpx;margin-bottom: 5rpx;">--</view>
-											</view>
+											</view> -->
 										</view>
 									</scroll-view>
 							</view>
+							<!-- <view class="table-info2" style="">
+								<scroll-view :scroll-x="true" class="teble-list2">
+									<view class="teble-item2">
+										<view class="table-item-inner2">
+											<view class="item-col2" style="">-</view>
+											<view class="item-col2" style="">分析项目</view>
+											<view class="item-col2" style="margin-bottom: 5rpx;">合格标准</view>
+										</view>
+									</view>
+									<view class="teble-item3">
+										<view class="item3-row1">有毒有害气体名称</view>
+										<view class="item3-row2">
+											<view class="item3-row2-inner" v-for="(item,i) in JSON.parse(detailData.toxicAndHarmfulGasInformation)" :key="i">{{item.name}}</view>
+										</view>
+										<view class="item3-row3">
+											<view class="item3-row3-inner" style="margin-bottom: 5rpx;"
+											 v-for="(item,i) in JSON.parse(detailData.toxicAndHarmfulGasInformation)" :key="i">{{item.standard}}</view>
+										</view>
+									</view>
+									<view class="teble-item3">
+										<view class="item3-row1">可燃气体名称</view>
+										<view class="item3-row2">
+											<view class="item3-row2-inner" v-for="(item,i) in JSON.parse(detailData.combustibleGasInformation)" :key="i">{{item.name}}</view>
+										</view>
+										<view class="item3-row3">
+											<view class="item3-row3-inner" style="margin-bottom: 5rpx;" v-for="(item,i) in JSON.parse(detailData.combustibleGasInformation)" :key="i">{{item.standard}}</view>
+										</view>
+									</view>
+									<view class="teble-item2">
+										<view class="table-item-inner2">
+											<view class="item-col2" style="">-</view>
+											<view class="item-col2" style="">分析项目</view>
+											<view class="item-col2" style="margin-bottom: 5rpx;">合格标准</view>
+										</view>
+									</view>
+								</scroll-view>
+							</view> -->
 							<view class="safe-mesure">
 								<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
 							</view>
@@ -121,13 +181,11 @@
 								</view>
 							</view>
 						</view>
-						
 						<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
 							{{isShow ? "收起详情":"展开详情"}}
 							<uni-icons :type="isShow ? 'arrowup':'arrowdown'"></uni-icons>
 						</view>
 					</view>
-
 					<view class="detail-nav" v-if="COMPANY != 'longguang'">
 						<scroll-view class="scrollx-wrap" scroll-x>
 							<view class="nav-list">
@@ -331,6 +389,104 @@
 </script>
 
 <style lang="scss" scoped>
+.last-row{
+	padding-bottom: 5rpx;
+}
+.table-info2{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	// background-color: #fff;
+	.teble-list2{
+		display: flex;
+		font-size: 18rpx;
+		background-color: #fff;
+		white-space: nowrap;
+		float: left;
+		.teble-item2{
+			background-color: lightgray;
+			display: inline-block;
+			white-space: normal;
+			// padding: 5rpx 0;
+			.table-item-inner2{
+				// padding: 5rpx 0;
+				// margin: 5rpx 0;
+				min-width: 220rpx;
+				.item-col2{
+					margin-top: 5rpx;
+					// width: 220rpx;
+					min-width: 220rpx;
+					// padding: 3rpx;
+					margin-left: 5rpx;
+					// margin: 0 5rpx;
+					line-height: 50rpx;
+					text-align: center;
+					background-color: #F6F6F6;
+					.item-col-inner2{
+						margin-top: 5rpx;
+						width: 220rpx;
+						// min-width: 220rpx;
+						// padding: 3rpx;
+						margin-left: 5rpx;
+						// margin: 0 5rpx;
+						line-height: 50rpx;
+						text-align: center;
+						background-color: #F6F6F6;
+					}
+				}
+			}
+		}
+		.teble-item3{
+			background-color: lightgray;
+			display: inline-block;
+			white-space: normal;
+			line-height: 50rpx;
+			.item3-row1{
+				margin-top: 5rpx;
+				// width: 220rpx;
+				min-width: 220rpx;
+				// padding: 3rpx;
+				margin-left: 5rpx;
+				// margin: 0 5rpx;
+				line-height: 50rpx;
+				text-align: center;
+				background-color: #F6F6F6;
+			}
+			.item3-row2{
+				display: flex;
+				.item3-row2-inner{
+				margin-top: 5rpx;
+				// width: 220rpx;
+				min-width: 220rpx;
+				// padding: 3rpx;
+				margin-left: 5rpx;
+				// margin: 0 5rpx;
+				line-height: 50rpx;
+				text-align: center;
+				background-color: #F6F6F6;
+					
+				}
+			}
+			.item3-row3{
+				display: flex;
+				.item3-row3-inner{
+				margin-top: 5rpx;
+				// width: 220rpx;
+				min-width: 220rpx;
+				// padding: 3rpx;
+				margin-left: 5rpx;
+				// margin: 0 5rpx;
+				line-height: 50rpx;
+				text-align: center;
+				background-color: #F6F6F6;
+					
+				}
+			}
+		}
+	}
+}
+
+
 
 .other-safe{
 	background-color: #fff;
diff --git a/pages/projectEnd/specialOperations/openCircuit/detail.vue b/pages/projectEnd/specialOperations/openCircuit/detail.vue
index 21c52846..0a9daf50 100644
--- a/pages/projectEnd/specialOperations/openCircuit/detail.vue
+++ b/pages/projectEnd/specialOperations/openCircuit/detail.vue
@@ -11,34 +11,55 @@
 						<view class="list-info">
 							作业票编号：<text class="detail-data">{{detailData.workTicketCode}}</text>
 						</view>
+						<view class="list-info">
+							作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+						</view>
+						<view class="list-info">
+							作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+						</view>
+						<view class="list-info">
+							作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+						</view>
 						<view class="" v-if="isShow">
+							<view class="list-info">
+								断路地段相关说明：<text class="detail-data">{{detailData.breakLocationDescription}}</text>
+							</view>
+							<view class="list-info">
+								断路地段示意图：<text class="detail-data">{{detailData.breakLocationDiagram}}</text>
+							</view>
+							<view class="list-info">
+								断路原因：<text class="detail-data">{{detailData.breakReason}}</text>
+							</view>
+							<view class="list-info">
+								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
+							</view>
+							<view class="list-info">
+								涉及相关单位（部门）：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+							</view>
 							<view class="list-info">
 								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
 							</view>
+							<view class="list-info">
+								作业人：<text class="detail-data">{{detailData.jobPersonName}}</text>
+							</view>
 							<view class="list-info">
 								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
 							</view>
 							<view class="list-info">
-								作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+								关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
 							</view>
 							<view class="list-info">
-								作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
 							</view>
-							<view class="list-info">
-								作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
-							</view>
-							<view class="list-info">
+							<!-- <view class="list-info">
 								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
-							</view>
+							</view> -->
 							<!-- <view class="list-info">
 								证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
 							</view> -->
 							<!-- <view class="list-info">
 								安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
 							</view> -->
-							<view class="list-info">
-								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
-							</view>
 							<view class="table-info" style="">
 								<!-- <view class="teble-list"> -->
 									<scroll-view :scroll-x="true" class="teble-list">
diff --git a/pages/projectEnd/specialOperations/tempElectricity/detail.vue b/pages/projectEnd/specialOperations/tempElectricity/detail.vue
index 4fe77d15..e11ea8d7 100644
--- a/pages/projectEnd/specialOperations/tempElectricity/detail.vue
+++ b/pages/projectEnd/specialOperations/tempElectricity/detail.vue
@@ -11,22 +11,70 @@
 						<view class="list-info">
 							作业票编号：<text class="detail-data">{{detailData.workTicketCode}}</text>
 						</view>
+						<view class="list-info">
+							作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+						</view>
+						<view class="list-info">
+							作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+						</view>
+						<view class="list-info">
+							作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+						</view>
 						<view class="" v-if="isShow">
+							<view class="list-info">
+								分析人：<text class="detail-data">{{detailData.analysePerson}}</text>
+							</view>
+							<view class="list-info">
+								分析点：<text class="detail-data">{{detailData.analysePlace}}</text>
+							</view>
+							<view class="list-info">
+								可燃气体分析(分析时间和可燃气体检测结果）：<text class="detail-data">{{detailData.combustibleGasAnalysis}}</text>
+							</view>
+							<view class="list-info">
+								用电人：<text class="detail-data">{{detailData.electricityCustomerName}}</text>
+							</view>
+							<view class="list-info">
+								电工证号1：<text class="detail-data">{{detailData.electricianNum1}}</text>
+							</view>
+							<view class="list-info">
+								电工证号2：<text class="detail-data">{{detailData.electricianNum2}}</text>
+							</view>
+							<view class="list-info">
+								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
+							</view>
 							<view class="list-info">
 								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
 							</view>
+							<view class="list-info">
+								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
+							</view>
+							<view class="list-info">
+								作业地点：<text class="detail-data">{{detailData.jobPlace}}</text>
+							</view>
+							<view class="list-info">
+								工作电压：<text class="detail-data">{{detailData.jobVoltage}}</text>
+							</view>
 							<view class="list-info">
 								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
 							</view>
 							<view class="list-info">
-								作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
+								关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
 							</view>
 							<view class="list-info">
-								作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
+								许可用电功率：<text class="detail-data">{{detailData.permitElectricPower}}</text>
 							</view>
 							<view class="list-info">
-								作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+								电源接入点：<text class="detail-data">{{detailData.powerAccessPoint}}</text>
 							</view>
+							<view class="list-info">
+								额度功率	：<text class="detail-data">{{detailData.ratedPower}}</text>
+							</view>
+							<view class="list-info">
+								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
+							</view>
+							
+							
+							
 							<view class="list-info">
 								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
 							</view>
@@ -36,9 +84,6 @@
 							<!-- <view class="list-info">
 								安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
 							</view> -->
-							<view class="list-info">
-								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
-							</view>
 							<view class="table-info" style="">
 								<!-- <view class="teble-list"> -->
 									<scroll-view :scroll-x="true" class="teble-list">