diff --git a/src/views/dangerousWork/limitspace/components/corpInfo.vue b/src/views/dangerousWork/limitspace/components/corpInfo.vue
index 66c7651..112ca76 100644
--- a/src/views/dangerousWork/limitspace/components/corpInfo.vue
+++ b/src/views/dangerousWork/limitspace/components/corpInfo.vue
@@ -108,7 +108,7 @@ export default {
       return new Promise((resolve) => {
         this.listLoading = true
         requestFN(
-          '/gfLimitSpace/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          '/gfConfinedSpace/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
           {
             COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
             KEYWORDS: this.KEYWORDS
diff --git a/src/views/dangerousWork/limitspace/components/detail.vue b/src/views/dangerousWork/limitspace/components/detail.vue
index d253af5..eb287ab 100644
--- a/src/views/dangerousWork/limitspace/components/detail.vue
+++ b/src/views/dangerousWork/limitspace/components/detail.vue
@@ -5,65 +5,112 @@
       <table class="table-ui">
         <thead>
         <tr>
-          <td colspan="6" style="border: none">
+          <td colspan="10" style="border: none">
             <div class="level-title mt-20">
-              <h1>断路安全作业票</h1>
-              <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
+              <h1>受限空间安全作业票</h1>
+              <div class="level-code">编号:{{ pd.CHECK_NO }}</div>
             </div>
           </td>
         </tr>
         </thead>
         <tr>
-          <td class="bbg">申请单位</td>
-          <td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
-          <td class="bbg">作业单位</td>
-          <td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
-          <td class="bbg">作业负责人</td>
-          <td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
+          <td class="bbg">作业申请单位</td>
+          <td colspan="5">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
+          <td class="bbg">作业申请时间</td>
+          <td colspan="3">{{ pd.CREATTIME }}</td>
         </tr>
         <tr>
-          <td class="bbg">涉及相关单位（部门）</td>
-          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">受限空间名称</td>
+          <td colspan="5">{{ pd.LIMITSPACE_NAME }}</td>
+          <td class="bbg">受限空间内原有介质名称</td>
+          <td colspan="3">{{ pd.MEDIUM_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业内容</td>
+          <td colspan="5">{{ pd.WORK_CONTENT }}</td>
+          <td class="bbg">受限空间所属单位</td>
+          <td colspan="3">{{ pd.BELONG_CORP }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业单位</td>
+          <td colspan="5">{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
+          <td class="bbg">作业负责人</td>
+          <td colspan="3">{{ pd.CONFIRM_USER_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业人</td>
+          <td colspan="5">{{ pd.WORK_USER }}</td>
           <td class="bbg">监护人</td>
-          <td>
+          <td colspan="5">
             <div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
               <span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
             </div>
           </td>
-        </tr>
-        <tr>
-          <td class="bbg">断路原因</td>
-          <td colspan="5">{{ pd.WORK_REASON }}</td>
+          <!--          <td colspan="3">{{ pd.GUARDIAN_USER }}</td>-->
+
+          <!--        <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">-->
+          <!--          <td colspan="10">-->
+          <!--            <div>监护人：{{ pd.CONFIRM_CONTENT }}</div>-->
+          <!--            <div style="text-align: right">-->
+          <!--              <span>签字：</span>-->
+          <!--              <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">-->
+          <!--              <span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>-->
+          <!--            </div>-->
+          <!--          </td>-->
+          <!--        </tr>-->
+
         </tr>
         <tr>
           <td class="bbg">关联的其他特殊作业及安全作业票编号</td>
-          <td colspan="5">{{ pd.SPECIAL_WORK }}</td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
-            <div style="display: flex;justify-content: space-between;margin-top: 20px;">
-              <img v-viewer :src="config.fileUrl + pd.CONTENT_IMG_PATH" alt="" width="100" height="100">
-              <div>
-                编制人：
-                <img v-viewer :src="config.fileUrl + pd.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
-                {{ pd.APPLY_USER_SIGNER_TIME }}
-              </div>
-            </div>
-          </td>
+          <td colspan="9">{{ pd.SPECIAL_WORK }}</td>
         </tr>
         <tr>
           <td class="bbg">风险辨识结果</td>
-          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+          <td colspan="9">{{ pd.RISK_IDENTIFICATION }}</td>
+        </tr>
+        <tr>
+          <td :rowspan="3 + gasList.length" class="bbg">气体分析</td>
+          <td class="bbg" rowspan="2">分析项目</td>
+          <td class="bbg" colspan="2">有毒有害气体名称</td>
+          <td class="bbg" colspan="2">可燃气体名称</td>
+          <td class="bbg" rowspan="2">氧气含量</td>
+          <td class="bbg" rowspan="3">取样分析时间</td>
+          <td class="bbg" rowspan="3">分析部位</td>
+          <td class="bbg" rowspan="3">分析人</td>
+        </tr>
+        <tr>
+          <td :style="{padding:gas.GAS_NAME1 ? '8px' : '16px'}">{{ gas.GAS_NAME1 }}</td>
+          <td :style="{padding:gas.GAS_NAME2 ? '8px' : '16px'}">{{ gas.GAS_NAME2 }}</td>
+          <td :style="{padding:gas.GAS_NAME3 ? '8px' : '16px'}">{{ gas.GAS_NAME3 }}</td>
+          <td :style="{padding:gas.GAS_NAME4 ? '8px' : '16px'}">{{ gas.GAS_NAME4 }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">合格标准</td>
+          <td>{{ gas.GAS_STANDARD1 }}</td>
+          <td>{{ gas.GAS_STANDARD2 }}</td>
+          <td>{{ gas.GAS_STANDARD3 }}</td>
+          <td>{{ gas.GAS_STANDARD4 }}</td>
+          <td>19.5% 〜21%（体积分数）</td>
+        </tr>
+        <tr v-for="(item,index) in gasList" :key="index">
+          <td v-if="index === 0" :rowspan="gasList.length" class="bbg">分析数据</td>
+          <td><span v-if="gas.GAS_NAME1">{{ item.DATA1 }}</span></td>
+          <td><span v-if="gas.GAS_NAME2">{{ item.DATA2 }}</span></td>
+          <td><span v-if="gas.GAS_NAME3">{{ item.DATA3 }}</span></td>
+          <td><span v-if="gas.GAS_NAME4">{{ item.DATA4 }}</span></td>
+          <td>{{ item.OXYGEN_CONTENT }}</td>
+          <td>{{ item.ANALYZE_TIME }}</td>
+          <td>{{ item.ANALYZE_PLACE }}</td>
+          <td>{{ item.ANALYZE_USER }}</td>
         </tr>
         <tr>
           <td class="bbg">作业实施时间</td>
-          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+          <td colspan="9">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
         <tr>
-          <td colspan="6">
+          <td colspan="10">
             <table class="table-ui">
               <tr>
                 <td>序号</td>
@@ -73,7 +120,12 @@
               </tr>
               <tr v-for="(item,index) in measuresList" :key="index">
                 <td>{{ index + 1 }}</td>
-                <td>{{ item.PROTECTIVE_MEASURES }}</td>
+                <td>
+                  {{ item.PROTECTIVE_MEASURES }}
+                  <span v-if="item.QUESTION1">{{ item.QUESTION1 }}:{{ item.ANSWER1? item.ANSWER1 : 0 }}</span>
+                  <span v-if="item.QUESTION2">{{ item.QUESTION2 }}:{{ item.ANSWER2? item.ANSWER2 : 0 }}</span>
+                  <span v-if="item.QUESTION3">{{ item.QUESTION3 }}:{{ item.ANSWER3? item.ANSWER3 : 0 }}</span>
+                </td>
                 <td>
                   <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
                   <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
@@ -82,28 +134,16 @@
                   {{ item.CONFIRM_NAME }}
                 </td>
               </tr>
-              <tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES ">
-                <td>{{ measuresList.length + 1 }}</td>
+              <tr v-if="pd.CONFIRM_USER_MEASURES || pd.APPROVE_USER_MEASURES" >
+                <td >{{ measuresList.length + 1 }}</td>
                 <td colspan="3">
-                  <div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
-                    <span>其他安全措施：{{ pd.APPLY_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.APPLY_USER_NAME }}</span>
+                  <div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
+                    <span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
                   </div>
-                  <div v-if="pd.CONSTRUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
-                  </div>
-                  <div v-if="pd.PRODUCTION_USER_ID && pd.PRODUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.PRODUCTION_USER_NAME }}</span>
-                  </div>
-                  <div v-if="pd.SAFETY_USER_ID && pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.SAFETY_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.SAFETY_USER_NAME }}</span>
-                  </div>
-                  <div v-if="pd.LEADER_USER_ID && pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.LEADER_USER_NAME }}</span>
+                  <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;">
+                    <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
                   </div>
                 </td>
               </tr>
@@ -130,43 +170,23 @@
             </div>
           </td>
         </tr>
-        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
+        <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
+          <td colspan="10">
+            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.CONSTRUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
-        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>所在单位意见：{{ pd.PRODUCTION_CONTENT }}</div>
+        <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
+          <td colspan="10">
+            <div>所在单位意见：{{ pd.APPROVE_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.PRODUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="pd.SAFETY_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
-            <div style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.SAFETY_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.SAFETY_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="pd.LEADER_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>审批部门意见：{{ pd.LEADER_CONTENT }}</div>
-            <div style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.LEADER_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
@@ -181,10 +201,10 @@
           </td>
         </tr>
       </table>
-    </div>
-    <div style="padding-top: 100px"/>
-    <div class="ui-foot">
-      <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
+      <div style="padding-top: 100px"/>
+      <div class="ui-foot">
+        <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -196,13 +216,14 @@ export default {
   data() {
     return {
       config: config,
-      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      CONFINEDSPACE_ID: this.$parent.CONFINEDSPACE_ID, // 主键ID
       pd: [], // 存放字段参数
       measuresList: [],
-      otherProtectiveMeasures: [],
+      gasList: [],
+      gas: {},
       imgList: [],
       imgList1: [],
-      hazardIdentification: []
+      otherProtectiveMeasures: []
     }
   },
   created() {
@@ -228,32 +249,56 @@ export default {
       }
     },
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.CONFINEDSPACE_ID
     },
     getData() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/goEdit',
+        '/gfConfinedSpace/goEdit',
         {
-          CUTROAD_ID: this.CUTROAD_ID
+          CONFINEDSPACE_ID: this.CONFINEDSPACE_ID
         }
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
-        this.measuresList = data.measuresList // 参数map
+        for (let i = 0; i < data.measuresList.length; i++) {
+          // 将字符串转成数组
+          const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
+          for (let j = 1; j <= 3; j++) {
+            // 判断字符串是否存在
+            if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
+              // 给字符串后面添加上需要的数据
+              PROTECTIVE_MEASURES.splice(
+                this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
+                0,
+                data.measuresList[i]['ANSWER' + j]
+              )
+            }
+          }
+          // 将数组转回字符串
+          data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
+        }
         this.imgList = data.imgList
-        this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
-        this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
-        this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
-        this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
-        this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
+        this.imgList1 = data.imgList
+        this.measuresList = data.measuresList // 参数map
+        this.gasList = data.gasList // 参数map
+        this.gas = data.gas || {} // 参数map
+        this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
+        this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
       }).catch((e) => {
         this.listLoading = false
       })
     },
+    // 查找字符串第几次出现的位置
+    findCharIndex(str, char, num) {
+      let index = str.indexOf(char)
+      for (let i = 0; i < num - 1; i++) {
+        index = str.indexOf(char, index + 1)
+      }
+      return index
+    },
     goBack() {
-      this.$parent.activeName = 'circuit_list'
-      this.$parent.CUTROAD_ID = ''
+      this.$parent.activeName = 'LimitSpace'
     }
 
   }
@@ -265,8 +310,7 @@ export default {
   padding: 20px 0
   span
     vertical-align: middle
-.bbg
-  width: 270px
+
 .print-approval-img
   width: 200px
   height: 97px
diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue
index 6241d41..a0c0e57 100644
--- a/src/views/dangerousWork/limitspace/components/list.vue
+++ b/src/views/dangerousWork/limitspace/components/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form label-width="50px">
+    <el-form label-width="60px">
       <el-row>
         <el-col :span="4">
           <el-form-item label="编号">
@@ -9,17 +9,17 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label="状态">
-            <el-select v-model="STATUS" clearable placeholder="请选择" style="width: 100%;">
+            <el-select v-model="APPLYSTATUS" clearable placeholder="请选择" style="width: 100%;">
               <el-option v-for="item in statusList" :key="item.ID" :label="item.NAME" :value="item.ID" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label-width="10px">
-            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+            <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">
               搜索
             </el-button>
-            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+            <el-button v-waves type="success" icon="el-icon-refresh" @click="goKeyReset">
               重置
             </el-button>
           </el-form-item>
@@ -27,58 +27,48 @@
       </el-row>
     </el-form>
     <el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-      <el-table-column :reserve-selection="true" type="selection" width="57" align="center" />
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
-      <el-table-column prop="APPLY_USER_NAME" label="填写人" />
-      <el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip />
-      <el-table-column prop="PRODUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
-        <template slot-scope="{row}">
-          {{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
-        <template slot-scope="{row}">
-          {{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
-        <template slot-scope="{row}">
-          {{ row.LEADER_USER_NAME || ' 已跳过' }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
+      <el-table-column prop="APPLY_USER_NAME" label="申请人" />
+      <el-table-column prop="ANALYZE_USER_NAME" label="分析人" />
+      <el-table-column prop="CONFIRM_USER_NAME" label="作业负责人" />
+      <el-table-column prop="APPROVE_USER_NAME" label="所在单位负责人" />
+      <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" />
       <el-table-column prop="STATUS" label="审核状态">
         <template slot-scope="{row}">
-          <span v-if="row.APPLY_STATUS==0">断路安全作业待提交</span>
+          <span v-if="row.APPLY_STATUS==0">受限空间作业待提交</span>
           <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
-          <span v-else-if="row.APPLY_STATUS==2">所在单位待审核</span>
-          <span v-else-if="row.APPLY_STATUS==3">消防、安全管理部门待审核</span>
-          <span v-else-if="row.APPLY_STATUS==4">审批部门待审核</span>
+          <span v-else-if="row.APPLY_STATUS==4">所在单位待审核</span>
           <span v-else-if="row.APPLY_STATUS==5">待验收</span>
           <span v-else-if="row.APPLY_STATUS==6">验收归档</span>
-          <span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
-          <span v-else-if="row.APPLY_STATUS==-3">所在单位审核打回</span>
-          <span v-else-if="row.APPLY_STATUS==-4">消防、安全管理部门审核打回</span>
-          <span v-else-if="row.APPLY_STATUS==-5">审批部门审核打回</span>
+          <span v-else-if="row.APPLY_STATUS==-4">作业负责人审核打回</span>
+          <span v-else-if="row.APPLY_STATUS==-5">所在单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
+          <span v-else-if="row.APPLY_STATUS==-99">已作废(监护人未签字)</span>
+          <span v-else-if="row.APPLY_STATUS==-98">已作废(未进行气体检测)</span>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" align="center" width="230">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
-          <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CUTROAD_ID)">审批表详情</el-button>
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CONFINEDSPACE_ID)">审批表详情</el-button>
         </template>
       </el-table-column>
+
     </el-table>
     <div class="page-btn-group">
       <div>
+        <!--  <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>-->
+        <!--        <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
-    <el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1400px">
-      <el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
-        <el-step title="断路安全作业提交">
+
+    <el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1000px">
+      <el-steps :active="getStatus()" :process-status="getProcessStatus()" align-center finish-status="success" >
+        <el-step title="受限空间作业提交">
           <template slot="description">
             <div>{{ getProcessMessage().title }}</div>
             <div>{{ getProcessMessage().USER_NAME }}</div>
@@ -87,38 +77,23 @@
         </el-step>
         <el-step title="作业负责人意见">
           <template slot="description">
-            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
-            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+            <div>{{ pd.CONFIRM_USER_NAME }}</div>
+            <div>{{ pd.CONFIRM_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
-        <el-step title="所在单位意见">
+        <el-step description="" title="所在单位意见">
           <template slot="description">
-            <div v-if="getIsPase('PRODUCTION_USER_NAME')">{{ '已跳过' }}</div>
-            <div v-else>{{ pd.PRODUCTION_USER_NAME }}</div>
-            <div>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</div>
+            <div>{{ pd.APPROVE_USER_NAME }}</div>
+            <div>{{ pd.APPROVE_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
-        <el-step title="消防、安全管理部门意见" >
-          <template slot="description">
-            <div v-if="getIsPase('SAFETY_DEPARTMENT_NAME')">{{ '已跳过' }}</div>
-            <div v-else>{{ pd.SAFETY_USER_NAME }}</div>
-            <div>{{ pd.SAFETY_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-        <el-step title="审批部门意见" >
-          <template slot="description">
-            <div v-if="getIsPase('LEADER_USER_NAME')">{{ '已跳过' }}</div>
-            <div v-else>{{ pd.LEADER_USER_NAME }}</div>
-            <div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-        <el-step title="完成验收" description="">
+        <el-step title="完成验收">
           <template slot="description">
             <div>{{ pd.ACCEPT_USER_NAME }}</div>
             <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
-        <el-step title="验收归档" description="">
+        <el-step title="验收归档">
           <template slot="description">
             <div>{{ pd.ACCEPT_USER_NAME }}</div>
             <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
@@ -157,6 +132,7 @@
           </div>
         </div>
       </div>
+
       <div slot="footer" class="dialog-footer">
         <!--        <el-button @click="dialogFormShow = false">取 消</el-button>-->
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
@@ -187,6 +163,7 @@ export default {
       },
       total: 0,
       KEYWORDS: '',
+      APPLYSTATUS: '',
       varList: [],
       pd: [],
 
@@ -204,18 +181,16 @@ export default {
       dialogFormHuifuShow: false,
       statusList: [
         { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '0', NAME: '受限空间作业待提交' },
         { ID: '1', NAME: '作业负责人待审核' },
-        { ID: '2', NAME: '所在单位待审核' },
-        { ID: '3', NAME: '消防、安全管理部门待审核' },
-        { ID: '4', NAME: '审批部门待审核' },
+        { ID: '4', NAME: '所在单位待审核' },
         { ID: '5', NAME: '待验收' },
         { ID: '6', NAME: '验收归档' },
-        { ID: '-2', NAME: '作业负责人审核打回' },
-        { ID: '-3', NAME: '所在单位审核打回' },
-        { ID: '-4', NAME: '消防、安全管理部门审核打回' },
-        { ID: '-5', NAME: '审批部门审核打回' },
-        { ID: '-6', NAME: '验收打回' }
+        { ID: '-4', NAME: '作业负责人审核打回' },
+        { ID: '-5', NAME: '所在单位审核打回' },
+        { ID: '-6', NAME: '验收打回' },
+        { ID: '-99', NAME: '已作废(监护人未签字)' },
+        { ID: '-98', NAME: '已作废(未进行气体检测)' }
       ],
       STATUS: '',
       DEPTIDS: ''
@@ -226,7 +201,7 @@ export default {
   },
   methods: {
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.CONFINEDSPACE_ID
     },
     // 搜索
     getQuery() {
@@ -235,19 +210,19 @@ export default {
     },
     goKeyReset() {
       this.KEYWORDS = ''
-      this.STATUS = ''
+      this.APPLYSTATUS = ''
       this.getQuery()
     },
     // 获取列表
     getList() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/gfConfinedSpace/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.APPLYSTATUS,
           DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
           CORPINFO_ID: this.$parent.CORPINFO_ID,
-          ticketType: this.$parent.ticketType
+          ticketType : this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -257,6 +232,7 @@ export default {
         this.listLoading = false
       })
     },
+
     goChart(row) {
       this.pd = row
       this.dialogFormShow = true
@@ -268,20 +244,14 @@ export default {
       if (this.pd.APPLY_STATUS == '1') {
         return 1
       }
-      if (this.pd.APPLY_STATUS == '2') {
+      if (this.pd.APPLY_STATUS == '4') {
         return 2
       }
-      if (this.pd.APPLY_STATUS == '3') {
+      if (this.pd.APPLY_STATUS == '5') {
         return 3
       }
-      if (this.pd.APPLY_STATUS == '4') {
-        return 4
-      }
-      if (this.pd.APPLY_STATUS == '5') {
-        return 5
-      }
       if (this.pd.APPLY_STATUS == '6') {
-        return 7
+        return 5
       }
     },
     getProcessStatus() {
@@ -291,6 +261,11 @@ export default {
         return 'process'
       }
     },
+    getUserMessage(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
     getProcessMessage() {
       let obj = {}
       if (this.pd.APPLY_STATUS >= '0') {
@@ -300,31 +275,17 @@ export default {
           OPERATTIME: this.pd.CREATTIME
         }
       }
-      if (this.pd.APPLY_STATUS == '-2') {
-        obj = {
-          title: '作业负责人审核打回',
-          USER_NAME: this.pd.CONSTRUCTION_USER_NAME,
-          OPERATTIME: this.pd.OPERATTIME
-        }
-      }
-      if (this.pd.APPLY_STATUS == '-3') {
-        obj = {
-          title: '所在单位审核打回',
-          USER_NAME: this.pd.PRODUCTION_USER_NAME,
-          OPERATTIME: this.pd.OPERATTIME
-        }
-      }
       if (this.pd.APPLY_STATUS == '-4') {
         obj = {
-          title: '消防、安全管理部门审核打回',
-          USER_NAME: this.pd.SAFETY_USER_NAME,
+          title: '作业负责人审核打回',
+          USER_NAME: this.pd.CONFIRM_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-5') {
         obj = {
-          title: '审批部门审核打回',
-          USER_NAME: this.pd.LEADER_USER_NAME,
+          title: '所在单位审核打回',
+          USER_NAME: this.pd.APPROVE_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
@@ -335,23 +296,28 @@ export default {
           OPERATTIME: this.pd.OPERATTIME
         }
       }
+      if (this.pd.APPLY_STATUS == '-99') {
+        obj = {
+          title: '已作废(监护人未签字)',
+          AUSER_NAME: '',
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-98') {
+        obj = {
+          title: '已作废(未进行气体检测)',
+          AUSER_NAME: '',
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
       return obj
     },
-    getIsPase(col) {
-      if (!this.pd[col]) {
-        return '已跳过'
-      }
+    goDetail(id) {
+      this.$parent.activeName = 'Detail'
+      this.$parent.CONFINEDSPACE_ID = id
     },
     goBack(){
       this.$parent.activeName = 'CorpInfo'
-      this.$parent.CORPINFO_ID = ''
-      this.$parent.ticketType = ''
-      this.$parent.CUTROAD_ID =''
-    },
-    goDetail(id) {
-      console.info(id)
-      this.$parent.activeName = 'Detail'
-      this.$parent.CUTROAD_ID = id
     }
   }
 }
diff --git a/src/views/dangerousWork/limitspace/index.vue b/src/views/dangerousWork/limitspace/index.vue
index d450b83..96ba423 100644
--- a/src/views/dangerousWork/limitspace/index.vue
+++ b/src/views/dangerousWork/limitspace/index.vue
@@ -1,22 +1,22 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-show="activeName=='LimitSpace'"/>
+    <LimitSpace v-if="activeName=='LimitSpace'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
 <script>
 import CorpInfo from './components/corpInfo'
-import circuitList from './components/list'
+import LimitSpace from './components/list'
 import Detail from './components/detail'
 export default {
-  components: { CorpInfo, circuitList,Detail },
+  components: { CorpInfo, LimitSpace,Detail },
   data() {
     return {
       activeName: 'CorpInfo',
       CORPINFO_ID: '',
       ticketType: '',
-      CUTROAD_ID: ''
+      CONFINEDSPACE_ID: ''
     }
   }
 }