diff --git a/src/assets/js/api/specialWork.js b/src/assets/js/api/specialWork.js
index 673b5e72..edaa09aa 100644
--- a/src/assets/js/api/specialWork.js
+++ b/src/assets/js/api/specialWork.js
@@ -42,4 +42,6 @@ export const getGroundSafetQueryByIdApi = data => get('xmgl/xzGroundSafet/queryB
 export const getGroundSafetdeleteApi = data => post('xmgl/xzGroundSafet/delete', data);   //删除
 
 // 断路作业
-
+export const getOpenCircuitPageApi = data => get('xmgl/xzOpenCircuitSafe/page', data);   //列表接口
+export const getOpenCircuitQueryByIdApi = data => get('xmgl/xzOpenCircuitSafe/queryById', data);   //查看详情
+export const getOpenCircuitdeleteApi = data => post('xmgl/xzOpenCircuitSafe/delete', data);   //删除
diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue
index 17157e55..33bb5b4f 100644
--- a/src/views/projectFront/specialWork/disconnectionWork.vue
+++ b/src/views/projectFront/specialWork/disconnectionWork.vue
@@ -3,6 +3,10 @@
         <div v-if="dialogFormVisible">
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
+                    <el-form-item label="作业票编号">
+                        <el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
+                        </el-input>
+                    </el-form-item>
                     <el-form-item label="作业申请单位">
                         <el-select v-model="formInline.enterpriseId" placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
@@ -34,8 +38,8 @@
                 <el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
                     @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
                     <!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
-                    <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
-                    <el-table-column align="center" label="作业票编号" prop="workTicketCode">
+                    <el-table-column label="序号" type="index" align="center" ></el-table-column>
+                    <el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
                         <template slot-scope="scope">
                             <div class="" style="display: flex;justify-content:center;font-weight:bold">
                                 <div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
@@ -54,11 +58,11 @@
                             {{ scope.row.jobApplicationUnitName }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="涉及相关单位" prop="involveRelatedUnit"></el-table-column>
+                    <el-table-column align="center" label="涉及相关单位" prop="involveRelatedUnit" show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="断路原因" prop="breakReason"></el-table-column>
-                    <el-table-column align="center" label="作业内容" prop="jobContent"></el-table-column>
+                    <!-- <el-table-column align="center" label="作业内容" prop="jobContent"></el-table-column> -->
                     <el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
-                    <el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
+                    <el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
                     <!-- 状态 -->
                     <el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
@@ -162,7 +166,14 @@
                                 {{ workDetail.breakReason }}
                             </el-form-item>
                             <el-form-item label="断路地段示意图：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.breakLocationDiagram }}
+                                <!-- {{ workDetail.breakLocationDiagram }} -->
+                                <span class="value" v-if="workDetail.breakLocationDiagram && JSON.parse(workDetail.breakLocationDiagram).length > 0"  
+                                        style="display: flex;justify-content:flex-start;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
+                                        <div v-for="(item,index) in JSON.parse(workDetail.breakLocationDiagram)" :key="index" style="">
+                                            <img :preview="item ? $store.state.FILEURL + item.url : ''"
+                                                :src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
+                                        </div>
+                                    </span>
                             </el-form-item>
                             <el-form-item label="断路地段相关说明：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.breakLocationDescription }}
@@ -173,7 +184,7 @@
                             <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.riskIdentificationResult }}
                             </el-form-item>
-                            <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.otherRelatedSpecialTask }}
                             </el-form-item>
                             <el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
@@ -184,9 +195,9 @@
                                 <!--  -->
                                 <!--  :picker-options="pickerOptions" -->
                             </el-form-item>
-                            <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.safetyWorkTicketCode }}
-                            </el-form-item>
+                            </el-form-item> -->
                         </el-form>
                     </div>
                 </template>
@@ -271,10 +282,10 @@ import {
 } from "@/assets/js/api/dangerousBigProject"
 
 import {
-    getGroundSafetPageApi,
+    getOpenCircuitPageApi,
     getEnterpriseInfoListApi,
-    getGroundSafetQueryByIdApi,
-    getGroundSafetdeleteApi,
+    getOpenCircuitQueryByIdApi,
+    getOpenCircuitdeleteApi,
 } from "@/assets/js/api/specialWork"
 
 import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit";
@@ -289,8 +300,9 @@ export default {
             formInline: {
                 firemanName: '',
                 enterpriseId: '',
+                workTicketCode:"",
             },
-            formLabelWidthDetail: "180px",
+            formLabelWidthDetail: "270px",
             detailData: {},
             responsibilityList: [],
             planDate: "",
@@ -422,6 +434,7 @@ export default {
         onRefresh() {
             this.formInline.enterpriseId = "";
             this.formInline.firemanName = "";
+            this.formInline.workTicketCode = "";
             this.pageNo = 1;
             this.initData();
         },
@@ -439,11 +452,12 @@ export default {
             let data = {
                 jobApplicationUnit: this.formInline.enterpriseId,
                 firemanName: this.formInline.firemanName,
+                workTicketCode: this.formInline.workTicketCode,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
                 projectSn: this.projectSn
             }
-            getGroundSafetPageApi(data).then((res) => {
+            getOpenCircuitPageApi(data).then((res) => {
                 if (res.result) {
                     console.log(res.result.records, 1)
                     // res.result.records.forEach((item) => {
@@ -680,7 +694,7 @@ export default {
             this.deleteDialog = true
         },
         checkDelete() {
-            getGroundSafetdeleteApi({ id: this.deleteId }).then((res) => {
+            getOpenCircuitdeleteApi({ id: this.deleteId }).then((res) => {
                 console.log(res)
                 if (res.code == 200) {
                     this.$message.success(res.message)
@@ -768,7 +782,7 @@ export default {
             this.dialogTitle = this.$t('message.dangerousBigProject.detailed')
             this.detailId = val.id
 
-            getGroundSafetQueryByIdApi({
+            getOpenCircuitQueryByIdApi({
                 id: val.id
             }).then((res) => {
                 if (res.result) {
diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue
index ee915c1b..ceeb9cfb 100644
--- a/src/views/projectFront/specialWork/riggingOutWork.vue
+++ b/src/views/projectFront/specialWork/riggingOutWork.vue
@@ -3,6 +3,10 @@
         <div v-if="dialogFormVisible">
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
+                    <el-form-item label="作业票编号">
+                        <el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
+                        </el-input>
+                    </el-form-item>
                     <el-form-item label="作业申请单位">
                         <el-select v-model="formInline.enterpriseId" placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
@@ -34,8 +38,8 @@
                 <el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
                     @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
                     <!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
-                    <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
-                    <el-table-column align="center" label="作业票编号" prop="workTicketCode">
+                    <el-table-column label="序号" type="index" align="center" ></el-table-column>
+                    <el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
                         <template slot-scope="scope">
                             <div class="" style="display: flex;justify-content:center;font-weight:bold">
                                 <div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
@@ -54,15 +58,15 @@
                             {{ scope.row.jobApplicationUnitName }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
+                    <el-table-column align="center" label="作业申请时间" prop="jobApplicationTime" show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="吊具名称" prop="hoistName"></el-table-column>
                     <el-table-column align="center" label="吊物内容" prop="hoistContent"></el-table-column>
                     <el-table-column align="center" label="吊装地点" prop="hoistPlace"></el-table-column>
                     <el-table-column align="center" label="作业级别" prop="jobLevel"></el-table-column>
-                    <el-table-column align="center" label="吊装作业人" prop="jobPersonName"></el-table-column>
+                    <el-table-column align="center" label="吊装作业人" prop="hoistJobPersonName"></el-table-column>
                     <el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
-                    <el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
-                    <el-table-column align="center" label="指挥人" prop="commander"></el-table-column>
+                    <el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="指挥人" prop="commanderName"></el-table-column>
                     <!-- 状态 -->
                     <el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
                         <template slot-scope="scope">
@@ -162,28 +166,28 @@
                                 {{ workDetail.workTicketCode }}
                             </el-form-item>
                             <el-form-item label="吊装地点：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.fireLocationAndFirePart }}
+                                {{ workDetail.hoistPlace }}
                             </el-form-item>
                             <el-form-item label="吊具名称：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.jobContent }}
+                                {{ workDetail.hoistName }}
                             </el-form-item>
                             <el-form-item label="司索人：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.siSuoPerson }}
+                                {{ workDetail.siSuoPersonName }}
                             </el-form-item>
                             <el-form-item label="吊具内容：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.hotMethod }}
+                                {{ workDetail.hoistContent }}
                             </el-form-item>
                             <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.assignmentPersonInChargeName }}
+                                {{ workDetail.guardianName }}
                             </el-form-item>
                             <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.riskIdentificationResult }}
                             </el-form-item>
                             <el-form-item label="吊物质量：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.assignmentPersonInChargeName }}
+                                {{ workDetail.hoistWeight }}
                             </el-form-item>
                             <el-form-item label="指挥人员：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.assignmentPersonInChargeName }}
+                                {{ workDetail.commanderName }}
                             </el-form-item>
                             <!-- <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.hotWorkLevel }}
@@ -301,6 +305,7 @@ export default {
             formInline: {
                 firemanName: '',
                 enterpriseId: '',
+                workTicketCode:"",
             },
             formLabelWidthDetail: "180px",
             detailData: {},
@@ -434,6 +439,7 @@ export default {
         onRefresh() {
             this.formInline.enterpriseId = "";
             this.formInline.firemanName = "";
+            this.formInline.workTicketCode = "";
             this.pageNo = 1;
             this.initData();
         },
@@ -451,6 +457,7 @@ export default {
             let data = {
                 jobApplicationUnit: this.formInline.enterpriseId,
                 firemanName: this.formInline.firemanName,
+                workTicketCode: this.formInline.workTicketCode,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
                 projectSn: this.projectSn
diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue
index 6009c5e0..07afbbbf 100644
--- a/src/views/projectFront/specialWork/startBuildingWork.vue
+++ b/src/views/projectFront/specialWork/startBuildingWork.vue
@@ -3,6 +3,10 @@
         <div v-if="dialogFormVisible">
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
+                    <el-form-item label="作业票编号">
+                        <el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
+                        </el-input>
+                    </el-form-item>
                     <el-form-item label="作业申请单位">
                         <el-select v-model="formInline.enterpriseId" placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
@@ -34,8 +38,8 @@
                 <el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
                     @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
                     <!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
-                    <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
-                    <el-table-column align="center" label="作业票编号" prop="workTicketCode">
+                    <el-table-column label="序号" type="index" align="center" ></el-table-column>
+                    <el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
                         <template slot-scope="scope">
                             <div class="" style="display: flex;justify-content:center;font-weight:bold">
                                 <div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
@@ -54,11 +58,11 @@
                             {{ scope.row.jobApplicationUnitName }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
-                    <el-table-column align="center" label="作业地点" prop="highJobLevel"></el-table-column>
-                    <el-table-column align="center" label="作业内容" prop="jobHigh"></el-table-column>
+                    <el-table-column align="center" label="作业申请时间" prop="jobApplicationTime" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="作业地点" prop="jobPlace"></el-table-column>
+                    <el-table-column align="center" label="作业内容" prop="jobContent"></el-table-column>
                     <el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
-                    <el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
+                    <el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
                     <!-- 状态 -->
                     <el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
@@ -156,16 +160,23 @@
                                 {{ workDetail.jobApplicationTime }}
                             </el-form-item>
                             <el-form-item label="作业地点：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.workPlace }}
+                                {{ workDetail.jobPlace }}
                             </el-form-item>
                             <el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.jobHigh }}
+                                {{ workDetail.jobContent }}
                             </el-form-item>
                             <el-form-item label="作业范围、内容、方式：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.jobRangeContent }}
                             </el-form-item>
                             <el-form-item label="作业范围、内容、方式的简图：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.jobRangeContentPic }}
+                                <!-- {{ workDetail.jobRangeContentPic }} -->
+                                <span class="value" v-if="workDetail.jobRangeContentPic && JSON.parse(workDetail.jobRangeContentPic).length > 0"  
+                                        style="display: flex;justify-content:flex-start;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
+                                        <div v-for="(item,index) in JSON.parse(workDetail.jobRangeContentPic)" :key="index" style="">
+                                            <img :preview="item ? $store.state.FILEURL + item.url : ''"
+                                                :src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
+                                        </div>
+                                    </span>
                             </el-form-item>
                             <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.guardianName }}
@@ -173,7 +184,7 @@
                             <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.riskIdentificationResult }}
                             </el-form-item>
-                            <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.otherRelatedSpecialTask }}
                             </el-form-item>
                             <el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
@@ -186,9 +197,9 @@
                                 <!--  -->
                                 <!--  :picker-options="pickerOptions" -->
                             </el-form-item>
-                            <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.safetyWorkTicketCode }}
-                            </el-form-item>
+                            </el-form-item> -->
                         </el-form>
                     </div>
                 </template>
@@ -291,8 +302,9 @@ export default {
             formInline: {
                 firemanName: '',
                 enterpriseId: '',
+                workTicketCode:"",
             },
-            formLabelWidthDetail: "220px",
+            formLabelWidthDetail: "270px",
             detailData: {},
             responsibilityList: [],
             planDate: "",
@@ -424,6 +436,7 @@ export default {
         onRefresh() {
             this.formInline.enterpriseId = "";
             this.formInline.firemanName = "";
+            this.formInline.workTicketCode = "";
             this.pageNo = 1;
             this.initData();
         },
@@ -441,6 +454,7 @@ export default {
             let data = {
                 jobApplicationUnit: this.formInline.enterpriseId,
                 firemanName: this.formInline.firemanName,
+                workTicketCode: this.formInline.workTicketCode,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
                 projectSn: this.projectSn
diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue
index e41bab74..aa722298 100644
--- a/src/views/projectFront/specialWork/temporaryPowerWork.vue
+++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue
@@ -3,6 +3,10 @@
         <div v-if="dialogFormVisible">
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
+                    <el-form-item label="作业票编号">
+                        <el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
+                        </el-input>
+                    </el-form-item>
                     <el-form-item label="作业申请单位">
                         <el-select v-model="formInline.enterpriseId" placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
@@ -34,8 +38,8 @@
                 <el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
                     @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
                     <!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
-                    <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
-                    <el-table-column align="center" label="作业票编号" prop="workTicketCode">
+                    <el-table-column label="序号" type="index" align="center"></el-table-column>
+                    <el-table-column align="center" label="作业票编号"  width="200" prop="workTicketCode">
                         <template slot-scope="scope">
                             <div class="" style="display: flex;justify-content:center;font-weight:bold">
                                 <div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
@@ -49,20 +53,20 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="申请单位" show-overflow-tooltip>
-                        <!--  作业申请单位 -->
+                        <!--  作业申请单位 --> 
                         <template slot-scope="scope">
                             {{ scope.row.jobApplicationUnitName }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
+                    <el-table-column align="center" label="作业申请时间" prop="jobApplicationTime" show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="作业内容" prop="jobContent"></el-table-column>
                     <el-table-column align="center" label="作业地点" prop="jobPlace"></el-table-column>
                     <el-table-column align="center" label="工作电压" prop="jobVoltage"></el-table-column>
-                    <el-table-column align="center" label="用电设备名称" prop="electricName"></el-table-column>
-                    <el-table-column align="center" label="电源接入点" prop="powerAccessPoint"></el-table-column>
-                    <el-table-column align="center" label="许可用电功率" prop="permitElectricPower"></el-table-column>
-                    <el-table-column align="center" label="电工证号" prop="electricianNum1"></el-table-column>
-                    <el-table-column align="center" label="用电人" prop="electricityCustomer"></el-table-column>
+                    <el-table-column align="center" label="用电设备名称" prop="electricName" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="电源接入点" prop="powerAccessPoint" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="许可用电功率" prop="permitElectricPower" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="电工证号" prop="electricianNum2" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="用电人" prop="electricityCustomerName"></el-table-column>
                     <el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
                     <el-table-column align="center" label="作业人" prop="jobPersonName"></el-table-column>
                     <el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
@@ -183,7 +187,7 @@
                                 {{ workDetail.guardianName }}
                             </el-form-item>
                             <el-form-item label="用电人：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.electricityCustomer }}
+                                {{ workDetail.electricityCustomerName }}
                             </el-form-item>
                             <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.riskIdentificationResult }}
@@ -191,16 +195,16 @@
                             <el-form-item label="作业人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.jobPersonName }}
                             </el-form-item>
-                            <el-form-item label="电工证号1：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.electricianNum1 }}
+                            <!-- <el-form-item label="电工证号1：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.electricianNum1 }} -->
                             </el-form-item>
                             <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.assignmentPersonInChargeName }}
                             </el-form-item>
-                            <el-form-item label="电工证号2：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.electricianNu21 }}
+                            <el-form-item label="电工证号：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.electricianNum2 }}
                             </el-form-item>
-                            <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.otherRelatedSpecialTask }}
                             </el-form-item>
                             <el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
@@ -213,9 +217,9 @@
                                 <!--  -->
                                 <!--  :picker-options="pickerOptions" -->
                             </el-form-item>
-                            <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.safetyWorkTicketCode }}
-                            </el-form-item>
+                            </el-form-item> -->
                         </el-form>
                     </div>
                 </template>
@@ -235,18 +239,18 @@
                                 分析人
                             </el-col>
                         </el-row>
-                        <el-row>
+                        <el-row v-for="(item, index) in (workDetail.combustibleGasAnalysis  && JSON.parse(workDetail.combustibleGasAnalysis) instanceof Array && JSON.parse(workDetail.combustibleGasAnalysis))" :key="index">
                             <el-col :span="3">
-                                氧气
+                                {{item.result}}
                             </el-col>
                             <el-col :span="3">
-                                12.9
+                                {{item.time}}
                             </el-col>
                             <el-col :span="3">
-                                地点
+                                {{workDetail.analysePlace}}
                             </el-col>
                             <el-col :span="3">
-                                张三
+                                {{workDetail.analysePerson}}
                             </el-col>
                         </el-row>
                        </div> 
@@ -289,8 +293,9 @@ export default {
             formInline: {
                 firemanName: '',
                 enterpriseId: '',
+                workTicketCode:"",
             },
-            formLabelWidthDetail: "180px",
+            formLabelWidthDetail: "270px",
             detailData: {},
             responsibilityList: [],
             planDate: "",
@@ -422,6 +427,7 @@ export default {
         onRefresh() {
             this.formInline.enterpriseId = "";
             this.formInline.firemanName = "";
+            this.formInline.workTicketCode = "";
             this.pageNo = 1;
             this.initData();
         },
@@ -439,6 +445,7 @@ export default {
             let data = {
                 jobApplicationUnit: this.formInline.enterpriseId,
                 firemanName: this.formInline.firemanName,
+                workTicketCode: this.formInline.workTicketCode,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
                 projectSn: this.projectSn