From 7e9410543524695c328e443fda3d5cf211e713ca Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 15 May 2024 11:57:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectFront/carManage/carManage.vue      |  24 ++-
 src/views/projectFront/specialWork/detail.vue |   2 +-
 .../specialWork/disconnectionWork.vue         | 176 ++++++------------
 .../specialWork/startBuildingWork.vue         | 165 ++++++----------
 .../specialWork/temporaryPowerWork.vue        | 139 +++++++-------
 5 files changed, 191 insertions(+), 315 deletions(-)

diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index 1a6c729d..6b3e33bc 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -74,15 +74,15 @@
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
+          <!-- width="300" -->
         <el-table-column
-          width="300"
           prop="enterpriseName"
           align="center"
           label="企业名称"
           show-overflow-tooltip
         ></el-table-column>
+          <!-- width="100" -->
         <el-table-column
-          width="90"
           prop="carNumber"
           align="center"
           :label="$t('message.carManage.carNumber')"
@@ -93,29 +93,29 @@
           label="车身颜色"
           align="center"
         ></el-table-column> -->
+          <!-- width="100" -->
         <el-table-column
-          width="100"
           prop="carTypeName"
           :label="$t('message.carManage.carType')"
           align="center"
         >
         </el-table-column>
+          <!-- width="80" -->
         <el-table-column
-          width="80"
           prop="driverWorkerName"
           :label="$t('message.carManage.driverName')"
           align="center"
         ></el-table-column>
+          <!-- width="110" -->
         <el-table-column
-          width="110"
           prop="driverTelephone"
           :label="$t('message.carManage.driverTelephone')"
           align="center"
         ></el-table-column>
         <!-- 黑白名单调控 -->
+          <!-- width="90" -->
         <el-table-column
           prop="isBlack"
-          width="90"
           :label="$t('message.carManage.isBlack')"
           align="center"
         >
@@ -171,12 +171,11 @@
             />
           </div>
         </el-table-column> -->
-
+          <!-- width="150" -->
         <el-table-column
           prop="carModuleType"
           align="center"
           label="固定/长期/临时车辆"
-          width="150"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.carModuleType === 1">固定车辆</span>
@@ -184,7 +183,7 @@
             <span v-else>临时车辆</span>
           </template>
         </el-table-column>
-
+          <!-- width="200" -->
         <el-table-column
           prop="reserveStartTime reserveEndTime"
           align="center"
@@ -201,9 +200,8 @@
             </span>
           </template>
         </el-table-column>
-
+          <!-- width="110" -->
         <el-table-column
-          width="110"
           prop="entryAndExitPermit"
           align="center"
           :label="$t('message.carManage.entryAndExitPermit')"
@@ -213,7 +211,7 @@
             <span v-else-if="scope.row.entryAndExitPermit === 1">多次</span>
           </template>
         </el-table-column>
-        <el-table-column width="110" align="center" label="车辆下发状态">
+        <el-table-column width="120" align="center" label="车辆下发状态">
           <template v-slot="{ row }">
             <span
               :class="[
@@ -356,9 +354,9 @@
           </div>
         </el-table-column> -->
         <el-table-column
+          width="400"
           :label="$t('message.deviceManage.operation')"
           align="center"
-          width="320px"
         >
           <template slot-scope="scope">
             <div class="tableBtns">
diff --git a/src/views/projectFront/specialWork/detail.vue b/src/views/projectFront/specialWork/detail.vue
index cafec1bd..d17e1804 100644
--- a/src/views/projectFront/specialWork/detail.vue
+++ b/src/views/projectFront/specialWork/detail.vue
@@ -33,7 +33,7 @@
               <slot name="basicinfo"></slot>
             </div>
             <div class="control-point">
-              <div class="box-title">
+              <div class="box-title" v-if="$slots.gasanalysis">
                 气体分析
               </div>
               <slot name="gasanalysis"></slot>
diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue
index 652830e7..61f04953 100644
--- a/src/views/projectFront/specialWork/disconnectionWork.vue
+++ b/src/views/projectFront/specialWork/disconnectionWork.vue
@@ -3,16 +3,16 @@
         <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-form-item label="编号">
+                        <el-input placeholder="请输入" v-model="formInline.engineeringName" clearable style="width: 200px">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="申请单位">
                         <el-select v-model="formInline.recordStatus" placeholder="请选择">
                             <el-option label="作业申请单位1" :value="0"></el-option>
                             <el-option label="作业申请单位2" :value="1"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="动火人">
-                        <el-input placeholder="请输入" v-model="formInline.engineeringName" clearable style="width: 200px">
-                        </el-input>
-                    </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -34,22 +34,28 @@
                     @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="作业申请单位" show-overflow-tooltip>
+                    <el-table-column align="center" label="编号" show-overflow-tooltip>
                         <!--  作业申请单位 -->
                         <template slot-scope="scope">
                             {{ scope.row.jobApplyForUnit }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="作业申请时间" prop="jobTime"></el-table-column>
-                    <el-table-column align="center" label="受限空间名称" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="作业内容" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="受限空间内原有介质名称" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="作业人" prop="jobName"></el-table-column>
-                    <el-table-column align="center" label="监护人" prop="jobName"></el-table-column>
-                    <el-table-column align="center" label="作业单位" prop="jobUnit"></el-table-column>
-                    <el-table-column align="center" label="作业负责人" prop="jobPrincipal"></el-table-column>
-
+                    <el-table-column align="center" label="申请单位" show-overflow-tooltip>
+                        <!--  作业申请单位 -->
+                        <template slot-scope="scope">
+                            {{ scope.row.jobApplyForUnit }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" label="作业单位" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业负责人" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="涉及相关单位(部门)" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="断路原因" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="关联的其他特殊作业" prop="jobName"></el-table-column>
+                    <el-table-column align="center" label="安全作业票编号" prop="jobName"></el-table-column>
+                    <el-table-column align="center" label="断路地段示意图" prop="jobUnit"></el-table-column>
+                    <el-table-column align="center" label="相关说明" prop="jobPrincipal"></el-table-column>
+                    <el-table-column align="center" label="风险辨识结果" prop="jobPrincipal"></el-table-column>
+                    <el-table-column align="center" label="作业实施时间" prop="jobPrincipal"></el-table-column>
                     <!-- 操作 -->
                     <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')" width="120">
                         <template slot-scope="scope">
@@ -81,7 +87,7 @@
                         </template>
                     </el-table-column>
                 </el-table>
-                <el-pagination style="margin-right: 800px;" class="pagerBox" background @size-change="handleSizeChange"
+                <el-pagination style="margin-right: 800px;margin-bottom: 20px;" class="pagerBox" background @size-change="handleSizeChange"
                     @current-change="handleCurrentChange" :current-page.sync="pageNo" layout="sizes, prev, pager, next"
                     :page-sizes="[10, 20, 30, 40]" :page-size="pageSize" :total="Number(total)">
                 </el-pagination>
@@ -278,9 +284,25 @@
                 <template v-slot:basicinfo>
                     <div class="info-content">
                         <el-form class="form-box" :model="detailData">
-                            <el-form-item label="作业类型：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="编号：" :label-width="formLabelWidthDetail">
                                 受限空间名称
                             </el-form-item>
+                            <el-form-item label="申请单位" :label-width="formLabelWidthDetail">
+                                <!-- <el-cascader
+                            :disabled="isDisabled"
+                            v-model="detailData.responsibilityCompanyId"
+                            placeholder="请选择责任分包单位"
+                            :options="options"
+                            :props="props"
+                            clearable
+                            >
+                            </el-cascader> -->
+                                <el-select v-model="detailData.responsibilityCompanyId" placeholder="请选择作业单位" disabled>
+                                    <el-option :label="item.enterpriseName" :value="item.id"
+                                        v-for="(item, index) in responsibilityList" :key="index">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
                             <el-form-item label="作业单位" :label-width="formLabelWidthDetail">
                                 <!-- <el-cascader
                             :disabled="isDisabled"
@@ -297,51 +319,31 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="作业申请单位" :label-width="formLabelWidthDetail">
-                                <el-select v-model="detailData.responsibilityCompanyId" placeholder="请选择作业申请单位"
-                                    disabled>
-                                    <el-option :label="item.enterpriseName" :value="item.id"
-                                        v-for="(item, index) in responsibilityList" :key="index">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
                             <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
                                 胡小小
                             </el-form-item>
-                            <el-form-item label="作业申请时间：" :label-width="formLabelWidthDetail">
-                                2024-05-14
-                            </el-form-item>
-                            <el-form-item label="受限空间内原有介质名称" :label-width="formLabelWidthDetail">
-                                西北角
-                            </el-form-item>
-                            <el-form-item label="受限空间名称：" :label-width="formLabelWidthDetail">
-                                特级
-                            </el-form-item>
-                            <el-form-item label="作业人：" :label-width="formLabelWidthDetail">
-                                张三
-                            </el-form-item>
-                            <el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
-                                王乐康
-                            </el-form-item>
-                            <el-form-item label="气体分析时间：" :label-width="formLabelWidthDetail">
-                                <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="daterange"
-                                    :picker-options="pickerOptions" range-separator="至" value-format="yyyy-MM-dd"
-                                    start-placeholder="开始日期" end-placeholder="结束日期">
-                                </el-date-picker>
-                            </el-form-item>
-                            <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
-                                16548955
-                            </el-form-item>
-                            <el-form-item label="代表性气体：" :label-width="formLabelWidthDetail">
-                                16548955
+                            <el-form-item label="涉及相关单位(部门)：" :label-width="formLabelWidthDetail">
+                                123
                             </el-form-item>
                             <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
-                                王乐康
+                                西北角
                             </el-form-item>
-                            <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
-                                王乐康
+                            <el-form-item label="断路原因：" :label-width="formLabelWidthDetail">
+                                特级
                             </el-form-item>
                             <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
+                                张三
+                            </el-form-item>
+                            <el-form-item label="安全作业票编号：" :label-width="formLabelWidthDetail">
+                                王乐康
+                            </el-form-item>
+                            <el-form-item label="断路地段示意图：" :label-width="formLabelWidthDetail">
+                                16548955
+                            </el-form-item>
+                            <el-form-item label="相关说明：" :label-width="formLabelWidthDetail">
+                                16548955
+                            </el-form-item>
+                            <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
                                 王乐康
                             </el-form-item>
                             <el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
@@ -350,9 +352,6 @@
                                     start-placeholder="开始日期" end-placeholder="结束日期">
                                 </el-date-picker>
                             </el-form-item>
-                            <el-form-item label="安全作业票编码" :label-width="formLabelWidthDetail">
-                                7984654
-                            </el-form-item>
                         </el-form>
                         <!-- <div v-if="COMPANY != 'longguang'" class="qr-box">
                                     <div id="qrCode" ref="qrCodeDiv"></div>
@@ -360,67 +359,6 @@
                                 </div> -->
                     </div>
                 </template>
-                <template v-slot:gasanalysis>
-                    <div>
-                        <el-form :model="detailData">
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="分析项目：" :label-width="formLabelWidthDetail">
-                                        受限空间
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="有毒有害气体名称" :label-width="formLabelWidthDetail">
-                                        一氧化碳
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="可燃气体名称：" :label-width="formLabelWidthDetail">
-                                        天然气
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="合格标准：" :label-width="formLabelWidthDetail">
-                                        100
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="氧气含氧量(19.5%~21%)：" :label-width="formLabelWidthDetail">
-                                        20%
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="取样分析时间：" :label-width="formLabelWidthDetail">
-                                        <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="date"
-                                            :picker-options="pickerOptions" value-format="yyyy-MM-dd">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="分析部位：" :label-width="formLabelWidthDetail">
-                                        顶部
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="分析人：" :label-width="formLabelWidthDetail">
-                                        刘大大
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="10">
-                                    <el-form-item label="分析数据：" :label-width="formLabelWidthDetail">
-
-                                        <el-input v-model="detailData.engineeringSurvey" :disabled="isDisabledDetail"
-                                            placeholder="一氧化碳/天然气/20%/2024-01-12/顶部/刘大大" autocomplete="off"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                        </el-form>
-                    </div>
-                </template>
             </detail>
             <editPlan :title="operateTitle" :editId="editId" @cancleSave="goBack" v-if="isUpdate"></editPlan>
         </div>
diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue
index 652830e7..70390778 100644
--- a/src/views/projectFront/specialWork/startBuildingWork.vue
+++ b/src/views/projectFront/specialWork/startBuildingWork.vue
@@ -34,22 +34,31 @@
                     @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="作业申请单位" show-overflow-tooltip>
+                    <el-table-column align="center" label="编号" show-overflow-tooltip>
+                        <!--  作业申请单位 -->
+                        <template slot-scope="scope">
+                            {{ scope.row.jobApplyForUnit }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" label="申请单位" show-overflow-tooltip>
                         <!--  作业申请单位 -->
                         <template slot-scope="scope">
                             {{ scope.row.jobApplyForUnit }}
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="作业申请时间" prop="jobTime"></el-table-column>
-                    <el-table-column align="center" label="受限空间名称" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="作业单位" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业地点" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业内容" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="监护人" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业负责人" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="关联的其他特殊作业" prop="jobName" width="150"></el-table-column>
+                    <el-table-column align="center" label="安全作业票编号" prop="jobName"></el-table-column>
+                    <el-table-column align="center" label="作业范围" prop="jobTypeName"></el-table-column>
                     <el-table-column align="center" label="作业内容" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="受限空间内原有介质名称" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="作业人" prop="jobName"></el-table-column>
-                    <el-table-column align="center" label="监护人" prop="jobName"></el-table-column>
-                    <el-table-column align="center" label="作业单位" prop="jobUnit"></el-table-column>
-                    <el-table-column align="center" label="作业负责人" prop="jobPrincipal"></el-table-column>
-
+                    <el-table-column align="center" label="作业方式" prop="jobUnit"></el-table-column>
+                    <el-table-column align="center" label="风险辨识结果" prop="jobPrincipal"></el-table-column>
+                    <el-table-column align="center" label="作业实施时间" prop="jobPrincipal"></el-table-column>
                     <!-- 操作 -->
                     <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')" width="120">
                         <template slot-scope="scope">
@@ -278,7 +287,26 @@
                 <template v-slot:basicinfo>
                     <div class="info-content">
                         <el-form class="form-box" :model="detailData">
-                            <el-form-item label="作业类型：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="编号：" :label-width="formLabelWidthDetail">
+                                受限空间名称
+                            </el-form-item>
+                            <el-form-item label="申请单位" :label-width="formLabelWidthDetail">
+                                <!-- <el-cascader
+                            :disabled="isDisabled"
+                            v-model="detailData.responsibilityCompanyId"
+                            placeholder="请选择责任分包单位"
+                            :options="options"
+                            :props="props"
+                            clearable
+                            >
+                            </el-cascader> -->
+                                <el-select v-model="detailData.responsibilityCompanyId" placeholder="请选择作业单位" disabled>
+                                    <el-option :label="item.enterpriseName" :value="item.id"
+                                        v-for="(item, index) in responsibilityList" :key="index">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="作业申请时间：" :label-width="formLabelWidthDetail">
                                 受限空间名称
                             </el-form-item>
                             <el-form-item label="作业单位" :label-width="formLabelWidthDetail">
@@ -297,62 +325,42 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="作业申请单位" :label-width="formLabelWidthDetail">
-                                <el-select v-model="detailData.responsibilityCompanyId" placeholder="请选择作业申请单位"
-                                    disabled>
-                                    <el-option :label="item.enterpriseName" :value="item.id"
-                                        v-for="(item, index) in responsibilityList" :key="index">
-                                    </el-option>
-                                </el-select>
+                            <el-form-item label="作业地点：" :label-width="formLabelWidthDetail">
+                                受限空间名称
+                            </el-form-item>
+                            <el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
+                                受限空间名称
+                            </el-form-item>
+                            <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
+                                受限空间名称
                             </el-form-item>
                             <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
                                 胡小小
                             </el-form-item>
-                            <el-form-item label="作业申请时间：" :label-width="formLabelWidthDetail">
-                                2024-05-14
-                            </el-form-item>
-                            <el-form-item label="受限空间内原有介质名称" :label-width="formLabelWidthDetail">
-                                西北角
-                            </el-form-item>
-                            <el-form-item label="受限空间名称：" :label-width="formLabelWidthDetail">
-                                特级
-                            </el-form-item>
-                            <el-form-item label="作业人：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
                                 张三
                             </el-form-item>
+                            <el-form-item label="安全作业票编号：" :label-width="formLabelWidthDetail">
+                                王乐康
+                            </el-form-item>
+                            <el-form-item label="作业范围：" :label-width="formLabelWidthDetail">
+                                123
+                            </el-form-item>
                             <el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
-                                王乐康
+                                西北角
                             </el-form-item>
-                            <el-form-item label="气体分析时间：" :label-width="formLabelWidthDetail">
-                                <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="daterange"
-                                    :picker-options="pickerOptions" range-separator="至" value-format="yyyy-MM-dd"
-                                    start-placeholder="开始日期" end-placeholder="结束日期">
-                                </el-date-picker>
-                            </el-form-item>
-                            <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
-                                16548955
-                            </el-form-item>
-                            <el-form-item label="代表性气体：" :label-width="formLabelWidthDetail">
-                                16548955
-                            </el-form-item>
-                            <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
-                                王乐康
+                            <el-form-item label="作业方式：" :label-width="formLabelWidthDetail">
+                                特级
                             </el-form-item>
                             <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
                                 王乐康
                             </el-form-item>
-                            <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
-                                王乐康
-                            </el-form-item>
                             <el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
                                 <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="daterange"
                                     :picker-options="pickerOptions" range-separator="至" value-format="yyyy-MM-dd"
                                     start-placeholder="开始日期" end-placeholder="结束日期">
                                 </el-date-picker>
                             </el-form-item>
-                            <el-form-item label="安全作业票编码" :label-width="formLabelWidthDetail">
-                                7984654
-                            </el-form-item>
                         </el-form>
                         <!-- <div v-if="COMPANY != 'longguang'" class="qr-box">
                                     <div id="qrCode" ref="qrCodeDiv"></div>
@@ -360,67 +368,6 @@
                                 </div> -->
                     </div>
                 </template>
-                <template v-slot:gasanalysis>
-                    <div>
-                        <el-form :model="detailData">
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="分析项目：" :label-width="formLabelWidthDetail">
-                                        受限空间
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="有毒有害气体名称" :label-width="formLabelWidthDetail">
-                                        一氧化碳
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="可燃气体名称：" :label-width="formLabelWidthDetail">
-                                        天然气
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="合格标准：" :label-width="formLabelWidthDetail">
-                                        100
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="氧气含氧量(19.5%~21%)：" :label-width="formLabelWidthDetail">
-                                        20%
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="取样分析时间：" :label-width="formLabelWidthDetail">
-                                        <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="date"
-                                            :picker-options="pickerOptions" value-format="yyyy-MM-dd">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="分析部位：" :label-width="formLabelWidthDetail">
-                                        顶部
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="分析人：" :label-width="formLabelWidthDetail">
-                                        刘大大
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="10">
-                                    <el-form-item label="分析数据：" :label-width="formLabelWidthDetail">
-
-                                        <el-input v-model="detailData.engineeringSurvey" :disabled="isDisabledDetail"
-                                            placeholder="一氧化碳/天然气/20%/2024-01-12/顶部/刘大大" autocomplete="off"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                        </el-form>
-                    </div>
-                </template>
             </detail>
             <editPlan :title="operateTitle" :editId="editId" @cancleSave="goBack" v-if="isUpdate"></editPlan>
         </div>
diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue
index 652830e7..babaa133 100644
--- a/src/views/projectFront/specialWork/temporaryPowerWork.vue
+++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue
@@ -34,22 +34,38 @@
                     @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="作业申请单位" show-overflow-tooltip>
+                    <el-table-column align="center" label="编号" show-overflow-tooltip>
+                        <!--  作业申请单位 -->
+                        <template slot-scope="scope">
+                            {{ scope.row.jobApplyForUnit }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" label="申请单位" show-overflow-tooltip>
                         <!--  作业申请单位 -->
                         <template slot-scope="scope">
                             {{ scope.row.jobApplyForUnit }}
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="作业申请时间" prop="jobTime"></el-table-column>
-                    <el-table-column align="center" label="受限空间名称" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="作业地点" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业内容" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="电源接入点" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="许可用电功率" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="工作电压" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="用电设备名称" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="额定功率" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="监护人" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="用电人" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业人" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="电工证号" prop="jobTime"></el-table-column>
+                    <el-table-column align="center" label="作业负责人" prop="jobTypeName"></el-table-column>
+                    <el-table-column align="center" label="关联的其他特殊作业" prop="jobName" width="150"></el-table-column>
+                    <el-table-column align="center" label="安全作业票编号" prop="jobName"></el-table-column>
+                    <el-table-column align="center" label="风险辨识结果" prop="jobPrincipal"></el-table-column>
+                    <el-table-column align="center" label="作业范围" prop="jobTypeName"></el-table-column>
                     <el-table-column align="center" label="作业内容" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="受限空间内原有介质名称" prop="jobTypeName"></el-table-column>
-                    <el-table-column align="center" label="作业人" prop="jobName"></el-table-column>
-                    <el-table-column align="center" label="监护人" prop="jobName"></el-table-column>
-                    <el-table-column align="center" label="作业单位" prop="jobUnit"></el-table-column>
-                    <el-table-column align="center" label="作业负责人" prop="jobPrincipal"></el-table-column>
-
+                    <el-table-column align="center" label="作业方式" prop="jobUnit"></el-table-column>
+                    <el-table-column align="center" label="作业实施时间" prop="jobPrincipal"></el-table-column>
                     <!-- 操作 -->
                     <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')" width="120">
                         <template slot-scope="scope">
@@ -278,10 +294,10 @@
                 <template v-slot:basicinfo>
                     <div class="info-content">
                         <el-form class="form-box" :model="detailData">
-                            <el-form-item label="作业类型：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="编号：" :label-width="formLabelWidthDetail">
                                 受限空间名称
                             </el-form-item>
-                            <el-form-item label="作业单位" :label-width="formLabelWidthDetail">
+                            <el-form-item label="申请单位" :label-width="formLabelWidthDetail">
                                 <!-- <el-cascader
                             :disabled="isDisabled"
                             v-model="detailData.responsibilityCompanyId"
@@ -297,7 +313,10 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="作业申请单位" :label-width="formLabelWidthDetail">
+                            <el-form-item label="作业申请时间：" :label-width="formLabelWidthDetail">
+                                2024-05-14
+                            </el-form-item>
+                            <el-form-item label="作业地点：" :label-width="formLabelWidthDetail">
                                 <el-select v-model="detailData.responsibilityCompanyId" placeholder="请选择作业申请单位"
                                     disabled>
                                     <el-option :label="item.enterpriseName" :value="item.id"
@@ -305,54 +324,54 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
+                            <el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
+                                王乐康
+                            </el-form-item>
                             <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
                                 胡小小
                             </el-form-item>
-                            <el-form-item label="作业申请时间：" :label-width="formLabelWidthDetail">
-                                2024-05-14
+                            <el-form-item label="电源接入点：" :label-width="formLabelWidthDetail">
+                                胡小小
                             </el-form-item>
-                            <el-form-item label="受限空间内原有介质名称" :label-width="formLabelWidthDetail">
-                                西北角
+                            <el-form-item label="许可用电功率：" :label-width="formLabelWidthDetail">
+                                胡小小
                             </el-form-item>
-                            <el-form-item label="受限空间名称：" :label-width="formLabelWidthDetail">
-                                特级
+                            <el-form-item label="工作电压：" :label-width="formLabelWidthDetail">
+                                胡小小
+                            </el-form-item>
+                            <el-form-item label="用电设备名称：" :label-width="formLabelWidthDetail">
+                                胡小小
+                            </el-form-item>
+                            <el-form-item label="额定功率：" :label-width="formLabelWidthDetail">
+                                胡小小
+                            </el-form-item>
+                            <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
+                                胡小小
+                            </el-form-item>
+                            <el-form-item label="用电人：" :label-width="formLabelWidthDetail">
+                                胡小小
                             </el-form-item>
                             <el-form-item label="作业人：" :label-width="formLabelWidthDetail">
                                 张三
                             </el-form-item>
-                            <el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
-                                王乐康
-                            </el-form-item>
-                            <el-form-item label="气体分析时间：" :label-width="formLabelWidthDetail">
-                                <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="daterange"
-                                    :picker-options="pickerOptions" range-separator="至" value-format="yyyy-MM-dd"
-                                    start-placeholder="开始日期" end-placeholder="结束日期">
-                                </el-date-picker>
-                            </el-form-item>
-                            <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
-                                16548955
-                            </el-form-item>
-                            <el-form-item label="代表性气体：" :label-width="formLabelWidthDetail">
-                                16548955
-                            </el-form-item>
-                            <el-form-item label="监护人：" :label-width="formLabelWidthDetail">
-                                王乐康
-                            </el-form-item>
-                            <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
-                                王乐康
+                            <el-form-item label="电工证号：" :label-width="formLabelWidthDetail">
+                                张三
                             </el-form-item>
                             <el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
                                 王乐康
                             </el-form-item>
+                            <el-form-item label="安全作业票编码" :label-width="formLabelWidthDetail">
+                                7984654
+                            </el-form-item>
+                            <el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
+                                王乐康
+                            </el-form-item>
                             <el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
                                 <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="daterange"
                                     :picker-options="pickerOptions" range-separator="至" value-format="yyyy-MM-dd"
                                     start-placeholder="开始日期" end-placeholder="结束日期">
                                 </el-date-picker>
                             </el-form-item>
-                            <el-form-item label="安全作业票编码" :label-width="formLabelWidthDetail">
-                                7984654
-                            </el-form-item>
                         </el-form>
                         <!-- <div v-if="COMPANY != 'longguang'" class="qr-box">
                                     <div id="qrCode" ref="qrCodeDiv"></div>
@@ -365,56 +384,30 @@
                         <el-form :model="detailData">
                             <el-row>
                                 <el-col :span="8">
-                                    <el-form-item label="分析项目：" :label-width="formLabelWidthDetail">
+                                    <el-form-item label="分析时间：" :label-width="formLabelWidthDetail">
                                         受限空间
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="8">
-                                    <el-form-item label="有毒有害气体名称" :label-width="formLabelWidthDetail">
+                                    <el-form-item label="分析点：" :label-width="formLabelWidthDetail">
                                         一氧化碳
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="8">
-                                    <el-form-item label="可燃气体名称：" :label-width="formLabelWidthDetail">
+                                    <el-form-item label="可燃气体检测结果：" :label-width="formLabelWidthDetail">
                                         天然气
                                     </el-form-item>
                                 </el-col>
                             </el-row>
                             <el-row>
                                 <el-col :span="8">
-                                    <el-form-item label="合格标准：" :label-width="formLabelWidthDetail">
-                                        100
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="氧气含氧量(19.5%~21%)：" :label-width="formLabelWidthDetail">
-                                        20%
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="取样分析时间：" :label-width="formLabelWidthDetail">
-                                        <el-date-picker :disabled="isDisabledDetail" v-model="planDate" type="date"
-                                            :picker-options="pickerOptions" value-format="yyyy-MM-dd">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="分析部位：" :label-width="formLabelWidthDetail">
-                                        顶部
+                                    <el-form-item label="可燃气体检测结果：" :label-width="formLabelWidthDetail">
+                                        天然气
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="8">
                                     <el-form-item label="分析人：" :label-width="formLabelWidthDetail">
-                                        刘大大
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="10">
-                                    <el-form-item label="分析数据：" :label-width="formLabelWidthDetail">
-
-                                        <el-input v-model="detailData.engineeringSurvey" :disabled="isDisabledDetail"
-                                            placeholder="一氧化碳/天然气/20%/2024-01-12/顶部/刘大大" autocomplete="off"></el-input>
+                                        100
                                     </el-form-item>
                                 </el-col>
                             </el-row>