From c36533a16a10293bcf0fda5378c388f7b44cf2ce Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 7 Jun 2024 10:08:05 +0800
Subject: [PATCH 01/53] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=AB=AF=E5=BC=80=E7=8F=AD=E6=96=B0=E5=A2=9E=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/initClass.vue     | 106 +++++++++++++++---
 1 file changed, 93 insertions(+), 13 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/initClass.vue b/src/views/classMessage/classMessage/components/initClass.vue
index d58ac9f..2e601d1 100644
--- a/src/views/classMessage/classMessage/components/initClass.vue
+++ b/src/views/classMessage/classMessage/components/initClass.vue
@@ -1,5 +1,12 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="visible" :title="title" :before-close="close" width="90%" top="50px">
+  <el-dialog
+    v-loading="loading"
+    :visible.sync="visible"
+    :title="title"
+    :fullscreen="fullscreenFlag"
+    :before-close="close"
+    width="90%"
+    top="50px">
     <el-row>
       <el-col :span="18">
         <el-form ref="form" :rules="rules" :model="form" label-width="110px">
@@ -52,7 +59,12 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="班级容量" prop="CLASS_SIZE">
-                <el-select v-model="form.CLASS_SIZE" :disabled="isShow" placeholder="请选择" style="width:  100%" @change="changePeopleList">
+                <el-select
+                  v-model="form.CLASS_SIZE"
+                  :disabled="isShow"
+                  placeholder="请选择"
+                  style="width:  100%"
+                  @change="changePeopleList">
                   <el-option
                     v-for="item in warehouse.classSizeList"
                     :key="item.DICTIONARIES_ID"
@@ -81,7 +93,13 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="归属企业">
-                <el-select v-model="util.BELONG_TO_CORP" :disabled="isShow" filterable placeholder="请选择" style="width:  100%" @change="getPeopleList">
+                <el-select
+                  v-model="util.BELONG_TO_CORP"
+                  :disabled="isShow"
+                  filterable
+                  placeholder="请选择"
+                  style="width:  100%"
+                  @change="getPeopleList">
                   <el-option
                     v-for="item in warehouse.companyList"
                     :key="item.BELONG_TO_CORP"
@@ -90,6 +108,39 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名">
+                <el-input
+                  v-model="util.NAME"
+                  :disabled="isShow"
+                  style="width:  100%"
+                  maxlength="50"
+                  placeholder="这里输入..."
+                  @change="getPeopleList"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话">
+                <el-input
+                  v-model="util.PHONE"
+                  :disabled="isShow"
+                  style="width:  100%"
+                  maxlength="50"
+                  placeholder="这里输入..."
+                  @change="getPeopleList"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="身份证号">
+                <el-input
+                  v-model="util.CARD_ID"
+                  :disabled="isShow"
+                  style="width:  100%"
+                  maxlength="50"
+                  placeholder="这里输入..."
+                  @change="getPeopleList"/>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -121,8 +172,17 @@
                 <el-table-column prop="DEPARTMENT_NAME" label="部门"/>
                 <el-table-column prop="PHOTO" label="免冠照片" width="120px">
                   <template slot-scope="{row}">
-                    <el-image v-if="getShowPicture(row)" :src="config.fileUrl+row.PHOTO" :preview-src-list="[config.fileUrl+row.PHOTO]" :z-index="9999" style="width: 100px; height: 100px"/>
-                    <img v-if="!getShowPicture(row)" src="../../../../assets/images/peopleHead.png" alt="" style="width: 100px; height: 100px">
+                    <el-image
+                      v-if="getShowPicture(row)"
+                      :src="config.fileUrl+row.PHOTO"
+                      :preview-src-list="[config.fileUrl+row.PHOTO]"
+                      :z-index="9999"
+                      style="width: 100px; height: 100px"/>
+                    <img
+                      v-if="!getShowPicture(row)"
+                      src="../../../../assets/images/peopleHead.png"
+                      alt=""
+                      style="width: 100px; height: 100px">
                   </template>
                 </el-table-column>
                 <el-table-column prop="PHONE" label="联系电话"/>
@@ -164,7 +224,10 @@
       </el-col>
       <el-col :span="6">
         <div style="margin-left: 10px">
-          <div>已选择人员数量：{{ ($refs.multipleTable && $refs.multipleTable.selection)?$refs.multipleTable.selection.length:0 }}</div>
+          <div>已选择人员数量：{{
+            ($refs.multipleTable && $refs.multipleTable.selection) ? $refs.multipleTable.selection.length : 0
+          }}
+          </div>
           <div class="el-form-item__label">已选择人员名称：</div>
           <el-table
             :data="selectPeopleList"
@@ -181,10 +244,19 @@
     </el-row>
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
-      <el-button v-if="!form.CLASS_STATUS || form.CLASS_STATUS === ''" type="primary" @click="confirm">确 定</el-button>
-      <el-button v-if="form.CLASS_STATUS === '0' || form.CLASS_STATUS === '1'" type="primary" @click="getExcel(form.CLASS_MESSAGE_ID)">导出excel</el-button>
-      <el-button v-if="form.CLASS_STATUS === '1'" type="primary" @click="graduation(form.CLASS_MESSAGE_ID)">班级结业</el-button>
-      <el-button v-if="form.CLASS_STATUS === '2'" type="primary" @click="getCertificate(form.CLASS_MESSAGE_ID)">导出结业证书</el-button>
+      <el-button @click="fullscreen">{{ fullscreenFlag ? '取消全屏' : '全 屏' }}</el-button>
+      <el-button v-if="!form.CLASS_STATUS || form.CLASS_STATUS === ''" type="primary" @click="fullscreen">确 定
+      </el-button>
+      <el-button
+        v-if="form.CLASS_STATUS === '0' || form.CLASS_STATUS === '1'"
+        type="primary"
+        @click="getExcel(form.CLASS_MESSAGE_ID)">导出excel
+      </el-button>
+      <el-button v-if="form.CLASS_STATUS === '1'" type="primary" @click="graduation(form.CLASS_MESSAGE_ID)">班级结业
+      </el-button>
+      <el-button v-if="form.CLASS_STATUS === '2'" type="primary" @click="getCertificate(form.CLASS_MESSAGE_ID)">
+        导出结业证书
+      </el-button>
     </div>
     <user ref="userInfo" append-to-body/>
     <user_pdf ref="userPdf" append-to-body/>
@@ -198,6 +270,7 @@ import axios from 'axios'
 import dayjs from 'dayjs' // waves directive
 import user from './user.vue'
 import User_pdf from './user_pdf.vue'
+
 export default {
   components: { User_pdf, Pagination, user },
   directives: { waves },
@@ -227,7 +300,10 @@ export default {
         CLASS_MESSAGE_ID: ''
       },
       util: {
-        BELONG_TO_CORP: ''
+        BELONG_TO_CORP: '',
+        NAME: '',
+        PHONE: '',
+        CARD_ID: ''
       },
       warehouse: {
         placeList: [],
@@ -254,7 +330,8 @@ export default {
         VALIDITY_PERIOD: [{ trigger: 'blur', required: true, message: '请选择时间区间' }]
       },
       peopleList: [],
-      selectPeopleList: []
+      selectPeopleList: [],
+      fullscreenFlag: false
     }
   },
   created() {
@@ -379,7 +456,7 @@ export default {
       } else {
         pageSize = this.form.CLASS_SIZE
       }
-      requestFN('/classMessage/getPeopleList?showCount=' + pageSize + '&currentPage=1', { BELONG_TO_CORP: this.util.BELONG_TO_CORP }).then((data) => {
+      requestFN('/classMessage/getPeopleList?showCount=' + pageSize + '&currentPage=1', this.util).then((data) => {
         this.peopleList = data.varList
         this.loading = false
       }).catch((e) => {
@@ -492,6 +569,9 @@ export default {
     },
     getShowPicture(row) {
       return row.PHOTO && row.PHOTO !== ''
+    },
+    fullscreen() {
+      this.fullscreenFlag = !this.fullscreenFlag
     }
   }
 }

From 1cdca25e3ccc908c191e14167d6ed6d50931cfbb Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 7 Jun 2024 17:23:53 +0800
Subject: [PATCH 02/53] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B1=95=E7=A4=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/hotworkFirst.vue | 22 +++++++++++++++++++---
 static/config.js                      |  4 ++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 7678907..8084bfc 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -141,13 +141,23 @@
       <tr>
         <td class="bbg-transparent">接受交底人</td>
         <td colspan="10">
-          <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+          <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
             <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-            <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
           </div>
         </td>
       </tr>
+<!--      <tr>-->
+<!--        <td class="bbg-transparent">接受交底人</td>-->
+<!--        <td colspan="10">-->
+<!--          <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">-->
+<!--            <span>签字：</span>-->
+<!--            <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">-->
+<!--            <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>-->
+<!--          </div>-->
+<!--        </td>-->
+<!--      </tr>-->
       <tr>
         <td class="bbg-transparent">监护人</td>
         <td colspan="3">
@@ -273,6 +283,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -320,6 +331,11 @@ export default {
             this.confessList.push(item)
           }
         })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
         for (let i = 0; i < data.measuresList.length; i++) {
           // 将字符串转成数组
           const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
diff --git a/static/config.js b/static/config.js
index d26df72..fc72a21 100644
--- a/static/config.js
+++ b/static/config.js
@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.0.45:8082/', // 前台地址
-  httpurl: 'http://192.168.151.43:8092/', // 后台地址
+  weburl: 'http://192.168.0.49:8092/', // 前台地址
+  httpurl: 'http://192.168.0.49:8092/', // 后台地址
   qyurl: 'http://192.168.0.45:8080/', // 企业前台
   fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址
   publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',

From a37882569caa5735aeb841a160db642819999584 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 8 Jun 2024 09:25:26 +0800
Subject: [PATCH 03/53] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/initClass.vue     | 274 +++++++++---------
 .../classMessage/components/list.vue          |  14 +-
 2 files changed, 139 insertions(+), 149 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/initClass.vue b/src/views/classMessage/classMessage/components/initClass.vue
index 2e601d1..29604ad 100644
--- a/src/views/classMessage/classMessage/components/initClass.vue
+++ b/src/views/classMessage/classMessage/components/initClass.vue
@@ -8,7 +8,7 @@
     width="90%"
     top="50px">
     <el-row>
-      <el-col :span="18">
+      <el-col :span="12">
         <el-form ref="form" :rules="rules" :model="form" label-width="110px">
           <el-row :gutter="10">
             <el-col :span="8">
@@ -73,19 +73,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="false" :span="8">
-              <el-form-item v-if="false" label="培训有效期" prop="VALIDITY_PERIOD">
-                <el-date-picker
-                  v-model="form.VALIDITY_PERIOD"
-                  :disabled="isShow"
-                  type="daterange"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  style="width:  100%"/>
-              </el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -153,23 +140,23 @@
                 tooltip-effect="dark"
                 height="450px"
                 border
-                fit
                 highlight-current-row
+                @row-dblclick="clickAddSelect"
                 @selection-change="updateSelect"
 
               >
-                <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="USERNAME" label="用户名"/>
-                <el-table-column prop="NAME" label="姓名"/>
+                <el-table-column :reserve-selection="true" fixed type="selection" width="55" align="center"/>
+                <el-table-column fixed type="index" label="序号" width="50" align="center"/>
+                <el-table-column prop="USERNAME" width="200px" label="用户名"/>
+                <el-table-column prop="NAME" width="150px" label="姓名"/>
+                <el-table-column prop="CARD_ID" label="身份证号" width="150px"/>
+                <el-table-column prop="BELONG_TO_CORP_NAME" width="300px" label="所属企业"/>
+                <el-table-column prop="DEPARTMENT_NAME" width="300px" label="部门"/>
                 <el-table-column prop="SEX" width="50px" label="性别">
                   <template slot-scope="{row}">
                     {{ row.SEX === '0' ? '男' : '女' }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="CARD_ID" label="身份证号" width="150px"/>
-                <el-table-column prop="BELONG_TO_CORP_NAME" label="所属企业"/>
-                <el-table-column prop="DEPARTMENT_NAME" label="部门"/>
                 <el-table-column prop="PHOTO" label="免冠照片" width="120px">
                   <template slot-scope="{row}">
                     <el-image
@@ -185,36 +172,37 @@
                       style="width: 100px; height: 100px">
                   </template>
                 </el-table-column>
-                <el-table-column prop="PHONE" label="联系电话"/>
-                <el-table-column prop="STATUS" label="培训结果">
+                <el-table-column prop="PHONE" width="200px" label="联系电话"/>
+                <el-table-column v-if="false" prop="STATUS" label="培训结果">
                   <template slot-scope="{row}">
                     <template v-if="row.STATUS === '0'">不合格</template>
                     <template v-else-if="row.STATUS === '1'">合格</template>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" width="200">
+                <el-table-column fixed="right" label="操作" align="center" width="100">
                   <template slot-scope="{row}">
-                    <el-button
-                      v-if="form.CLASS_STATUS === '2' && row.STATUS === '1'"
-                      type="primary"
-                      icon="el-icon-edit"
-                      size="mini"
-                      @click="getUserInfo(row)">查看
-                    </el-button>
-                    <el-button
-                      v-if="row.STATUS === '0' && form.CLASS_STATUS === '1'"
-                      type="primary"
-                      icon="el-icon-edit"
-                      size="mini"
-                      @click="changFlag(row,'1')">合格
-                    </el-button>
-                    <el-button
-                      v-if="row.STATUS == '1' && form.CLASS_STATUS === '1'"
-                      type="danger"
-                      icon="el-icon-delete"
-                      size="mini"
-                      @click="changFlag(row,'0')">不合格
-                    </el-button>
+                    <el-tooltip class="item" effect="dark" content="加入本次课程" placement="top-start">
+                      <el-button
+                        v-if="!row.isSelect"
+                        type="warning"
+                        icon="el-icon-plus"
+                        circle
+                        @click="addSelect(row)"/>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="已加入本次课程" placement="top-start">
+                      <el-button
+                        v-if="row.isSelect"
+                        type="success"
+                        icon="el-icon-check"
+                        circle/>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="详情" placement="top-start">
+                      <el-button
+                        type="primary"
+                        icon="el-icon-info"
+                        circle
+                        @click="viewUserInfo(row)"/>
+                    </el-tooltip>
                   </template>
                 </el-table-column>
               </el-table>
@@ -222,22 +210,33 @@
           </el-row>
         </el-form>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="12">
         <div style="margin-left: 10px">
           <div>已选择人员数量：{{
-            ($refs.multipleTable && $refs.multipleTable.selection) ? $refs.multipleTable.selection.length : 0
+            (selectPeopleList && selectPeopleList.length) ? selectPeopleList.length : 0
           }}
           </div>
           <div class="el-form-item__label">已选择人员名称：</div>
           <el-table
             :data="selectPeopleList"
             border
-            height="600px"
-            style="width: 100%;margin-left: 10px">
-            <el-table-column prop="NAME" fixed label="姓名" width="150px" style="width: 150px"/>
+            height="642px"
+            style="width: 100%;margin-left: 10px"
+            @row-dblclick="clickAddSelect">
+            <el-table-column prop="NAME" fixed label="姓名" width="100px" style="width: 150px"/>
             <el-table-column prop="USERNAME" label="用户名" width="150px" style="width: 150px"/>
-            <el-table-column prop="BELONG_TO_CORP_NAME" label="所属企业" width="150px" style="width: 150px"/>
-            <el-table-column prop="CARD_ID" label="身份证号" width="150px"/>
+            <el-table-column prop="BELONG_TO_CORP_NAME" label="所属企业" width="200px" style="width: 150px"/>
+            <el-table-column prop="CARD_ID" label="身份证号" width="200px"/>
+            <el-table-column fixed="right" label="操作" align="center">
+              <template slot-scope="{row}">
+                <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                  <el-button type="danger" icon="el-icon-delete" circle @click="deleteSelect(row)"/>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="详情" placement="top-start">
+                  <el-button type="primary" icon="el-icon-info" circle @click="viewUserInfo(row)"/>
+                </el-tooltip>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </el-col>
@@ -245,34 +244,23 @@
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button @click="fullscreen">{{ fullscreenFlag ? '取消全屏' : '全 屏' }}</el-button>
-      <el-button v-if="!form.CLASS_STATUS || form.CLASS_STATUS === ''" type="primary" @click="fullscreen">确 定
-      </el-button>
-      <el-button
-        v-if="form.CLASS_STATUS === '0' || form.CLASS_STATUS === '1'"
-        type="primary"
-        @click="getExcel(form.CLASS_MESSAGE_ID)">导出excel
-      </el-button>
-      <el-button v-if="form.CLASS_STATUS === '1'" type="primary" @click="graduation(form.CLASS_MESSAGE_ID)">班级结业
-      </el-button>
-      <el-button v-if="form.CLASS_STATUS === '2'" type="primary" @click="getCertificate(form.CLASS_MESSAGE_ID)">
-        导出结业证书
-      </el-button>
+      <el-button type="primary" @click="confirm">确 定</el-button>
     </div>
     <user ref="userInfo" append-to-body/>
     <user_pdf ref="userPdf" append-to-body/>
+    <user-info ref="userInfos" append-to-body/>
   </el-dialog>
 </template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import axios from 'axios'
-import dayjs from 'dayjs' // waves directive
 import user from './user.vue'
 import User_pdf from './user_pdf.vue'
+import UserInfo from '../../../xgf/flow_audit/userInfo.vue'
 
 export default {
-  components: { User_pdf, Pagination, user },
+  components: { UserInfo, User_pdf, Pagination, user },
   directives: { waves },
   props: {
     title: {
@@ -303,7 +291,9 @@ export default {
         BELONG_TO_CORP: '',
         NAME: '',
         PHONE: '',
-        CARD_ID: ''
+        CARD_ID: '',
+        EDIT_FLAG: '',
+        CLASS_MESSAGE_ID: ''
       },
       warehouse: {
         placeList: [],
@@ -341,6 +331,8 @@ export default {
       this.loading = true
       this.visible = true
       if (e && e.CLASS_MESSAGE_ID && e.CLASS_MESSAGE_ID !== '') {
+        this.util.EDIT_FLAG = '1'
+        this.util.CLASS_MESSAGE_ID = e.CLASS_MESSAGE_ID
         this.getInformation(e)
       } else {
         this.getPeopleList()
@@ -359,10 +351,14 @@ export default {
           return
         }
         this.selectPeopleList = rows
+        for (let i = 0; i < this.selectPeopleList.length; i++) {
+          this.selectPeopleList[i].isSelect = true
+        }
+        this.getPeopleList()
       }
     },
     confirm() {
-      const list = this.$refs.multipleTable.selection
+      const list = this.selectPeopleList
       if (!list || !list.length || list.length === 0) {
         this.$message.error('没有人员数据')
         return
@@ -394,6 +390,7 @@ export default {
       })
     },
     close() {
+      console.log('清理缓存')
       this.visible = false
       this.form = {
         CLASS_NAME: '', // 班级名称
@@ -404,7 +401,14 @@ export default {
         CLASS_STATUS: ''// 班级状态（0-待开班、1-已开班、2-完成）
       }
       this.selectPeopleList = []
-      this.util.BELONG_TO_CORP = ''
+      this.util = {
+        BELONG_TO_CORP: '',
+        NAME: '',
+        PHONE: '',
+        CARD_ID: '',
+        EDIT_FLAG: '',
+        CLASS_MESSAGE_ID: ''
+      }
       this.$refs.multipleTable.clearSelection()
     },
     getDic() {
@@ -457,7 +461,16 @@ export default {
         pageSize = this.form.CLASS_SIZE
       }
       requestFN('/classMessage/getPeopleList?showCount=' + pageSize + '&currentPage=1', this.util).then((data) => {
-        this.peopleList = data.varList
+        const _peopleList = data.varList
+        if (data.varList && data.varList.length > 0) {
+          _peopleList.forEach((item) => {
+            const list = this.selectPeopleList.filter(ver => ver.USER_ID === item.USER_ID)
+            if (list && list.length > 0) {
+              item.isSelect = true
+            }
+          })
+        }
+        this.peopleList = _peopleList
         this.loading = false
       }).catch((e) => {
         this.loading = false
@@ -469,7 +482,12 @@ export default {
           if (data.code === '0') {
             this.form = data.pd
             this.form.VALIDITY_PERIOD = [this.form.VALIDITY_PERIOD_START, this.form.VALIDITY_PERIOD_END]
-            this.peopleList = this.form.peopleList
+            this.selectPeopleList = this.form.peopleList
+            this.$refs.multipleTable.selection = this.form.peopleList
+            this.form.peopleList.forEach(row => {
+              this.$refs.multipleTable.toggleRowSelection(row)
+            })
+            this.getPeopleList()
           } else {
             this.$message.error('数据异常')
           }
@@ -478,82 +496,10 @@ export default {
           this.loading = false
         })
     },
-    getExcel(id) {
-      const loading = this.$loading({
-        lock: true,
-        text: '加载中...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      axios.get(config.httpurl + '/classMessage/excel?CLASS_MESSAGE_ID=' + id, {
-        responseType: 'blob'
-      }).then(res => {
-        setTimeout(() => {
-          const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-          const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)
-          downloadElement.style.display = 'none'
-          downloadElement.href = href
-          downloadElement.download = dayjs().format('YYYY-MM-DD HH:mm:ss')
-          document.body.appendChild(downloadElement)
-          downloadElement.click()
-          document.body.removeChild(downloadElement)
-          window.URL.revokeObjectURL(href)
-          this.$emit('getResult', '')
-          loading.close()
-          this.close()
-        }, 2000)
-      }).catch((e) => {
-        console.log(e)
-        loading.close()
-        this.$message.error('导出失败,或未查询到隐患')
-      })
-    },
-    changFlag(row, flag) {
-      row.STATUS = flag
-      requestFN('/classMessage/enterGrades', { CLASS_INFO_ID: row.CLASS_INFO_ID, STATUS: flag })
-        .then((data) => {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          this.$emit('getResult', '')
-        }).catch((e) => {
-        })
-    },
-    graduation(id) {
-      this.$confirm('确定要结业吗, 结业后成绩将无法更改', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        requestFN('/classMessage/graduation', { CLASS_MESSAGE_ID: id })
-          .then((data) => {
-            this.$message({
-              type: 'success',
-              message: '操作成功'
-            })
-            this.visible = false
-            this.loading = false
-            this.close()
-            this.$emit('getResult', '')
-          }).catch((e) => {
-            this.loading = false
-          })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取操作'
-        })
-      })
-    },
     getUserInfo(row) {
       console.log(row)
       this.$refs.userInfo.init(row)
     },
-    getCertificate(CLASS_MESSAGE_ID) {
-      this.$refs.userPdf.init({ CLASS_MESSAGE_ID: CLASS_MESSAGE_ID })
-    },
     changePeopleList() {
       requestFN('/classMessage/getPeopleList?showCount=' + this.form.CLASS_SIZE + '&currentPage=1',
         { BELONG_TO_CORP: this.util.BELONG_TO_CORP }
@@ -572,8 +518,46 @@ export default {
     },
     fullscreen() {
       this.fullscreenFlag = !this.fullscreenFlag
+    },
+    addSelect(row) {
+      this.selectPeopleList.push(row)
+      this.$refs.multipleTable.toggleRowSelection(row)
+      this.getPeopleList()
+    },
+    clickAddSelect(row, column, event) {
+      if (!row.isSelect) {
+        this.addSelect(row)
+      }
+    },
+    clickDeleteSelect(row, column, event) {
+      if (!row.isSelect) {
+        this.deleteSelect(row)
+      }
+    },
+    deleteSelect(row) {
+      this.selectPeopleList = this.selectPeopleList.filter(ver => ver.USER_ID !== row.USER_ID)
+      this.$refs.multipleTable.clearSelection()
+      this.form.peopleList.forEach(row => {
+        this.$refs.multipleTable.toggleRowSelection(row)
+      })
+      this.getPeopleList()
+    },
+    viewUserInfo(row) {
+      this.$refs.userInfos.init({ XGF_USER_ID: row.USER_ID })
     }
   }
 }
 
 </script>
+
+<style lang="scss" scoped>
+/* 设置默认高度-滚动条高度 */
+.el-table__fixed {
+  height: calc(100% - 15px) !important;
+}
+
+/* 用于消除固定列下方的伪元素边框线 */
+.el-table__fixed:before {
+  height: 0px;
+}
+</style>
diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue
index 2ef7dfd..9488079 100644
--- a/src/views/classMessage/classMessage/components/list.vue
+++ b/src/views/classMessage/classMessage/components/list.vue
@@ -71,12 +71,13 @@
           {{ row.CLASS_STATUS === '0'?'待开班':(row.CLASS_STATUS === '1'?'已开班':'完成') }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="400" fixed="right">
+      <el-table-column label="操作" align="center" width="360" fixed="right">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
-          <el-button v-show=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
-          <el-button v-show=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
-          <el-button v-show=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleInit(row.CLASS_MESSAGE_ID)">编辑</el-button>
+          <el-button v-if=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
+          <el-button v-if=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
+          <el-button v-if=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -193,6 +194,11 @@ export default {
       this.isShow = true
       this.$refs.edit.init({ CLASS_MESSAGE_ID: ID })
     },
+    handleInit(ID) {
+      this.title = '详情'
+      this.isShow = false
+      this.$refs.initClass.init({ CLASS_MESSAGE_ID: ID })
+    },
     handleDelete(id) {
       this.$confirm('确定要删除吗?', {
         confirmButtonText: '确定',

From b6618acb136ab4eb2a3377d84acfd3e6fabcd6d7 Mon Sep 17 00:00:00 2001
From: liy <3101763317@qq.com>
Date: Tue, 11 Jun 2024 08:47:01 +0800
Subject: [PATCH 04/53] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E6=8B=89=E4=BA=BA=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xgf/coerceIntakeLog/components/list.vue   | 100 ++++++++++++++++++
 src/views/xgf/coerceIntakeLog/index.vue       |  21 ++++
 2 files changed, 121 insertions(+)
 create mode 100644 src/views/xgf/coerceIntakeLog/components/list.vue
 create mode 100644 src/views/xgf/coerceIntakeLog/index.vue

diff --git a/src/views/xgf/coerceIntakeLog/components/list.vue b/src/views/xgf/coerceIntakeLog/components/list.vue
new file mode 100644
index 0000000..c142283
--- /dev/null
+++ b/src/views/xgf/coerceIntakeLog/components/list.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="用户名">
+            <el-input v-model="NAME" placeholder="请输入用户名"/>
+          </el-form-item>
+        </el-col>
+        <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>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="RELEVANT_UNIT_NAME_HIS" label="原企业" align="center"/>
+      <el-table-column prop="RELEVANT_UNIT_NAME_NOW" label="入住企业" align="center"/>
+      <el-table-column prop="CREATETIME" label="入住时间" align="center"/>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      NAME: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getQuery() {
+      if (this.$refs.multipleTable) {
+        this.$refs.multipleTable.clearSelection()
+      }
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.NAME = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/xgf/coerce/getCoerceIntakeLoglistPage?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          NAME: this.NAME
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/coerceIntakeLog/index.vue b/src/views/xgf/coerceIntakeLog/index.vue
new file mode 100644
index 0000000..45be1d5
--- /dev/null
+++ b/src/views/xgf/coerceIntakeLog/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+export default {
+  components: {
+    List: List
+  },
+  data() {
+    return {
+      activeName: 'List',
+      SUPERVISE_CORPINFO_ID: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From fcf94011d3670b0c905b24c06a5f62f2d71b1e95 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Tue, 11 Jun 2024 08:53:51 +0800
Subject: [PATCH 05/53] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=8D=B1?=
 =?UTF-8?q?=E9=99=A9=E4=BD=9C=E4=B8=9A->=E5=8A=A8=E7=81=AB=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2->=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA=E4=BB=8E=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=EF=BC=9B=20=E7=9B=91=E7=AE=A1=E7=AB=AF?=
 =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A->=E5=8A=A8=E7=81=AB?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2->?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=E5=8A=A8=E7=81=AB=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=8E=B0?=
 =?UTF-8?q?=E6=88=90=E6=98=AF=E5=90=A6=E6=B8=85=E7=90=86=EF=BC=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E9=81=97=E7=95=99=E7=81=AB=E7=A7=8D?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork_list/components/detail_cfd.vue    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
index 0422aaa..1263ea0 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
@@ -75,6 +75,25 @@
           <td class="bbg">动火作业实施时间</td>
           <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
+        <tr>
+          <td class="bbg">动火是否完成</td>
+          <td>
+            <span v-if="pd.FIRE_COMPLETED == 1">已完成</span>
+            <span v-else-if ="pd.FIRE_COMPLETED == 0">未完成</span>
+          </td>
+          <td class="bbg">作业现场是否清理</td>
+          <td>
+            <span v-if="pd.SITE_CLEANED == 1">已清理</span>
+            <span v-else-if ="pd.SITE_CLEANED == 0">未清理</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">是否存在遗留火种</td>
+          <td>
+            <span v-if="pd.NO_REMAINING_EMBERS == 1">无遗留</span>
+            <span v-else-if ="pd.NO_REMAINING_EMBERS == 0">未确定无遗留火种</span>
+          </td>
+        </tr>
         <tr>
           <td colspan="4">
             <table class="table-ui">
@@ -146,13 +165,23 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+            <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
             </div>
           </td>
         </tr>
+<!--        <tr>-->
+<!--          <td class="bbg">接受交底人</td>-->
+<!--          <td colspan="10">-->
+<!--            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">-->
+<!--              <span>签字：</span>-->
+<!--              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">-->
+<!--              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>-->
+<!--            </div>-->
+<!--          </td>-->
+<!--        </tr>-->
         <tr>
           <td class="bbg">监护人</td>
           <td colspan="3">
@@ -267,6 +296,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -312,6 +342,11 @@ export default {
             this.confessList.push(item)
           }
         })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
         for (let i = 0; i < data.measuresList.length; i++) {
           // 将字符串转成数组
           const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

From a7eba8b92e210774144098d9377be60b5cc15398 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 11 Jun 2024 09:32:40 +0800
Subject: [PATCH 06/53] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/initClass.vue     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/initClass.vue b/src/views/classMessage/classMessage/components/initClass.vue
index 29604ad..5039c3f 100644
--- a/src/views/classMessage/classMessage/components/initClass.vue
+++ b/src/views/classMessage/classMessage/components/initClass.vue
@@ -76,6 +76,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
+              <div style="font-size: 10px; color: red">{{ '温馨提示：1、输入名称、电话、身份证号按回车或让输入框失去焦点即可搜索。2、双击人员列可直接添加' }}</div>
               <el-divider content-position="center">搜索条件</el-divider>
             </el-col>
             <el-col :span="12">
@@ -143,7 +144,6 @@
                 highlight-current-row
                 @row-dblclick="clickAddSelect"
                 @selection-change="updateSelect"
-
               >
                 <el-table-column :reserve-selection="true" fixed type="selection" width="55" align="center"/>
                 <el-table-column fixed type="index" label="序号" width="50" align="center"/>
@@ -221,8 +221,7 @@
             :data="selectPeopleList"
             border
             height="642px"
-            style="width: 100%;margin-left: 10px"
-            @row-dblclick="clickAddSelect">
+            style="width: 100%;margin-left: 10px">
             <el-table-column prop="NAME" fixed label="姓名" width="100px" style="width: 150px"/>
             <el-table-column prop="USERNAME" label="用户名" width="150px" style="width: 150px"/>
             <el-table-column prop="BELONG_TO_CORP_NAME" label="所属企业" width="200px" style="width: 150px"/>
@@ -321,7 +320,8 @@ export default {
       },
       peopleList: [],
       selectPeopleList: [],
-      fullscreenFlag: false
+      fullscreenFlag: false,
+      lock: false
     }
   },
   created() {
@@ -354,7 +354,9 @@ export default {
         for (let i = 0; i < this.selectPeopleList.length; i++) {
           this.selectPeopleList[i].isSelect = true
         }
-        this.getPeopleList()
+        if (!this.lock) {
+          this.getPeopleList()
+        }
       }
     },
     confirm() {
@@ -522,25 +524,23 @@ export default {
     addSelect(row) {
       this.selectPeopleList.push(row)
       this.$refs.multipleTable.toggleRowSelection(row)
-      this.getPeopleList()
     },
     clickAddSelect(row, column, event) {
       if (!row.isSelect) {
         this.addSelect(row)
       }
     },
-    clickDeleteSelect(row, column, event) {
-      if (!row.isSelect) {
-        this.deleteSelect(row)
-      }
-    },
     deleteSelect(row) {
       this.selectPeopleList = this.selectPeopleList.filter(ver => ver.USER_ID !== row.USER_ID)
+      this.form.peopleList = this.form.peopleList.filter(ver => ver.USER_ID !== row.USER_ID)
+      // 重新选择
       this.$refs.multipleTable.clearSelection()
+      this.lock = true
       this.form.peopleList.forEach(row => {
         this.$refs.multipleTable.toggleRowSelection(row)
       })
       this.getPeopleList()
+      this.lock = false
     },
     viewUserInfo(row) {
       this.$refs.userInfos.init({ XGF_USER_ID: row.USER_ID })

From 1d31175ca9c15436b8bcaec9f47a7bb7f19b207e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 11 Jun 2024 14:21:47 +0800
Subject: [PATCH 07/53] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=89=B9=E5=8F=AF=E6=8C=87=E5=AE=9A=E6=89=93?=
 =?UTF-8?q?=E5=9B=9E=E8=87=B3=E7=89=B9=E6=AE=8A=E8=8A=82=E7=82=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/edit.vue             |  2 +-
 .../classMessage/components/list.vue             | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/edit.vue b/src/views/classMessage/classMessage/components/edit.vue
index fe31e5a..826a42c 100644
--- a/src/views/classMessage/classMessage/components/edit.vue
+++ b/src/views/classMessage/classMessage/components/edit.vue
@@ -121,7 +121,7 @@
                   size="mini"
                   @click="getUserInfo(row)">查看
                 </el-button>
-                <el-button v-if="form.CLASS_STATUS === '1'" icon="el-icon-s-open" type="primary" @click="updatePhoto(row)">更换头像</el-button>
+                <el-button icon="el-icon-s-open" type="primary" @click="updatePhoto(row)">更换头像</el-button>
                 <el-button
                   v-if="row.STATUS === '0' && form.CLASS_STATUS === '1'"
                   type="primary"
diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue
index 9488079..dd8171c 100644
--- a/src/views/classMessage/classMessage/components/list.vue
+++ b/src/views/classMessage/classMessage/components/list.vue
@@ -73,11 +73,17 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="360" fixed="right">
         <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleInit(row.CLASS_MESSAGE_ID)">编辑</el-button>
-          <el-button v-if=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
-          <el-button v-if=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
-          <el-button v-if=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
+          <el-row>
+            <el-col :span="24" style="margin-bottom: 10px">
+              <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
+              <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleInit(row.CLASS_MESSAGE_ID)">编辑</el-button>
+              <el-button v-if=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
+            </el-col>
+            <el-col :span="24">
+              <el-button v-if=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
+              <el-button v-if=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>

From 257a8d5d233813efda848cf47535fac943dca308 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 12 Jun 2024 08:51:17 +0800
Subject: [PATCH 08/53] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E6=89=93=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue | 152 +++++++++++++++++++--
 1 file changed, 143 insertions(+), 9 deletions(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 914808c..a9d8bc3 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -1,6 +1,13 @@
 <template>
   <div>
-    <el-dialog v-loading = "loading" :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="审批" width="1200px" destroy-on-close>
+    <el-dialog
+      v-loading="loading"
+      :visible.sync="visible"
+      :append-to-body="appendToBody"
+      :before-close="beforeClose"
+      title="审批"
+      width="1200px"
+      destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" label-width="200px" label-position="right" type="flex">
         <el-row :gutter="12">
           <el-col :span="12">
@@ -33,16 +40,86 @@
               <el-input v-model="form.OPINION" :rows="2" type="textarea" placeholder="填写审批意见"/>
             </el-form-item>
           </el-col>
+          <el-col v-if="form.STATUS === '0' && showStepFlag" :span="24">
+            <el-form-item v-if="form.STATUS === '0'" prop="BACK_NAME" label="打回至:">
+              <div>{{ form.BACK_NAME }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.STATUS === '0' && showStepFlag" :span="24">
+            <el-steps :space="200" :active="+step" finish-status="success">
+              <el-step>
+                <template slot="description">
+                  <el-card
+                    class="box-card"
+                    style="margin-top: 10px"
+                    @click.native="backPoint('-1',info.BELONG_TO_CORP_NAME)">
+                    <div icon="el-icon-aim"/>
+                    <div slot="header" class="clearfix">
+                      <span>相关方端</span>
+                    </div>
+                    <div>
+                      企业名称：{{ info.BELONG_TO_CORP_NAME }}
+                    </div>
+                  </el-card>
+                </template>
+              </el-step>
+              <el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX">
+                <template slot="description">
+                  <el-card
+                    class="box-card"
+                    style="margin-top: 10px"
+                    @click.native="backPoint(item.INDEX, item.APPOINT_USER_NAME)">
+                    <div slot="header" class="clearfix">
+                      <span>审批节点</span>
+                    </div>
+                    <div>
+                      <el-row>
+                        <el-col>
+                          审批人：{{ item.APPOINT_USER_NAME }}
+                        </el-col>
+                        <el-col v-if="item.INDEX !== step">
+                          审批人公司：{{ item.APPOINT_CORP_NAME }}
+                        </el-col>
+                        <el-col>
+                          审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
+                        </el-col>
+                        <el-col v-if="item.INDEX !== step">
+                          审批状态：{{
+                            item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : ''
+                          }}
+                        </el-col>
+                        <el-col v-if="item.INDEX !== step">
+                          审批时间：{{ item.APPOINT_TIME }}
+                        </el-col>
+                        <el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
+                          审批意见：{{ item.APPOINT_OPINION }}
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-card>
+                </template>
+              </el-step>
+            </el-steps>
+          </el-col>
           <el-col v-if="form.STATUS === '1' && !form.STEP " :span="12">
             <el-form-item v-if="form.STATUS === '1'" prop="APPOINT_USER_ID" label="指定监管部门审批人:">
               <el-select v-model="form.user" style="width: 300px" placeholder="请选择" @change="chooseUser">
-                <el-option v-for="item in peopleList" :key="item.USER_ID" :value="JSON.stringify(item)" :label="item.NAME"/>
+                <el-option
+                  v-for="item in peopleList"
+                  :key="item.USER_ID"
+                  :value="JSON.stringify(item)"
+                  :label="item.NAME"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-if="form.STATUS === '1' && !form.STEP " :span="12">
             <el-form-item v-if="form.STATUS === '1'" prop="LIMIT_END_TIME" label="指定培训有效截至时间:">
-              <el-date-picker v-model="form.LIMIT_END_TIME" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:300px "/>
+              <el-date-picker
+                v-model="form.LIMIT_END_TIME"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="选择日期"
+                style="width:300px "/>
             </el-form-item>
           </el-col>
           <el-col v-if="form.STATUS === '1' && form.TYPE === '2'" :span="12">
@@ -103,7 +180,9 @@ export default {
         list: [],
         isShow: true,
         info: {},
-        TYPE: null
+        TYPE: null,
+        BACK_NAME: '',
+        BACK_STEP: ''
       },
       rules: {
         STATUS: [
@@ -120,6 +199,9 @@ export default {
         ],
         LIMIT_END_TIME: [
           { required: true, message: '请选择指定培训有效截至时间', trigger: 'change' }
+        ],
+        BACK_NAME: [
+          { required: true, message: '请填选择回节点', trigger: 'change' }
         ]
       },
       heirloom: {},
@@ -133,7 +215,15 @@ export default {
       },
 
       departmentTree: [],
-      peopleList: []
+      peopleList: [],
+      info: {},
+      list: [
+        {
+          INDEX: '-1'
+        }
+      ],
+      step: 0,
+      showStepFlag: false
     }
   },
   methods: {
@@ -142,6 +232,14 @@ export default {
       this.visible = true
       this.heirloom = JSON.stringify(e)
       this.form.list = JSON.stringify(e)
+      const list = JSON.parse(this.heirloom)
+      if (list.length === 1) {
+        this.info = JSON.parse(this.heirloom)[0]
+        this.form.BACK_NAME = this.info.BELONG_TO_CORP_NAME
+        this.form.BACK_STEP = '-1'
+        this.showStepFlag = true
+      }
+
       // 确定是不是最后一步，是：ture，否：false
       this.form.STEP = (e[0].FLOWS_STEP === 2) || (e[0].FLOWS_STEP === 1 && e[0].FLOWS_TYPE === '2')
       this.form.TYEP = e[0].FLOWS_TYPE
@@ -157,10 +255,15 @@ export default {
             this.loading = true
             requestFN('/xgf/user/approveMax', this.form)
               .then((data) => {
-                this.$message.success('推送成功')
-                this.visible = false
-                this.$emit('refresh', '')
-                this.handleClose()
+                if (data.code === '0') {
+                  this.$message.success('推送成功')
+                  this.visible = false
+                  this.$emit('refresh', '')
+                  this.handleClose()
+                } else {
+                  this.$message.error(data.errorMessage)
+                }
+
                 this.loading = false
               })
               .catch((e) => {
@@ -250,6 +353,7 @@ export default {
         tm: new Date().getTime()
       }
       this.visible = false
+      this.showStepFlag = false
     },
     beforeClose() {
       this.visible = false
@@ -272,6 +376,36 @@ export default {
       this.form.APPOINT_USER_NAME = ''
       this.form.OPINION = ''
       this.form.user = ''
+      if (this.form.STATUS === '0') {
+        this.getInfo()
+      }
+    },
+    getInfo() {
+      const info = JSON.parse(this.heirloom)[0]
+      requestFN(
+        '/xgf/user/getApproveInfo', { XGF_USER_ID: info.XGF_USER_ID }
+      ).then((data) => {
+        this.list = data.flow.info
+        this.step = data.flow.STEP
+        if (data.flow.endFlag === '1') {
+          this.title = '审批中'
+        }
+        if (data.flow.endFlag === '2') {
+          this.title = '审批结束'
+        }
+        if (data.flow.endFlag === '-2') {
+          this.title = '审批驳回'
+        }
+        this.visible = true
+        this.loading = false
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    backPoint(num, name) {
+      this.form.BACK_STEP = num
+      this.form.BACK_NAME = name
+      this.$forceUpdate()
     }
   }
 }

From cf98d4b419d1b2fbddd596948c0fa7dbf8f504d7 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 12 Jun 2024 15:00:06 +0800
Subject: [PATCH 09/53] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81?=
 =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=8A=9F=E8=83=BD=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/classMessage/classMessage/components/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue
index dd8171c..42591ea 100644
--- a/src/views/classMessage/classMessage/components/list.vue
+++ b/src/views/classMessage/classMessage/components/list.vue
@@ -76,7 +76,7 @@
           <el-row>
             <el-col :span="24" style="margin-bottom: 10px">
               <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
-              <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleInit(row.CLASS_MESSAGE_ID)">编辑</el-button>
+              <el-button v-if=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="handleInit(row.CLASS_MESSAGE_ID)">编辑</el-button>
               <el-button v-if=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
             </el-col>
             <el-col :span="24">

From 051f1d7412bbb40640cf6b56c405630c89693fc7 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 13 Jun 2024 15:01:53 +0800
Subject: [PATCH 10/53] =?UTF-8?q?1=E3=80=81=E8=BE=B9=E7=95=8C=E5=85=A5?=
 =?UTF-8?q?=E4=BE=B5=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0=202=E3=80=81?=
 =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E6=A0=87=E7=82=B9=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/zhongdian.vue | 102 ++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 20 deletions(-)

diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue
index 9500a6b..fc24fb8 100644
--- a/src/views/map/components/zhongdian.vue
+++ b/src/views/map/components/zhongdian.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="renyuan">
     <div class="block1">
-      <layout-title title="重点工程统计"/>
+      <layout-title title="边界入侵统计"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
           <div class="imger">
@@ -10,12 +10,11 @@
           <div class="info">
             <div class="label">{{ item.title }}</div>
             <div class="text">{{ item.count }}</div>
-            <!--            <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>-->
           </div>
         </div>
       </div>
     </div>
-    <div class="block2">
+    <div v-if="false" class="block2">
       <layout-title title="区域报警数"/>
       <div class="options">
         <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
@@ -27,8 +26,7 @@
         </div>
       </div>
     </div>
-
-    <div class="block3">
+    <div v-if="false" class="block3">
       <layout-title title="安全管理记录"/>
       <div class="content">
         <div class="table">
@@ -47,6 +45,23 @@
         </div>
       </div>
     </div>
+    <div class="block4">
+      <layout-title title="报警列表"/>
+      <div class="content">
+        <div class="table">
+          <div class="tr">
+            <div class="td">区域名称</div>
+            <div class="td">报警设备编号</div>
+            <div class="td">状态告警</div>
+          </div>
+          <div v-for="(item,index) in block4List" :key="index" class="tr">
+            <div class="td">{{ item.alarmName }}</div>
+            <div class="td">{{ item.equipmentName }}</div>
+            <div class="td">{{ item.statusName }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -78,26 +93,15 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '开工数量',
+          title: '监控数量',
           img: require('../../../assets/map/zhongdian/ico1.png'),
           count: '-'
         },
         {
-          title: '视频数量',
+          title: '监控数量',
           img: require('../../../assets/map/zhongdian/ico2.png'),
           count: '-'
-        },
-        {
-          title: '检查次数',
-          img: require('../../../assets/map/zhongdian/ico3.png'),
-          count: '-'
-        },
-        {
-          title: '发现隐患数量',
-          img: require('../../../assets/map/zhongdian/ico4.png'),
-          count: '-'
         }
-
       ],
       block2OptionsList: [
         {
@@ -120,11 +124,12 @@ export default {
           CHECK_COUNT: '-',
           HIDDEN_COUNT: '-'
         }
-      ]
+      ],
+      block4List: []
     }
   },
   mounted() {
-    this.getCount()
+    this.initNum()
     this.initgetTable()
   },
   methods: {
@@ -147,6 +152,21 @@ export default {
         this.block2OptionsList[1].count = data.pd.AMOUT_SUM
       })
     },
+    initNum() {
+      requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId }
+      ).then((data) => {
+        this.block1OptionsList[0].count = data.alarmList.total
+        requestFN('/map/mapPlatformelectronic/listAllLocatio', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' }
+        ).then((data) => {
+          this.block4List = data.alarmList.list
+          this.block1OptionsList[0].count = data.alarmList.total
+        }).catch((e) => {
+          this.$message.error(e)
+        })
+      }).catch((e) => {
+        this.$message.error(e)
+      })
+    },
     initgetTable() {
       requestFN(
         '/map/keyProject/list?showCount=10&currentPage=1',
@@ -357,6 +377,48 @@ export default {
       }
     }
   }
+
+  .block4 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+          }
+        }
+      }
+    }
+  }
 }
 
 @keyframes scale {

From c22e4f17237b5bd5a42acf851bd3420269774003 Mon Sep 17 00:00:00 2001
From: liy <3101763317@qq.com>
Date: Thu, 13 Jun 2024 16:44:29 +0800
Subject: [PATCH 11/53] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E6=8B=89=E4=BA=BA=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xgf/coerceCheckIn/components/list.vue     | 257 ++++++++++++++++++
 src/views/xgf/coerceCheckIn/index.vue         |  21 ++
 .../xgf/coerceIntakeLog/components/list.vue   |   2 +
 3 files changed, 280 insertions(+)
 create mode 100644 src/views/xgf/coerceCheckIn/components/list.vue
 create mode 100644 src/views/xgf/coerceCheckIn/index.vue

diff --git a/src/views/xgf/coerceCheckIn/components/list.vue b/src/views/xgf/coerceCheckIn/components/list.vue
new file mode 100644
index 0000000..4a9307c
--- /dev/null
+++ b/src/views/xgf/coerceCheckIn/components/list.vue
@@ -0,0 +1,257 @@
+<template>
+  <div class="app-container">
+    <el-form :model="ruleForm" :rules="rules" label-width="130px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="人员名称" prop="name" class="input-width">
+            <el-input v-model="ruleForm.name" placeholder="请输入人员名称"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="身份证号" prop="cardId">
+            <el-input v-model="ruleForm.cardId" placeholder="请输入身份证号"/>
+          </el-form-item>
+        </el-col>
+        <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>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="username" label="用户名" align="center"/>
+      <el-table-column prop="cardId" label="身份证号" align="center"/>
+      <el-table-column prop="name" label="人员名称" align="center"/>
+      <el-table-column prop="corpName" label="企业名称" align="center"/>
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-s-claim" size="mini" @click="dosubmit([row])">入住</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="请选择入住企业"
+      width="30%">
+      <el-select
+        v-model="corpinfoId"
+        :remote-method="remoteMethod"
+        :loading="loading"
+        filterable
+        remote
+        reserve-keyword
+        placeholder="请选择入住企业">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="doCheckIn">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      rules: {
+        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        cardId: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }]
+      },
+      ruleForm: { name: '', cardId: '' },
+      config: config,
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      dialogVisible: false,
+      rowuser: {},
+      corpinfoId: '',
+      loading: false,
+      options: []
+
+    }
+  },
+  created() {
+    // this.getDict()
+    // this.getList()
+    this.remoteMethod('河北')
+  },
+  methods: {
+    handleSelectWithDifferentStatus(row, rowIndex) {
+      return true
+    },
+    getQuery() {
+      if (this.ruleForm.name === '') {
+        this.$message.error('请填写人员名称')
+        return false
+      }
+      if (this.ruleForm.cardId === '') {
+        this.$message.error('请填写身份证号')
+        return false
+      }
+      if (this.$refs.multipleTable) {
+        this.$refs.multipleTable.clearSelection()
+      }
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.ruleForm.cardId = ''
+      this.ruleForm.name = ''
+      this.varList = []
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/xgf/coerce/getUserListByIdCardAndName?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          cardId: this.ruleForm.cardId,
+          name: this.ruleForm.name,
+          UN_EMPLOY_FLAG: '0'
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        if (this.varList.length === 0) {
+          this.$message.error('没有相关人员信息')
+        }
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    remoteMethod(query) {
+      if (query !== '') {
+        // this.loading = true
+        /* setTimeout(() => {
+          this.loading = false
+          this.options = this.list.filter(item => {
+            return item.label.toLowerCase()
+              .indexOf(query.toLowerCase()) > -1
+          })
+        }, 200) */
+
+        requestFN(
+          '/xgf/coerce/findModuleList',
+          {
+            keyword: query
+          }
+        ).then((data) => {
+          // this.loading = false
+          this.options = []
+          data.varList.forEach(v => {
+            const obj = {
+              value: v.CORPINFO_ID,
+              label: v.RELEVANT_UNIT_NAME
+            }
+            this.options.push(obj)
+          })
+        })
+          .catch((e) => {
+          //  this.loading = false
+          })
+      } else {
+        this.options = []
+        this.remoteMethod('河北')
+      }
+    },
+    dosubmit(row) {
+      this.rowuser = {
+        name: row[0].name,
+        userId: row[0].userId
+      }
+      /*  if (this.corpinfoId === '') {
+        this.dialogVisible = true
+      } else {
+        this.doCheckIn()
+      } */
+      this.dialogVisible = true
+    },
+
+    doCheckIn() {
+      if (this.corpinfoId === '') {
+        this.$message({
+          message: '请选择入住企业',
+          type: 'warning'
+        })
+        return
+      }
+      this.dialogVisible = false
+      this.$confirm('确定要将  ' + this.rowuser.name + '  拉入企业吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/xgf/coerce/doCoerceCheckIn',
+          {
+            userId: this.rowuser.userId,
+            corpinfoId: this.corpinfoId
+          }
+        ).then((e) => {
+          console.log(e)
+          if (e.msg === '1') {
+            this.$message({
+              message: '当前人员已经在企业中',
+              type: 'warning'
+            })
+          } else {
+            this.$message({
+              message: '拉入成功',
+              type: 'success'
+            })
+            this.getQuery()
+          }
+          this.listLoading = false
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {})
+    }
+
+  }
+}
+</script>
+
diff --git a/src/views/xgf/coerceCheckIn/index.vue b/src/views/xgf/coerceCheckIn/index.vue
new file mode 100644
index 0000000..45be1d5
--- /dev/null
+++ b/src/views/xgf/coerceCheckIn/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+export default {
+  components: {
+    List: List
+  },
+  data() {
+    return {
+      activeName: 'List',
+      SUPERVISE_CORPINFO_ID: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/xgf/coerceIntakeLog/components/list.vue b/src/views/xgf/coerceIntakeLog/components/list.vue
index c142283..5da5d12 100644
--- a/src/views/xgf/coerceIntakeLog/components/list.vue
+++ b/src/views/xgf/coerceIntakeLog/components/list.vue
@@ -31,6 +31,8 @@
       <el-table-column prop="NAME" label="姓名" align="center"/>
       <el-table-column prop="RELEVANT_UNIT_NAME_HIS" label="原企业" align="center"/>
       <el-table-column prop="RELEVANT_UNIT_NAME_NOW" label="入住企业" align="center"/>
+      <el-table-column prop="OPERNAME" label="操作人" align="center"/>
+
       <el-table-column prop="CREATETIME" label="入住时间" align="center"/>
     </el-table>
     <div class="page-btn-group">

From a22bcf76d84a4aa88c3f2fa98a7d0777fc6a8a3f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 13 Jun 2024 18:36:30 +0800
Subject: [PATCH 12/53] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/classMessage/components/initClass.vue    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/classMessage/classMessage/components/initClass.vue b/src/views/classMessage/classMessage/components/initClass.vue
index 5039c3f..99fb041 100644
--- a/src/views/classMessage/classMessage/components/initClass.vue
+++ b/src/views/classMessage/classMessage/components/initClass.vue
@@ -284,7 +284,8 @@ export default {
         CLASS_SIZE: '', // 班级容量
         CLASS_STATUS: '', // 班级状态（0-待开班、1-已开班、2-完成）
         VALIDITY_PERIOD: [],
-        CLASS_MESSAGE_ID: ''
+        CLASS_MESSAGE_ID: '',
+        peopleList: []
       },
       util: {
         BELONG_TO_CORP: '',
@@ -522,6 +523,11 @@ export default {
       this.fullscreenFlag = !this.fullscreenFlag
     },
     addSelect(row) {
+      if (this.form.CLASS_SIZE === '' || !this.form.CLASS_SIZE) {
+        this.$message.error('请先选择班级容量')
+        this.$refs.multipleTable.clearSelection()
+        return
+      }
       this.selectPeopleList.push(row)
       this.$refs.multipleTable.toggleRowSelection(row)
     },

From c007e133b4a3689eebbe2ef7cbe4991a582ba85b Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 14 Jun 2024 17:57:03 +0800
Subject: [PATCH 13/53] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork_list/components/detail_cfd.vue    | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
index 1263ea0..00c46b2 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
@@ -75,23 +75,20 @@
           <td class="bbg">动火作业实施时间</td>
           <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
-        <tr>
+        <tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
           <td class="bbg">动火是否完成</td>
           <td>
-            <span v-if="pd.FIRE_COMPLETED == 1">已完成</span>
-            <span v-else-if ="pd.FIRE_COMPLETED == 0">未完成</span>
+            <span>已完成</span>
           </td>
-          <td class="bbg">作业现场是否清理</td>
+          <td class="bbg">动火是否完成</td>
           <td>
-            <span v-if="pd.SITE_CLEANED == 1">已清理</span>
-            <span v-else-if ="pd.SITE_CLEANED == 0">未清理</span>
+            <span>已清理</span>
           </td>
         </tr>
-        <tr>
+        <tr v-if="pd.NO_REMAINING_EMBERS === '1'">
           <td class="bbg">是否存在遗留火种</td>
           <td>
-            <span v-if="pd.NO_REMAINING_EMBERS == 1">无遗留</span>
-            <span v-else-if ="pd.NO_REMAINING_EMBERS == 0">未确定无遗留火种</span>
+            <span>无遗留火种</span>
           </td>
         </tr>
         <tr>
@@ -204,7 +201,7 @@
         </tr>
         <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : 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">
@@ -214,7 +211,7 @@
         </tr>
         <tr v-if="pd.BELONGING_SIGNATURE">
           <td colspan="6">
-            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '无' ? '同意' : pd.BELONGING_OPINIONS }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@@ -224,7 +221,7 @@
         </tr>
         <tr v-if="pd.LEADER_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
+            <div>所在单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : 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">
@@ -234,7 +231,7 @@
         </tr>
         <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -244,7 +241,7 @@
         </tr>
         <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -254,7 +251,7 @@
         </tr>
         <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -264,7 +261,7 @@
         </tr>
         <tr v-if="imgList1.length>0">
           <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
             <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">

From 5cb52c147bdc39a194692ed315e28577aa2ada15 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Mon, 17 Jun 2024 17:51:22 +0800
Subject: [PATCH 14/53] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=BC=E5=BC=8F=E5=8C=96=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=BE=85=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=BE=85=E5=AE=A1=E6=A0=B8=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AE=A1=E6=A0=B8=E6=89=93?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E4=B8=BB?=
 =?UTF-8?q?=E7=AE=A1=E9=83=A8=E9=97=A8=E5=AE=A1=E6=A0=B8=E6=89=93=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork_list/components/detail_cfd.vue    | 36 +++++++++----------
 .../hotwork_list/components/list_cfd.vue      |  4 +--
 src/views/map/dialog/hotworkFirst.vue         | 36 ++++++++++---------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
index 00c46b2..4aedc93 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
@@ -211,7 +211,7 @@
         </tr>
         <tr v-if="pd.BELONGING_SIGNATURE">
           <td colspan="6">
-            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '无' ? '同意' : pd.BELONGING_OPINIONS }}</div>
+            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@@ -344,23 +344,23 @@ export default {
             this.acceptConfessList.push(item)
           }
         })
-        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('')
-        }
+        // 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.measuresList = data.measuresList // 参数map
         this.gasList = data.gasList // 参数map
         if (this.pd.WORK_LEVEL === '二级') {
diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
index a138821..638c251 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
@@ -52,14 +52,14 @@
         <template slot-scope="{row}">
           <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
           <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
-          <span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
+          <span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</span>
           <span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</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==7">待验收</span>
           <span v-else-if="row.APPLY_STATUS==8">验收归档</span>
-          <span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</span>
+          <span v-else-if="row.APPLY_STATUS==-1.5">项目主管部门审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-4">所在单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 8084bfc..15da57a 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -73,27 +73,31 @@
             <tr>
               <td>序号</td>
               <td>安全措施</td>
-              <td style="width: 80px; text-align: center">是否涉及</td>
-              <td style="width: 80px; text-align: center">确认人</td>
+              <td style="width: 80px; text-align: center;">是否涉及</td>
+              <td style="width: 80px; text-align: center;">确认人</td>
             </tr>
-            <tr v-for="(item,index) in measuresList" :key="index">
-              <td>{{ index + 1 }}</td>
+            <tr v-for="(item, index) in measuresList" :key="index">
+              <td style="text-align: center;">{{ index + 1 }}</td>
               <td>
                 {{ item.PROTECTIVE_MEASURES }}
-                <!--                  <template v-if="item.QUESTION1">-->
-                <!--                    {{ item.QUESTION1 }}({{ item.ANSWER1 }})-->
-                <!--                  </template>-->
-                <!--                  <template v-if="item.QUESTION2">-->
-                <!--                    、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }})-->
-                <!--                  </template>-->
+                <!--
+                <template v-if="item.QUESTION1">
+                  {{ item.QUESTION1 }}({{ item.ANSWER1 }})
+                </template>
+                <template v-if="item.QUESTION2">
+                  、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }})
+                </template>
+                -->
               </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>
-              </td>
-              <td>
-                {{ item.CONFIRM_NAME }}
+              <td style="text-align: center;">
+                <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>
               </td>
+              <td style="text-align: center;">{{ item.CONFIRM_NAME }}</td>
             </tr>
             <tr v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES
             || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">

From 5bbe79885f03805b15aa5ce828cd81d99870ed1c Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Wed, 19 Jun 2024 17:27:50 +0800
Subject: [PATCH 15/53] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E5=AE=8C=E5=B7=A5=E9=AA=8C=E6=94=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E5=BC=A0=E7=AD=BE=E5=AD=97=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork_list/components/detail_cfd.vue    | 19 ++++++++---
 src/views/map/dialog/hotworkFirst.vue         | 33 ++++++++++++-------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
index 4aedc93..bc16956 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
@@ -162,10 +162,12 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
+            <div v-for="item in acceptConfessList" :key="item.USER_ID">
+              <div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
+                <span>签字：</span>
+                <img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
+                <span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
+              </div>
             </div>
           </td>
         </tr>
@@ -339,7 +341,16 @@ export default {
             this.confessList.push(item)
           }
         })
+        // data.pd.acceptConfessList.forEach(item => {
+        //   if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+        //     this.acceptConfessList.push(item)
+        //   }
+        // })
         data.pd.acceptConfessList.forEach(item => {
+          // 将 APPROVAL_SIGNATURE 转换为数组
+          if (item.APPROVAL_SIGNATURE) {
+            item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
+          }
           if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
             this.acceptConfessList.push(item)
           }
diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 15da57a..5b79a4e 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -145,10 +145,12 @@
       <tr>
         <td class="bbg-transparent">接受交底人</td>
         <td colspan="10">
-          <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
-            <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
+          <div v-for="item in acceptConfessList" :key="item.USER_ID">
+            <div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
+              <span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
+            </div>
           </div>
         </td>
       </tr>
@@ -184,7 +186,7 @@
       </tr>
       <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+          <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : 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">
@@ -194,7 +196,7 @@
       </tr>
       <tr v-if="pd.BELONGING_SIGNATURE">
         <td colspan="6">
-          <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+          <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
           <div style="text-align: right">
             <span>签字：</span>
             <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@@ -204,7 +206,7 @@
       </tr>
       <tr v-if="pd.LEADER_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
+          <div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : 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">
@@ -214,7 +216,7 @@
       </tr>
       <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+          <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT}}</div>
           <div style="text-align: right">
             <span>签字：</span>
             <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -224,7 +226,7 @@
       </tr>
       <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+          <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT}}</div>
           <div style="text-align: right">
             <span>签字：</span>
             <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -234,7 +236,7 @@
       </tr>
       <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
         <td colspan="6">
-          <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+          <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT}}</div>
           <div style="text-align: right">
             <span>签字：</span>
             <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -244,7 +246,7 @@
       </tr>
       <tr v-if="imgList1.length>0">
         <td colspan="10">
-          <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+          <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT}}</div>
           <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
             <span>签字：</span>
             <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -335,7 +337,16 @@ export default {
             this.confessList.push(item)
           }
         })
+        // data.pd.acceptConfessList.forEach(item => {
+        //   if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+        //     this.acceptConfessList.push(item)
+        //   }
+        // })
         data.pd.acceptConfessList.forEach(item => {
+          // 将 APPROVAL_SIGNATURE 转换为数组
+          if (item.APPROVAL_SIGNATURE) {
+            item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
+          }
           if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
             this.acceptConfessList.push(item)
           }

From 9f0ffebe6fbdbcb57add849509be9098ce573cef Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 21 Jun 2024 17:41:52 +0800
Subject: [PATCH 16/53] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E5=AE=8C=E5=B7=A5=E9=AA=8C=E6=94=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E5=BC=A0=E7=AD=BE=E5=AD=97=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/hotwork/hotwork_list/components/detail_cfd.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
index bc16956..1549ecd 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
@@ -223,7 +223,7 @@
         </tr>
         <tr v-if="pd.LEADER_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>所在单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
+            <div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : 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">

From 5eb8bd04848d36fdb8f0a79fb2bb832b7b16ef3f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 24 Jun 2024 19:47:40 +0800
Subject: [PATCH 17/53] =?UTF-8?q?=E5=B7=A5=E5=8C=A0=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=8F=AD=E7=BA=A7=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyprojects/platformelectronic/index.vue  | 75 ++++++++++++++++---
 src/views/map/components/zhongdian.vue        | 14 ++--
 2 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue
index a7d2cf4..045c281 100644
--- a/src/views/keyprojects/platformelectronic/index.vue
+++ b/src/views/keyprojects/platformelectronic/index.vue
@@ -96,13 +96,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="所属区域" prop="bianjiequyu">
-          <el-select v-model="form.SUOSHUQUYU" placeholder="请选择">
-            <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select v-model="form.SUOSHUQUYU" placeholder="请选择" @change="getSendDic">
+            <el-option v-for="item in statusList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
           </el-select>
         </el-form-item>
         <el-form-item label="边界入侵区域" prop="bianjiequyu">
           <el-select v-model="form.bianjiequyu" multiple placeholder="请选择监理单位" style="width: 100%;">
-            <el-option v-for="item in quyuList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in quyuList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.VIDEO_TYPE===1" label="视频选择">
@@ -126,7 +126,7 @@
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogForm =false">取 消</el-button>
+        <el-button @click="closeDia()">取 消</el-button>
         <el-button type="primary" @click="upload">确 定</el-button>
       </div>
     </el-dialog>
@@ -198,11 +198,7 @@ export default {
       },
       quyuList: [],
       shexiangtouForm: {},
-      statusList: [
-        { id: '0', name: '请选择' },
-        { id: '1', name: '油管区' },
-        { id: '2', name: '码头区' }
-      ]
+      statusList: []
     }
   },
   async created() {
@@ -266,7 +262,7 @@ export default {
       this.msg = 'add'
       this.resetForm()
       this.dialogForm = true
-      // this.$refs.platformvideo.init()
+      this.getDic()
     },
     resetForm() {
       this.shexiangtouForm.LONGITUDE = ''
@@ -312,6 +308,7 @@ export default {
           ).then(async(data) => {
             await this.getAllList()
             this.getList()
+            this.shexiangtouForm = {}
           }).catch((e) => {
             this.listLoading = false
           })
@@ -326,6 +323,7 @@ export default {
     goEdit(row) {
       this.dialogForm = true
       this.listLoading = true
+      this.getDic()
       return new Promise(resolve => {
         requestFN(
           '/platformelectronic/goEdit',
@@ -334,11 +332,13 @@ export default {
           }
         ).then((data) => {
           this.shexiangtouForm = data.pd
+          this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
+          this.getSendDic()
           this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',')
           this.form.CORPINFO_ID = data.pd.CORPINFO_ID
           this.form.VIDEONAME = data.pd.NAME
           this.form.CODE = data.pd.INDEXCODE
-          this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
+
           this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE
           this.listLoading = false
           resolve()
@@ -381,8 +381,8 @@ export default {
     },
     // 获取列表
     setPosition() {
+      // eslint-disable-next-line no-empty
       if (this.shexiangtouForm.PLATFORMELECTRONIC_ID != null) {
-
       }
       this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE
       this.shexiangtouForm.LATITUDE = this.form.LATITUDE
@@ -505,6 +505,57 @@ export default {
     handleBack() {
       this.player.dispose()
       this.dialogVideoHLS = false
+    },
+
+    getDic() { // 获取区域字典信息
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: 'f0bae7becdee4d779a2cb82037948ab4' }
+      ).then((data) => {
+        this.statusList = JSON.parse(data.zTreeNodes)
+        loading.close()
+      }).catch((e) => {
+        loading.close()
+      })
+    },
+    getSendDic() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.form.quyuList = []
+      requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: this.form.SUOSHUQUYU }
+      ).then((data) => {
+        loading.close()
+        this.quyuList = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        loading.close()
+      })
+    },
+    closeDia() {
+      this.dialogForm = false
+      this.form = {
+        CORPINFO_ID: '',
+        bianjiequyu: [],
+        PLATFORMELECTRONIC_ID: '',
+        LONGITUDEANDLATITUDE: '',
+        VIDEOMANAGER_ID: '',
+        VIDEO_RESOURCES_ID: '',
+        VIDEO_TYPE: 1,
+        VIDEONAME: '', //
+        VIDEOURL: '',
+        CODE: '',
+        PLATFORMVIDEOMANAGEMENT_ID: '',
+        LATITUDE: '',
+        LONGITUDE: '',
+        SUOSHUQUYU: ''
+      }
     }
   }
 }
diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue
index fc24fb8..6e1fb57 100644
--- a/src/views/map/components/zhongdian.vue
+++ b/src/views/map/components/zhongdian.vue
@@ -93,7 +93,7 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '监控数量',
+          title: '报警数量',
           img: require('../../../assets/map/zhongdian/ico1.png'),
           count: '-'
         },
@@ -154,12 +154,12 @@ export default {
     },
     initNum() {
       requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId }
-      ).then((data) => {
-        this.block1OptionsList[0].count = data.alarmList.total
-        requestFN('/map/mapPlatformelectronic/listAllLocatio', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' }
-        ).then((data) => {
-          this.block4List = data.alarmList.list
-          this.block1OptionsList[0].count = data.alarmList.total
+      ).then((data0) => {
+        this.block1OptionsList[0].count = data0.alarmList.total
+        requestFN('/map/mapPlatformelectronic/listAllLocation', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' }
+        ).then((data1) => {
+          this.block4List = data0.alarmList.list
+          this.block1OptionsList[0].count = data1.varList.total
         }).catch((e) => {
           this.$message.error(e)
         })

From 1acf73d2cd36b8e651d81d59cc067edd5227f860 Mon Sep 17 00:00:00 2001
From: "1261008090@qq.com" <wangxuan>
Date: Tue, 25 Jun 2024 10:21:35 +0800
Subject: [PATCH 18/53] =?UTF-8?q?=E5=9C=B0=E5=9B=BE/=E9=97=A8=E5=8F=A3?=
 =?UTF-8?q?=E9=97=A8=E7=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/map/gangkou_index/buttom/ico29.png | Bin 0 -> 12362 bytes
 .../map/gangkou_index/buttom/ico29_on.png     | Bin 0 -> 12582 bytes
 src/assets/map/menjin/img3.png                | Bin 0 -> 9360 bytes
 src/assets/map/menjin/img4.png                | Bin 0 -> 9547 bytes
 src/views/map/components/menjin.vue           | 323 ++++++-----
 src/views/map/components/menjin_old.vue       | 546 ++++++++++++++++++
 src/views/map/index.vue                       |  15 +-
 7 files changed, 727 insertions(+), 157 deletions(-)
 create mode 100644 src/assets/map/gangkou_index/buttom/ico29.png
 create mode 100644 src/assets/map/gangkou_index/buttom/ico29_on.png
 create mode 100644 src/assets/map/menjin/img3.png
 create mode 100644 src/assets/map/menjin/img4.png
 create mode 100644 src/views/map/components/menjin_old.vue

diff --git a/src/assets/map/gangkou_index/buttom/ico29.png b/src/assets/map/gangkou_index/buttom/ico29.png
new file mode 100644
index 0000000000000000000000000000000000000000..090a8af5a59f3219f2653b441bc2cda11bfbd7b3
GIT binary patch
literal 12362
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
NE6J(L)=Qg*{U3U|B~kzY

literal 0
HcmV?d00001

diff --git a/src/assets/map/gangkou_index/buttom/ico29_on.png b/src/assets/map/gangkou_index/buttom/ico29_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..23c82f50b8eb910ac988bb43ba52b37f8a02220e
GIT binary patch
literal 12582
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
Z5JWl=tXNN?fBsyMl~j_b5;Ok#e*jXR!fgNm

literal 0
HcmV?d00001

diff --git a/src/assets/map/menjin/img3.png b/src/assets/map/menjin/img3.png
new file mode 100644
index 0000000000000000000000000000000000000000..22091c112b2ba5365eafa7f6c18fb82d08f16e76
GIT binary patch
literal 9360
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
T5|Z}!A0Y)9Rq0AevylG-=--T<

literal 0
HcmV?d00001

diff --git a/src/assets/map/menjin/img4.png b/src/assets/map/menjin/img4.png
new file mode 100644
index 0000000000000000000000000000000000000000..8332cb83805d3955f0c4cfb3f004134aaba18246
GIT binary patch
literal 9547
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
Cvc%p1

literal 0
HcmV?d00001

diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index 406ea55..604b295 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -4,38 +4,23 @@
       <layout-title title="口门统计"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
-          <div class="title active">{{ item.title }}</div>
-          <div class="circular">
+          <div class="img">
             <img :src="item.img" alt="">
           </div>
-          <div class="label">
-            {{ item.label1 }}：
-            <count-to :start-val="0" :end-val="+item.count1" :duration="3600"/>
-          </div>
-          <div v-if="item.label2" class="label">
-            {{ item.label2 }}：
-            <count-to :start-val="0" :end-val="+item.count2" :duration="3600"/>
-          </div>
-          <div v-if="item.label3" class="label">
-            {{ item.label3 }}：
-            <count-to :start-val="0" :end-val="+item.count3" :duration="3600"/>
+          <div class="info">
+            <div>{{ item.label1 }}：{{ item.count1 }}</div>
+            <div>{{ item.label2 }}：{{ item.count2 }}</div>
+            <div>{{ item.label3 }}：{{ item.count3 }}</div>
           </div>
         </div>
       </div>
     </div>
-    <!-- <div class="block2">
-      <layout-title title="口门区域"/>
+    <div class="block2">
+      <layout-title title="进入进出统计"/>
       <div class="options">
-        <div class="bg"/>
-        <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
-          <div class="label">{{ item.title }}：</div>
-          <div class="info">
-            <span class="count"><count-to :start-val="0" :end-val="+item.count" :duration="3600"/></span>
-            <span class="company">{{ item.company }}</span>
-          </div>
-        </div>
+        <div id="main1"/>
       </div>
-    </div> -->
+    </div>
     <div class="block3">
       <layout-title title="口门进出记录"/>
       <div class="content">
@@ -56,8 +41,6 @@
             <div class="td">时间</div>
             <div class="td">状态</div>
             <div class="td">闸机名称</div>
-            <!--<div v-if="block3OptionsIndex == 0" class="td">闸机名称</div>
-            <div v-if="block3OptionsIndex == 1" class="td">来港事由</div>-->
           </div>
           <div v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="scroll">
             <div v-for="(item,index) in block3List" :key="index" class="tr">
@@ -90,7 +73,9 @@
 import layoutTitle from './title.vue'
 import CountTo from 'vue-count-to'
 import { requestFN } from '@/utils/request'
+import * as echarts from 'echarts'
 
+let Echarts1
 export default {
   components: {
     layoutTitle,
@@ -114,62 +99,22 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '人员闸机',
-          img: require('../../../assets/map/menjin/ico1.png'),
-          label1: '今日进数',
+          img: require('../../../assets/map/menjin/img3.png'),
+          label1: '口门数',
           count1: 0,
-          label2: '今日出数',
+          label2: '车门数',
           count2: 0,
-          label3: '今日剩余人数',
+          label3: '人门数',
           count3: 0
         },
         {
-          title: '车辆闸机',
-          img: require('../../../assets/map/menjin/ico2.png'),
-          label1: '今日进数',
+          img: require('../../../assets/map/menjin/img4.png'),
+          label1: '口门数',
           count1: 0,
-          label2: '今日出数',
+          label2: '车门数',
           count2: 0,
-          label3: '今日剩余车数',
+          label3: '人门数',
           count3: 0
-        },
-        {
-          title: '摄像头数',
-          img: require('../../../assets/map/menjin/ico3.png'),
-          label1: '摄像头数',
-          count1: 0
-        }
-      ],
-      block2OptionsList: [
-        {
-          title: '临时人员',
-          count: '2365',
-          company: '条'
-        },
-        {
-          title: '超员警告',
-          count: '2365',
-          company: '条'
-        },
-        {
-          title: 'SOS求救',
-          count: '2365',
-          company: '条'
-        },
-        {
-          title: '离岗告警',
-          count: '2365',
-          company: '条'
-        },
-        {
-          title: '禁止超时',
-          count: '2365',
-          company: '条'
-        },
-        {
-          title: '车辆超速',
-          count: '2365',
-          company: '条'
         }
       ],
       block3OptionsList: ['人员闸机', '车辆闸机'],
@@ -195,31 +140,145 @@ export default {
     this.getMachineTodayInOutCount()
     // this.getDoorManagement()
   },
+
+  mounted() {
+    window.onresize = function() {
+      Echarts1 && Echarts1.resize()
+    }
+    this.initEcharts1()
+  },
+  beforeDestroy() {
+    Echarts1 = null
+  },
   methods: {
+    initEcharts1(data) {
+      const XaxisData = ['1号门', '2号门', '3号门', '4号门']
+      const seriesData1 = [10, 20, 30, 40]
+      const seriesData2 = [10, 20, 30, 40]
+      Echarts1 = echarts.init(document.querySelector('#main1'))
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '2%',
+          right: '4%',
+          bottom: '5%',
+          top: '10%',
+          containLabel: true
+        },
+        legend: {
+          top: '0%',
+          right: '0%',
+          textStyle: {
+            color: '#fff',
+            fontSize: 14
+          },
+          itemWidth: 12,
+          itemHeight: 10
+        },
+        xAxis: {
+          type: 'category',
+          data: XaxisData,
+          axisLine: {
+            lineStyle: {
+              color: '#fff'
+            }
+          },
+          axisLabel: {
+            textStyle: {
+              fontSize: 14
+            }
+          }
+        },
+        yAxis: {
+          type: 'value',
+          max: '150',
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: '#fff'
+            }
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: '#8c9493'
+            }
+          },
+          axisLabel: {
+            textStyle: {
+              fontSize: 14
+            }
+          }
+        },
+        series: [
+          {
+            name: '人员',
+            type: 'bar',
+            barWidth: '10%',
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 0,
+                      color: '#00f0ff'
+                    },
+                    {
+                      offset: 1,
+                      color: '#0066ff'
+                    }
+                  ],
+                  false
+                )
+              }
+            },
+            data: seriesData1
+          },
+          {
+            name: '车辆',
+            type: 'bar',
+            barWidth: '10%',
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 0,
+                      color: '#003cff'
+                    },
+                    {
+                      offset: 1,
+                      color: '#00ff9c'
+                    }
+                  ],
+                  false
+                )
+              }
+            },
+            data: seriesData2
+          }
+        ]
+      }
+      Echarts1.setOption(option)
+    },
     load() {
       this.loading = true
       this.currentPage += 1
       this.loadRecord(this.block3OptionsIndex)
     },
-    getOnlineGateMachine() {
-      requestFN(
-        '/map/getOnlineGateEquipment', {
-          AREA: this.area,
-          CORP_INFO_ID: this.corpInfoId,
-          GANGKOU: this.gangkou
-        }
-      ).then((data) => {
-        this.block1OptionsList[0].count1 = data.pd.PERSON_IN
-        this.block1OptionsList[0].count2 = data.pd.PERSON_OUT
-        this.block1OptionsList[0].count3 = data.pd.PERSON_IN - data.pd.PERSON_OUT
-        this.block1OptionsList[1].count1 = data.pd.CAR_IN
-        this.block1OptionsList[1].count2 = data.pd.CAR_OUT
-        this.block1OptionsList[1].count3 = data.pd.CAR_IN - data.pd.CAR_OUT
-        this.block1OptionsList[2].count1 = data.pd.CAMERA
-      }).catch((e) => {
-        console.log(e)
-      })
-    },
     getMachineTodayInOutCount() {
       requestFN(
         '/map/getMachineTodayInOutCount', {
@@ -356,30 +415,22 @@ export default {
 
       .option {
         display: flex;
-        flex-direction: column;
         align-items: center;
-
-        .circular {
-          margin-top: 5px;
-          background-image: url("../../../assets/map/menjin/img1.png");
-          background-size: 100% 100%;
-          background-repeat: no-repeat;
-          width: 50px;
-          height: 50px;
-          text-align: center;
-          padding-top: 13px;
-
-          img {
-            width: 30px;
-            height: 26px;
-            animation: scale 2s infinite;
+        .img{
+          width: 81px;
+          height: 93px;
+          img{
+            width: 100%;
+            height: 100%;
           }
         }
-
-        .label {
-          margin-top: 5px;
-          font-size: 12px;
+        .info{
+          margin-left: 10px;
+          font-size: 14px;
           color: #fff;
+          div{
+            margin-top: 5px;
+          }
         }
       }
     }
@@ -395,49 +446,9 @@ export default {
       border: 1px solid;
       border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
       border-top: none;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      align-items: center;
-      position: relative;
-      height: 244px;
-
-      .bg {
-        background-image: url("../../../assets/map/menjin/img2.png");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        width: 310px;
-        height: 264px;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%, -50%);
-      }
-
-      .option {
-        flex-basis: 35%;
-        text-align: center;
-
-        .label {
-          font-size: 14px;
-          color: #fff;
-        }
-
-        .info {
-          .count {
-            font-size: 24px;
-            background: linear-gradient(to top, #48bbf0, #ffffff);
-            -webkit-background-clip: text;
-            -webkit-text-fill-color: transparent;
-            font-weight: bold;
-            font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif;
-          }
-
-          .company {
-            font-size: 14px;
-            color: #fff;
-          }
-        }
+      #main1{
+        width: 100%;
+        height: 300px;
       }
     }
   }
diff --git a/src/views/map/components/menjin_old.vue b/src/views/map/components/menjin_old.vue
new file mode 100644
index 0000000..406ea55
--- /dev/null
+++ b/src/views/map/components/menjin_old.vue
@@ -0,0 +1,546 @@
+<template>
+  <div class="menjin">
+    <div class="block1">
+      <layout-title title="口门统计"/>
+      <div class="options">
+        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
+          <div class="title active">{{ item.title }}</div>
+          <div class="circular">
+            <img :src="item.img" alt="">
+          </div>
+          <div class="label">
+            {{ item.label1 }}：
+            <count-to :start-val="0" :end-val="+item.count1" :duration="3600"/>
+          </div>
+          <div v-if="item.label2" class="label">
+            {{ item.label2 }}：
+            <count-to :start-val="0" :end-val="+item.count2" :duration="3600"/>
+          </div>
+          <div v-if="item.label3" class="label">
+            {{ item.label3 }}：
+            <count-to :start-val="0" :end-val="+item.count3" :duration="3600"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- <div class="block2">
+      <layout-title title="口门区域"/>
+      <div class="options">
+        <div class="bg"/>
+        <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
+          <div class="label">{{ item.title }}：</div>
+          <div class="info">
+            <span class="count"><count-to :start-val="0" :end-val="+item.count" :duration="3600"/></span>
+            <span class="company">{{ item.company }}</span>
+          </div>
+        </div>
+      </div>
+    </div> -->
+    <div class="block3">
+      <layout-title title="口门进出记录"/>
+      <div class="content">
+        <div class="options">
+          <div
+            v-for="(item,index) in block3OptionsList"
+            :key="index"
+            :class="['title', {active:index === block3OptionsIndex}]"
+            @click="block3OptionsClick(index)"
+          >
+            {{ item }}
+          </div>
+        </div>
+        <div class="table">
+          <div class="tr">
+            <div v-if="block3OptionsIndex == 0" class="td">人员</div>
+            <div v-if="block3OptionsIndex == 1" class="td">车牌</div>
+            <div class="td">时间</div>
+            <div class="td">状态</div>
+            <div class="td">闸机名称</div>
+            <!--<div v-if="block3OptionsIndex == 0" class="td">闸机名称</div>
+            <div v-if="block3OptionsIndex == 1" class="td">来港事由</div>-->
+          </div>
+          <div v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="scroll">
+            <div v-for="(item,index) in block3List" :key="index" class="tr">
+              <div v-if="block3OptionsIndex == 0" class="td line1">{{ item.USERNAME }}</div>
+              <div v-if="block3OptionsIndex == 1" class="td">{{ item.LICENSE_PLATE }}</div>
+              <div class="td">{{ item.TIME }}</div>
+              <div v-if="block3OptionsIndex == 0" :class="['td',{green:item.STATE == '0'}]">
+                {{ item.STATE == '0' ? '进入' : '出港' }}
+              </div>
+              <div v-if="block3OptionsIndex == 0" :class="['td',{yellow:item.STATE == '0'}]">{{
+                item.EQUIPMENTNAME
+              }}
+              </div>
+              <div v-if="block3OptionsIndex == 1" :class="['td',{green:item.STATE == '4'}]">
+                {{ item.STATE == '0' ? '进场' : '出场' }}
+              </div>
+              <div v-if="block3OptionsIndex == 1" :class="['td',{yellow:item.STATE == '4'}]">{{
+                item.COMING_REASON
+              }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import layoutTitle from './title.vue'
+import CountTo from 'vue-count-to'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: {
+    layoutTitle,
+    CountTo
+  },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    },
+    area: {
+      type: String,
+      default: ''
+    },
+    gangkou: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      block1OptionsList: [
+        {
+          title: '人员闸机',
+          img: require('../../../assets/map/menjin/ico1.png'),
+          label1: '今日进数',
+          count1: 0,
+          label2: '今日出数',
+          count2: 0,
+          label3: '今日剩余人数',
+          count3: 0
+        },
+        {
+          title: '车辆闸机',
+          img: require('../../../assets/map/menjin/ico2.png'),
+          label1: '今日进数',
+          count1: 0,
+          label2: '今日出数',
+          count2: 0,
+          label3: '今日剩余车数',
+          count3: 0
+        },
+        {
+          title: '摄像头数',
+          img: require('../../../assets/map/menjin/ico3.png'),
+          label1: '摄像头数',
+          count1: 0
+        }
+      ],
+      block2OptionsList: [
+        {
+          title: '临时人员',
+          count: '2365',
+          company: '条'
+        },
+        {
+          title: '超员警告',
+          count: '2365',
+          company: '条'
+        },
+        {
+          title: 'SOS求救',
+          count: '2365',
+          company: '条'
+        },
+        {
+          title: '离岗告警',
+          count: '2365',
+          company: '条'
+        },
+        {
+          title: '禁止超时',
+          count: '2365',
+          company: '条'
+        },
+        {
+          title: '车辆超速',
+          count: '2365',
+          company: '条'
+        }
+      ],
+      block3OptionsList: ['人员闸机', '车辆闸机'],
+      block3OptionsIndex: 0,
+      loading: false,
+      currentPage: 1,
+      count: 0,
+      totalPage: 0,
+      block3List: []
+    }
+  },
+  computed: {
+    noMore() {
+      return this.currentPage >= this.totalPage
+    },
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
+  created() {
+    this.getDoorWayRecords(0)
+    this.getOnlineGateMachine()
+    this.getMachineTodayInOutCount()
+    // this.getDoorManagement()
+  },
+  methods: {
+    load() {
+      this.loading = true
+      this.currentPage += 1
+      this.loadRecord(this.block3OptionsIndex)
+    },
+    getOnlineGateMachine() {
+      requestFN(
+        '/map/getOnlineGateEquipment', {
+          AREA: this.area,
+          CORP_INFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou
+        }
+      ).then((data) => {
+        this.block1OptionsList[0].count1 = data.pd.PERSON_IN
+        this.block1OptionsList[0].count2 = data.pd.PERSON_OUT
+        this.block1OptionsList[0].count3 = data.pd.PERSON_IN - data.pd.PERSON_OUT
+        this.block1OptionsList[1].count1 = data.pd.CAR_IN
+        this.block1OptionsList[1].count2 = data.pd.CAR_OUT
+        this.block1OptionsList[1].count3 = data.pd.CAR_IN - data.pd.CAR_OUT
+        this.block1OptionsList[2].count1 = data.pd.CAMERA
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    getMachineTodayInOutCount() {
+      requestFN(
+        '/map/getMachineTodayInOutCount', {
+          AREA: this.area,
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou,
+          id: '7'
+        }
+      ).then((data) => {
+        if (this.gangkou === '00004') {
+
+        } else {
+          this.block2OptionsList = data.varList
+        }
+      })
+    },
+    getDoorManagement() {
+      requestFN(
+        '/map/getDoorManagement', {
+          AREA: this.area,
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou,
+          id: '7'
+        }
+      ).then((data) => {
+        var carin = 0
+        var carout = 0
+        var peosonout = 0
+        var peosonin = 0
+        for (let i = 0; i < data.varList[1].list.length; i++) {
+          if (data.varList[1].list[i].TYPE == 'PERSON_OUT') {
+            // this.block2OptionsList[1].list[1].count = data.varList[1].list[i].count
+            peosonout = data.varList[1].list[i].count
+          }
+          if (data.varList[1].list[i].TYPE == 'PERSON_IN') {
+            // this.block2OptionsList[1].list[0].count = data.varList[1].list[i].count
+            peosonin = data.varList[1].list[i].count
+          }
+          if (data.varList[1].list[i].TYPE == 'CAR_OUT') {
+            // this.block2OptionsList[1].list[4].count = data.varList[1].list[i].count
+            carout = data.varList[1].list[i].count
+          }
+          if (data.varList[1].list[i].TYPE == 'CAR_IN') {
+            // this.block2OptionsList[1].list[3].count = data.varList[1].list[i].count
+            carin = data.varList[1].list[i].count
+          }
+        }
+        for (let i = 0; i < this.block2OptionsList.length; i++) {
+          this.block2OptionsList[i].list[0].count = peosonin
+          this.block2OptionsList[i].list[1].count = peosonout
+          this.block2OptionsList[i].list[2].count = peosonin - peosonout
+          this.block2OptionsList[i].list[3].count = carin
+          this.block2OptionsList[i].list[4].count = carout
+          this.block2OptionsList[i].list[5].count = carin - carout
+        }
+        this.$forceUpdate()
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    loadRecord(index) {
+      this.getDoorWayRecords(index)
+    },
+    block3OptionsClick(index) {
+      this.block3List = []
+      this.block3OptionsIndex = index
+      this.getDoorWayRecords(index)
+    },
+
+    listPerpleCarGateMachine(type) {
+      requestFN(
+        '/map/getCfdDoorWayRecords',
+        {
+          id: '7',
+          TYPE: type
+        }
+      ).then((data) => {
+        this.block3List = data.data
+      }).catch((e) => {
+      })
+    },
+    getDoorWayRecords(index) {
+      requestFN(
+        '/map/getDoorWayRecords?showCount=20&currentPage=' + this.currentPage, {
+          AREA: this.area,
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou,
+          INDEX: index
+        }
+      ).then((data) => {
+        this.block3List = this.block3List.concat(data.varList)
+        this.totalPage = data.page.totalPage
+        this.currentPage = data.page.currentPage
+        this.loading = false
+        this.$forceUpdate()
+      }).catch((e) => {
+        console.log(e)
+        this.loading = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.menjin {
+  .title {
+    background-image: url("../../../assets/map/menjin/title_on.png");
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    width: 113px;
+    height: 26px;
+    font-size: 14px;
+    line-height: 26px;
+    text-align: center;
+    color: #fff;
+
+    &.active {
+      background-image: url("../../../assets/map/menjin/title.png");
+    }
+  }
+
+  .block1 {
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 15px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .circular {
+          margin-top: 5px;
+          background-image: url("../../../assets/map/menjin/img1.png");
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
+          width: 50px;
+          height: 50px;
+          text-align: center;
+          padding-top: 13px;
+
+          img {
+            width: 30px;
+            height: 26px;
+            animation: scale 2s infinite;
+          }
+        }
+
+        .label {
+          margin-top: 5px;
+          font-size: 12px;
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  .block2 {
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+    margin-top: 10px;
+
+    .options {
+      padding: 10px 15px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: center;
+      position: relative;
+      height: 244px;
+
+      .bg {
+        background-image: url("../../../assets/map/menjin/img2.png");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        width: 310px;
+        height: 264px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+      }
+
+      .option {
+        flex-basis: 35%;
+        text-align: center;
+
+        .label {
+          font-size: 14px;
+          color: #fff;
+        }
+
+        .info {
+          .count {
+            font-size: 24px;
+            background: linear-gradient(to top, #48bbf0, #ffffff);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            font-weight: bold;
+            font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif;
+          }
+
+          .company {
+            font-size: 14px;
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+
+  .block3 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+        .scroll {
+          max-height: 200px;
+          overflow-y: auto;
+
+          &::-webkit-scrollbar {
+            width: 5px;
+          }
+
+          &::-webkit-scrollbar-thumb {
+            border-radius: 5px;
+            background: rgba(2, 30, 81, 0.851);
+          }
+
+          &::-webkit-scrollbar-track {
+            border-radius: 5px;
+            background: rgba(255, 255, 255, 0.1);
+          }
+
+          .tr {
+            &:nth-child(odd) {
+              background-color: transparent;
+            }
+          }
+        }
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+
+            &:nth-child(2) {
+              flex-basis: 20%;
+            }
+
+            &:nth-child(3) {
+              flex: none;
+              flex-basis: 50px;
+            }
+
+            &.green {
+              color: #7ccf41;
+            }
+
+            &.yellow {
+              color: #ffcb05;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@keyframes scale {
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(0.8);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+.line1 {
+  width: 150px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 8edbe73..ef19b57 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -725,6 +725,16 @@ export default {
               checkImg: require('../../assets/map/gangkou_index/buttom/ico21_on.png'),
               containAuthorization: [],
               eliminateAuthorization: []
+            },
+            {
+              label: '人员轨迹',
+              dialog_width: '1200px',
+              check: false,
+              type: 'peopleTrajectory',
+              img: require('../../assets/map/gangkou_index/buttom/ico29.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico29_on.png'),
+              containAuthorization: [],
+              eliminateAuthorization: []
             }
             // {
             //   label: '车辆定位',
@@ -1502,7 +1512,7 @@ export default {
           }
           const entity = new Cesium.Entity({
             id: 'trajectory',
-            polyline: { positions, width: 5.0, material: Cesium.Color.RED }
+            polyline: { positions, width: 5.0, material: Cesium.Color.RED, clampToGround: true }
           })
           const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
           collection.entities.add(entity)
@@ -1755,6 +1765,9 @@ export default {
                 cluster.billboard.show = true
                 cluster.billboard.id = cluster.label.id
                 cluster.billboard.verticalOrigin = Cesium.VerticalOrigin.BOTTOM
+                cluster.billboard.horizontalOrigin = Cesium.HorizontalOrigin.CENTER
+                cluster.billboard.heightReference = Cesium.HeightReference.CLAMP_TO_GROUND
+                cluster.billboard.disableDepthTestDistance = Number.POSITIVE_INFINITY
                 if (clusteredEntities.length >= 100) {
                   cluster.billboard.image = pin100
                 } else if (clusteredEntities.length >= 50) {

From 0dd4f970724535d26a9f4c830027d046a5028cbd Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Tue, 25 Jun 2024 14:11:24 +0800
Subject: [PATCH 19/53] =?UTF-8?q?1.=E6=96=AD=E8=B7=AF=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circuit/components/corpInfo.vue           | 128 +++++++
 .../circuit/components/detail.vue             | 279 ++++++++++++++
 .../dangerousWork/circuit/components/list.vue | 359 ++++++++++++++++++
 src/views/dangerousWork/circuit/index.vue     |  23 ++
 4 files changed, 789 insertions(+)
 create mode 100644 src/views/dangerousWork/circuit/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/circuit/components/detail.vue
 create mode 100644 src/views/dangerousWork/circuit/components/list.vue
 create mode 100644 src/views/dangerousWork/circuit/index.vue

diff --git a/src/views/dangerousWork/circuit/components/corpInfo.vue b/src/views/dangerousWork/circuit/components/corpInfo.vue
new file mode 100644
index 0000000..eefa197
--- /dev/null
+++ b/src/views/dangerousWork/circuit/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/dangerousWork/gfcutroad/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/circuit/components/detail.vue b/src/views/dangerousWork/circuit/components/detail.vue
new file mode 100644
index 0000000..d253af5
--- /dev/null
+++ b/src/views/dangerousWork/circuit/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/circuit/components/list.vue b/src/views/dangerousWork/circuit/components/list.vue
new file mode 100644
index 0000000..6241d41
--- /dev/null
+++ b/src/views/dangerousWork/circuit/components/list.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+      </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    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
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/circuit/index.vue b/src/views/dangerousWork/circuit/index.vue
new file mode 100644
index 0000000..0c0ba5e
--- /dev/null
+++ b/src/views/dangerousWork/circuit/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+    <circuitList v-if="activeName=='circuit_list'"/>
+    <Detail v-if="activeName=='Detail'"/>
+  </div>
+</template>
+<script>
+import CorpInfo from './components/corpInfo'
+import circuitList from './components/list'
+import Detail from './components/detail'
+export default {
+  components: { CorpInfo, circuitList,Detail },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: '',
+      CUTROAD_ID: ''
+    }
+  }
+}
+</script>

From a728f33cc1047430315a1edf4febdc3e28461640 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 25 Jun 2024 14:21:58 +0800
Subject: [PATCH 20/53] =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=BB=A5=E5=8F=8A=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/meteorological-history.vue     | 383 ++++++++++++++++++
 .../components/meteorological-list.vue        |  10 +-
 .../keyprojects/meteorological/index.vue      |   7 +-
 3 files changed, 395 insertions(+), 5 deletions(-)
 create mode 100644 src/views/keyprojects/meteorological/components/meteorological-history.vue

diff --git a/src/views/keyprojects/meteorological/components/meteorological-history.vue b/src/views/keyprojects/meteorological/components/meteorological-history.vue
new file mode 100644
index 0000000..253fbb5
--- /dev/null
+++ b/src/views/keyprojects/meteorological/components/meteorological-history.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="100px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="时间">
+            <el-date-picker
+              v-model="dateTimeRange"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button v-waves type="primary" icon="el-icon-search" @click="showAllHistory">
+              搜索
+            </el-button>
+            <el-button v-waves type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+      <div id="echarts1" style="height: 300px;width: 100%;"></div>
+      <div id="echarts2" style="height: 300px;width: 100%;"></div>
+      <div id="echarts3" style="height: 300px;width: 100%;"></div>
+
+      <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="55"
+          align="center"/>
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="OPERATTIME" label="上报时间" />
+        <el-table-column prop="WINDSPEED" label="风速" />
+        <el-table-column prop="WINDDIRECTION" label="风向" />
+        <el-table-column prop="TEMPERATURE" label="温度" />
+
+      </el-table>
+      <div class="page-btn-group" style="margin-bottom: 50px;">
+
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="showHistory" />
+      </div>
+
+    <div class="ui-foot">
+      <el-button plain type="info" @click="goBack">返 回</el-button>
+    </div>
+
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+import * as echarts from 'echarts';
+let echarts1 = null;
+let echarts2 = null;
+let echarts3 = null;
+
+export default {
+  components: {  Pagination },
+  directives: { waves },
+  data() {
+    return {
+      msg: 'add',
+      config: config,
+      listLoading: false,
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      KEYWORDS: '',
+      dateTimeRange: [],
+      dates: [],
+      varList: [],
+      temperature:[], 
+      winddirection:[], 
+      windspeed:[],
+      form: {
+        METEOROLOGICAL_ID: '',
+        EQUIPMENTNAME: '', //
+        EQUIPMENTTYPE: '',
+        PLATFORMMETEOROLOGICAL_ID: '',
+        LATITUDE: '',
+        LONGITUDE: '',
+        TYPE: 1
+      },
+      
+  }
+  },
+  mounted() {
+    this.showHistory()
+    // this.initCharts()
+  },
+  methods: {
+   
+    getRowKey(row) {
+      return row.METEOROLOGICALINFO_ID
+    },
+    initCharts1(temperature, winddirection, windspeed){
+
+      // let base = +new Date(1988, 9, 3);
+      // let oneDay = 24 * 3600 * 1000;
+      // let data = [[base, Math.random() * 300]];
+      // for (let i = 1; i < 20000; i++) {
+      //   let now = new Date((base += oneDay));
+      //   data.push([+now, Math.round((Math.random() - 0.5) * 20 + data[i - 1][1])]);
+      // }
+      console.log(temperature)
+
+      echarts1 = echarts.init(document.querySelector('#echarts1'))
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          position: function (pt) {
+            return [pt[0], '10%'];
+          }
+        },
+        title: {
+          left: 'center',
+          text: '气象设备数据图 - 温度'
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          minInterval: 1,
+          maxInterval: 3600 * 24 * 1000
+
+        },
+        yAxis: {
+          type: 'value',
+          boundaryGap: [0, '80%']
+        },
+        dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 20
+          },
+          {
+            start: 0,
+            end: 20
+          }
+        ],
+        series: [
+          {
+            name: '温度',
+            type: 'line',
+            smooth: true,
+            symbol: 'none',
+            areaStyle: {color: "#42b983"},
+            data: temperature
+          }
+        ]
+      }
+      echarts1.setOption(option)
+    },
+    initCharts2(temperature, winddirection, windspeed){
+
+      console.log(winddirection)
+
+      echarts2 = echarts.init(document.querySelector('#echarts2'))
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          position: function (pt) {
+            return [pt[0], '10%'];
+          }
+        },
+        title: {
+          left: 'center',
+          text: '气象设备数据图 - 风向'
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          minInterval: 1,
+          maxInterval: 3600 * 24 * 1000
+
+        },
+        yAxis: {
+          type: 'value',
+          boundaryGap: [0, '80%']
+        },
+        dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 20
+          },
+          {
+            start: 0,
+            end: 20
+          }
+        ],
+        series: [
+        
+          {
+            name: '风向',
+            type: 'line',
+            smooth: true,
+            symbol: 'none',
+            areaStyle: {color: "#6a87dc"},
+            data: winddirection
+          }
+        ]
+      }
+      echarts2.setOption(option)
+    },
+    initCharts3(temperature, winddirection, windspeed){
+
+    console.log(windspeed)
+
+    echarts3 = echarts.init(document.querySelector('#echarts3'))
+    const option = {
+      tooltip: {
+        trigger: 'axis',
+        position: function (pt) {
+          return [pt[0], '10%'];
+        }
+      },
+      title: {
+        left: 'center',
+        text: '气象设备数据图 - 风速'
+      },
+      xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        minInterval: 1,
+        maxInterval: 3600 * 24 * 1000
+      },
+      yAxis: {
+        type: 'value',
+        boundaryGap: [0, '80%']
+      },
+      dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 20
+          },
+          {
+            start: 0,
+            end: 20
+          }
+        ],
+      series: [
+
+        {
+          name: '风速',
+          type: 'line',
+          smooth: true,
+          symbol: 'none',
+          areaStyle: {color: "#f033a0"},
+          data: windspeed
+        },
+      ]
+    }
+    echarts3.setOption(option)
+  },
+
+    // 显示历史记录
+    showHistory(){
+      this.listLoading = true
+      requestFN(
+        '/meteorologicalinfo/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          CODE: this.$parent.CODE
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.temperature = []
+        this.winddirection = []
+        this.windspeed = []
+        for (let i = 0 ; i < this.varList.length ; i ++){
+          this.temperature.push([this.varList[i].OPERATTIME, this.varList[i].TEMPERATURE])
+          this.winddirection.push([this.varList[i].OPERATTIME, this.varList[i].WINDDIRECTION])
+          this.windspeed.push([this.varList[i].OPERATTIME, this.varList[i].WINDSPEED])
+        }
+        this.initCharts1(this.temperature, this.winddirection, this.windspeed)
+        this.initCharts2(this.temperature, this.winddirection, this.windspeed)
+        this.initCharts3(this.temperature, this.winddirection, this.windspeed)
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    showAllHistory(){
+      if (!this.dateTimeRange){
+        this.showHistory()
+        return
+      }
+      this.listLoading = true
+      requestFN(
+        '/meteorologicalinfo/listAll',
+        {
+          CODE: this.$parent.CODE,
+          START: this.dateTimeRange[0],
+          END: this.dateTimeRange[1]
+        }
+      ).then(async (data) => {
+        this.listLoading = false
+        // data.varList
+        this.temperature = []
+        this.winddirection = []
+        this.windspeed = []
+        for (let i = 0 ; i < data.varList.length ; i ++){
+
+            this.temperature.push([data.varList[i].AGGREGATE_TIME, data.varList[i].AVG_TEMPERATURE])
+            this.winddirection.push([data.varList[i].AGGREGATE_TIME, data.varList[i].AVG_WINDDIRECTION])
+            this.windspeed.push([data.varList[i].AGGREGATE_TIME, data.varList[i].AVG_WINDSPEED])
+
+        }
+        this.initCharts1(this.temperature, this.winddirection, this.windspeed)
+        this.initCharts2(this.temperature, this.winddirection, this.windspeed)
+        this.initCharts3(this.temperature, this.winddirection, this.windspeed)
+
+        // this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    dateToTimestamp(dateString) {
+        var date = new Date(dateString);
+        // 返回时间戳，单位为秒
+        return Math.round(date.getTime() / 1000);
+    },
+    
+    goKeyReset() {
+      this.dateTimeRange = []
+      this.showHistory()
+    },
+    resetForm() {
+      this.form = {
+        METEOROLOGICAL_ID: '',
+        TYPE: '1',
+        EQUIPMENTNAME: '', //
+        EQUIPMENTTYPE: '',
+        PLATFORMMETEOROLOGICAL_ID: '',
+        LATITUDE: '',
+        LONGITUDE: ''
+      }
+    },
+    goBack() {
+      this.$parent.activeName = 'meteorologicalList'
+      this.$parent.CODE = ''
+    }
+  }
+
+}
+
+</script>
+<style>
+.hide .el-upload--picture-card {
+  display: none;
+}
+  #map{
+    width: 1000px;
+    height: 500px;
+  }
+</style>
diff --git a/src/views/keyprojects/meteorological/components/meteorological-list.vue b/src/views/keyprojects/meteorological/components/meteorological-list.vue
index 142b68a..45a1c43 100644
--- a/src/views/keyprojects/meteorological/components/meteorological-list.vue
+++ b/src/views/keyprojects/meteorological/components/meteorological-list.vue
@@ -39,11 +39,11 @@
           <span v-else>未定位</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" width="300">
+      <el-table-column label="操作" align="left" width="400">
         <template slot-scope="{row}">
           <!--          <el-button type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button>-->
           <el-button type="info" icon="el-icon-location-information" size="mini" @click="handleMap(row)">定位</el-button>
-          <!--          <el-button v-show="!row.PLATFORMMETEOROLOGICAL_ID" type="warning" icon="el-icon-caret-right" size="mini" @click="showVideoBack(row.EQUIPMENTTYPE)">回放</el-button>-->
+          <el-button type="success" icon="el-icon-caret-right" size="mini" @click="showHistory(row.CODE)">历史记录</el-button>
           <!--          <el-button v-show="row.PLATFORMMETEOROLOGICAL_ID" type="warning" size="mini" @click="getRTSP(row)">获取rtsp地址</el-button>-->
           <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.METEOROLOGICAL_ID)">编辑</el-button>
           <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="handleDelete(row.METEOROLOGICAL_ID)">删除</el-button>
@@ -367,7 +367,11 @@ export default {
       this.EQUIPMENTTYPE = path.replace('play.html', 'playback.html')
       this.dialogVideoBack = true
     },
-
+    // 显示历史记录
+    showHistory(id){
+      this.$parent.CODE = id
+      this.$parent.activeName = 'meteorologicalHistory'
+    },
     showAll() {
       const _selectData = this.$refs.multipleTable.selection
       if (_selectData == null || _selectData.length == 0) {
diff --git a/src/views/keyprojects/meteorological/index.vue b/src/views/keyprojects/meteorological/index.vue
index 8318a1e..d6b61af 100644
--- a/src/views/keyprojects/meteorological/index.vue
+++ b/src/views/keyprojects/meteorological/index.vue
@@ -7,16 +7,19 @@
 <script>
 import List from './components/list'
 import meteorologicalList from './components/meteorological-list'
+import meteorologicalHistory from './components/meteorological-history'
 
 export default {
   components: {
     List: List,
-    meteorologicalList: meteorologicalList
+    meteorologicalList: meteorologicalList,
+    meteorologicalHistory: meteorologicalHistory,
   },
   data() {
     return {
       activeName: 'List',
-      CORPINFO_ID: ''
+      CORPINFO_ID: '',
+      CODE: ''
     }
   }
 }

From b7a09e54bbea79f85c8184823aadd5f2778d3e78 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 25 Jun 2024 14:36:32 +0800
Subject: [PATCH 21/53] =?UTF-8?q?=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB=E5=AD=97...=20:=20(?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../primarygatemanager/gatebaseinfo/components/channel.vue    | 4 ++--
 .../primarygatemanager/gatebaseinfo/components/list.vue       | 4 ++--
 .../gatestatistics/components/areaStatistics.vue              | 2 +-
 .../gatestatistics/components/passageStatistics.vue           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue
index 193b4b7..9ff4022 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue
@@ -46,7 +46,7 @@
           <el-table-column label="通道类型">
             <template slot-scope="{row}">
               <span v-if="row.PASSAGE_TYPE==1">人行通道</span>
-              <span v-if="row.PASSAGE_TYPE==2">车型通道</span>
+              <span v-if="row.PASSAGE_TYPE==2">车行通道</span>
               <span v-if="row.PASSAGE_TYPE==3">综合通道</span>
             </template>
           </el-table-column>
@@ -178,7 +178,7 @@ export default {
       ],
       passageTypeList: [
         { value: '1', label: '人行通道' },
-        { value: '2', label: '车型通道' },
+        { value: '2', label: '车行通道' },
         { value: '3', label: '综合通道' }
       ],
       addDialog: {
diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue
index 9f8db0e..8f32be1 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue
@@ -54,7 +54,7 @@
           <el-table-column label="口门类型">
             <template slot-scope="{row}">
               <span v-if="row.AREA_TYPE==1">人行口门</span>
-              <span v-if="row.AREA_TYPE==2">车型口门</span>
+              <span v-if="row.AREA_TYPE==2">车行口门</span>
               <span v-if="row.AREA_TYPE==3">综合口门</span>
             </template>
           </el-table-column>
@@ -212,7 +212,7 @@ export default {
       ],
       areaTypeList: [
         { value: '1', label: '人行口门' },
-        { value: '2', label: '车型口门' },
+        { value: '2', label: '车行口门' },
         { value: '3', label: '综合口门' }
       ],
       addDialog: {
diff --git a/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue b/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue
index 9c87815..fb0b9bd 100644
--- a/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue
+++ b/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue
@@ -21,7 +21,7 @@
           <el-table-column label="口门类型" align="center">
             <template slot-scope="{row}">
               <span v-if="row.AREA_TYPE==1">人行口门</span>
-              <span v-if="row.AREA_TYPE==2">车型口门</span>
+              <span v-if="row.AREA_TYPE==2">车行口门</span>
               <span v-if="row.AREA_TYPE==3">综合口门</span>
             </template>
           </el-table-column>
diff --git a/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue b/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue
index 95c1d81..7d7353a 100644
--- a/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue
+++ b/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue
@@ -22,7 +22,7 @@
           <el-table-column prop="PASSAGE_TYPE" label="通道类型" align="center">
             <template slot-scope="{row}">
               <span v-if="row.PASSAGE_TYPE==1">人行通道</span>
-              <span v-if="row.PASSAGE_TYPE==2">车型通道</span>
+              <span v-if="row.PASSAGE_TYPE==2">车行通道</span>
               <span v-if="row.PASSAGE_TYPE==3">综合通道</span>
             </template>
           </el-table-column>

From 9c123a62a39c1f1de4ad794247cf09808624d478 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Tue, 25 Jun 2024 17:24:19 +0800
Subject: [PATCH 22/53] =?UTF-8?q?1.=E7=9B=B2=E6=9D=BF=E4=BD=9C=E4=B8=9A,?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86,=E7=A7=BB=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 .../blindboard/components/corpInfo.vue        | 128 ++++++
 .../blindboard/components/detail.vue          | 279 +++++++++++++
 .../blindboard/components/list.vue            | 369 ++++++++++++++++++
 src/views/dangerousWork/blindboard/index.vue  |  23 ++
 5 files changed, 800 insertions(+), 1 deletion(-)
 create mode 100644 src/views/dangerousWork/blindboard/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/blindboard/components/detail.vue
 create mode 100644 src/views/dangerousWork/blindboard/components/list.vue
 create mode 100644 src/views/dangerousWork/blindboard/index.vue

diff --git a/package.json b/package.json
index f53bc1e..5b8832d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.247",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.105",
     "start": "npm run dev",
     "unit": "jest --config test/unit/jest.conf.js --coverage",
     "e2e": "node test/e2e/runner.js",
diff --git a/src/views/dangerousWork/blindboard/components/corpInfo.vue b/src/views/dangerousWork/blindboard/components/corpInfo.vue
new file mode 100644
index 0000000..44db46b
--- /dev/null
+++ b/src/views/dangerousWork/blindboard/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索222
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/dangerousWork/gfBlindBoard/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/blindboard/components/detail.vue b/src/views/dangerousWork/blindboard/components/detail.vue
new file mode 100644
index 0000000..d253af5
--- /dev/null
+++ b/src/views/dangerousWork/blindboard/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/blindboard/components/list.vue b/src/views/dangerousWork/blindboard/components/list.vue
new file mode 100644
index 0000000..aa90270
--- /dev/null
+++ b/src/views/dangerousWork/blindboard/components/list.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/gfCutRoad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.cutroadfhadminadd		// 新增权限
+        this.del = data.cutroadfhadmindel		// 删除权限
+        this.edit = data.cutroadfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    goDetail(id) {
+      this.$parent.activeName = 'Detail'
+      this.$parent.CUTROAD_ID = id
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/blindboard/index.vue b/src/views/dangerousWork/blindboard/index.vue
new file mode 100644
index 0000000..17f8ac2
--- /dev/null
+++ b/src/views/dangerousWork/blindboard/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+    <Blindboard v-if="activeName=='Blindboard'"/>
+    <Detail v-if="activeName=='Detail'"/>
+  </div>
+</template>
+<script>
+import CorpInfo from './components/corpInfo'
+import Blindboard from './components/list'
+import Detail from './components/detail'
+export default {
+  components: { CorpInfo, Blindboard,Detail },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: '',
+      CUTROAD_ID: ''
+    }
+  }
+}
+</script>

From a78960d1071d3a00e16597882f0fef8b0fbff2c3 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 25 Jun 2024 17:55:04 +0800
Subject: [PATCH 23/53] =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9C=B0=E5=9B=BE=E7=9B=91=E7=AE=A1=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/zhongdian.vue | 215 +++++++++++++++----------
 1 file changed, 126 insertions(+), 89 deletions(-)

diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue
index 6e1fb57..79afba2 100644
--- a/src/views/map/components/zhongdian.vue
+++ b/src/views/map/components/zhongdian.vue
@@ -14,35 +14,10 @@
         </div>
       </div>
     </div>
-    <div v-if="false" class="block2">
-      <layout-title title="区域报警数"/>
+    <div class="block2">
+      <layout-title title="区域摄像头数量"/>
       <div class="options">
-        <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
-          <div class="circular"><img :src="item.img" alt=""></div>
-          <div class="info">
-            <div class="title">{{ item.label }}</div>
-            <div class="count"> <count-to :start-val="0" :end-val="+item.count" :duration="3600"/></div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="false" class="block3">
-      <layout-title title="安全管理记录"/>
-      <div class="content">
-        <div class="table">
-          <div class="tr">
-            <div class="td">公司名称</div>
-            <div class="td">创建数</div>
-            <div class="td">检查次数</div>
-            <div class="td">隐患数量</div>
-          </div>
-          <div v-for="(item,index) in block3List" :key="index" class="tr">
-            <div class="td">{{ item.CORP_NAME }}</div>
-            <div class="td">{{ item.OUTSOURCED_COUNT }}</div>
-            <div class="td">{{ item.CHECK_COUNT }}</div>
-            <div class="td">{{ item.HIDDEN_COUNT }}</div>
-          </div>
-        </div>
+        <div id="main1"/>
       </div>
     </div>
     <div class="block4">
@@ -69,7 +44,9 @@
 import layoutTitle from './title.vue'
 import CountTo from 'vue-count-to'
 import { requestFN } from '@/utils/request'
+import * as echarts from 'echarts'
 
+let Echarts1
 export default {
   components: {
     CountTo,
@@ -131,6 +108,12 @@ export default {
   mounted() {
     this.initNum()
     this.initgetTable()
+    window.onresize = function() {
+      Echarts1 && Echarts1.resize()
+    }
+  },
+  beforeDestroy() {
+    Echarts1 = null
   },
   methods: {
     getCount() {
@@ -153,13 +136,14 @@ export default {
       })
     },
     initNum() {
-      requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId }
+      requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId, source: '0' }
       ).then((data0) => {
-        this.block1OptionsList[0].count = data0.alarmList.total
+        this.block1OptionsList[0].count = data0.alarmList.page.total
         requestFN('/map/mapPlatformelectronic/listAllLocation', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' }
         ).then((data1) => {
           this.block4List = data0.alarmList.list
-          this.block1OptionsList[0].count = data1.varList.total
+          this.block1OptionsList[1].count = data1.varList.length
+          this.initEcharts1(data1.iconData)
         }).catch((e) => {
           this.$message.error(e)
         })
@@ -178,6 +162,112 @@ export default {
       ).then((data) => {
         this.block3List = data.varList
       })
+    },
+    initEcharts1(data) {
+      console.log(data)
+      const XaxisData = []
+      const seriesData1 = []
+      for (const optionKey in data) {
+        console.log(data[optionKey])
+        for (let i = 0; i < data[optionKey].length; i++) {
+          console.log(data[optionKey][i])
+          XaxisData.push(data[optionKey][i].NAME)
+          seriesData1.push(data[optionKey][i].num)
+        }
+      }
+
+      // eslint-disable-next-line no-undef
+      Echarts1 = echarts.init(document.querySelector('#main1'))
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '2%',
+          right: '4%',
+          bottom: '5%',
+          top: '12%',
+          containLabel: true
+        },
+        legend: {
+          top: '0%',
+          right: '0%',
+          textStyle: {
+            color: '#fff',
+            fontSize: 14
+          },
+          itemWidth: 12,
+          itemHeight: 10
+        },
+        xAxis: {
+          type: 'category',
+          data: XaxisData,
+          axisLine: {
+            lineStyle: {
+              color: '#fff'
+            }
+          },
+          axisLabel: {
+            textStyle: {
+              fontSize: 12
+            }
+          }
+        },
+        yAxis: {
+          type: 'value',
+          max: '50',
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: '#fff'
+            }
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: '#8c9493'
+            }
+          },
+          axisLabel: {
+            textStyle: {
+              fontSize: 14
+            }
+          }
+        },
+        series: [
+          {
+            name: '摄像头',
+            type: 'bar',
+            barWidth: '10%',
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 0,
+                      color: '#00f0ff'
+                    },
+                    {
+                      offset: 1,
+                      color: '#0066ff'
+                    }
+                  ],
+                  false
+                )
+              }
+            },
+            data: seriesData1
+          }
+        ]
+      }
+      Echarts1.setOption(option)
     }
   }
 }
@@ -263,6 +353,7 @@ export default {
       }
     }
   }
+
   .block2 {
     width: 410px;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
@@ -273,66 +364,11 @@ export default {
       border: 1px solid;
       border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
       border-top: none;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      align-items: center;
-      position: relative;
-      height: 150px;
-
-      .option{
-        width: 50%;
-        display: flex;
-        align-items: center;
-
-        justify-content: space-around;
-        .circular {
-          margin-top: 5px;
-          background-image: url("../../../assets/map/anquan/icobg.png");
-          background-size: 100% 100%;
-          background-repeat: no-repeat;
-          width: 70px;
-          height: 70px;
-          text-align: center;
-          padding-top: 13px;
-
-          img {
-            width: 25px;
-            height: 26px;
-            animation: slideY 2s infinite;
-          }
-        }
-
-        .info{
-          flex: 1;
-          text-align: center;
-
-          .title{
-            background-image: url("../../../assets/map/anquan/label.png");
-            background-size: 100% 100%;
-            background-repeat: no-repeat;
-            width: 120px;
-            height: 24px;
-            margin-top: 5px;
-            font-size: 12px;
-            line-height: 25px;
-            text-align: center;
-            color: #fff;
-          }
-          .count{
-            margin-top: 10px;
-            font-size: 24px;
-            background: linear-gradient(to top, #48bbf0, #ffffff);
-            -webkit-background-clip: text;
-            -webkit-text-fill-color: transparent;
-            font-weight: bold;
-            font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif;
-
-          }
-        }
 
+      #main1 {
+        width: 100%;
+        height: 250px;
       }
-
     }
   }
 
@@ -432,6 +468,7 @@ export default {
     transform: scale(0.9);
   }
 }
+
 @keyframes slideY {
   0% {
     transform: translateY(0);

From 3d834d7b6aa6833899068e155b547bdd459f4671 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 26 Jun 2024 10:51:03 +0800
Subject: [PATCH 24/53] =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=9B=BE=E8=A1=A8=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meteorological/components/meteorological-history.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/keyprojects/meteorological/components/meteorological-history.vue b/src/views/keyprojects/meteorological/components/meteorological-history.vue
index 253fbb5..5dbc97f 100644
--- a/src/views/keyprojects/meteorological/components/meteorological-history.vue
+++ b/src/views/keyprojects/meteorological/components/meteorological-history.vue
@@ -290,7 +290,7 @@ export default {
         }
       ).then((data) => {
         this.listLoading = false
-        this.varList = data.varList
+        this.varList = data.varList.reverse()
         this.temperature = []
         this.winddirection = []
         this.windspeed = []

From 50025690f0d537e5de8987e07653fdc91aad3280 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 26 Jun 2024 10:51:47 +0800
Subject: [PATCH 25/53] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE-=E5=8F=A3=E9=97=A8=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=AA=97=E5=8F=A31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjin.vue | 34 +++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index 604b295..80ff49e 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -102,18 +102,18 @@ export default {
           img: require('../../../assets/map/menjin/img3.png'),
           label1: '口门数',
           count1: 0,
-          label2: '车门数',
+          label2: '车闸机数',
           count2: 0,
-          label3: '人门数',
+          label3: '人闸机数',
           count3: 0
         },
         {
           img: require('../../../assets/map/menjin/img4.png'),
           label1: '口门数',
           count1: 0,
-          label2: '车门数',
+          label2: '车闸机数',
           count2: 0,
-          label3: '人门数',
+          label3: '人闸机数',
           count3: 0
         }
       ],
@@ -295,6 +295,32 @@ export default {
         }
       })
     },
+
+    getOnlineGateMachine() {
+      requestFN(
+        '/map/getOnlineGateMachine', {
+          AREA: this.area,
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou,
+        }
+      ).then((data) => {
+        data.varList.forEach(e => {
+          if (e.AREA_PARENT_ID == '393705'){
+            // 东港区
+            this.block1OptionsList[0].count1 = e.AREA_COUNT
+            this.block1OptionsList[0].count2 = e.CAR
+            this.block1OptionsList[0].count3 = e.PEOPLE
+          }else if (e.AREA_PARENT_ID == '371709'){
+            // 西港区
+            this.block1OptionsList[1].count1 = e.AREA_COUNT
+            this.block1OptionsList[1].count2 = e.CAR
+            this.block1OptionsList[1].count3 = e.PEOPLE
+          }
+
+        });
+
+      })
+    },
     getDoorManagement() {
       requestFN(
         '/map/getDoorManagement', {

From 33312767b7dfba0b08cd93031bf8103316bcf028 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 26 Jun 2024 15:14:24 +0800
Subject: [PATCH 26/53] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9C=B0=E5=9B=BE=E8=BF=9B=E5=85=A5=E8=BF=9B?=
 =?UTF-8?q?=E5=87=BA=E7=BB=9F=E8=AE=A1=E5=B0=8F=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjin.vue | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index 80ff49e..c4b4e17 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -137,7 +137,7 @@ export default {
   created() {
     this.getDoorWayRecords(0)
     this.getOnlineGateMachine()
-    this.getMachineTodayInOutCount()
+    this.getMkmjGateStatistics()
     // this.getDoorManagement()
   },
 
@@ -152,9 +152,16 @@ export default {
   },
   methods: {
     initEcharts1(data) {
-      const XaxisData = ['1号门', '2号门', '3号门', '4号门']
-      const seriesData1 = [10, 20, 30, 40]
-      const seriesData2 = [10, 20, 30, 40]
+      const XaxisData = []
+      const seriesData1 = []
+      const seriesData2 = []
+
+      data.forEach(e => {
+        XaxisData.push(e.AREA_NAME)
+        seriesData1.push(e.CAR_IN + 0 + e.PEOPLE_IN)
+        seriesData2.push(e.CAR_OUT + 0 + e.PEOPLE_OUT)
+      });
+
       Echarts1 = echarts.init(document.querySelector('#main1'))
       const option = {
         tooltip: {
@@ -196,7 +203,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          max: '150',
+          // max: '150',
           axisLine: {
             show: false,
             lineStyle: {
@@ -217,9 +224,9 @@ export default {
         },
         series: [
           {
-            name: '人员',
+            name: '进',
             type: 'bar',
-            barWidth: '10%',
+            barWidth: '30%',
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(
@@ -244,9 +251,9 @@ export default {
             data: seriesData1
           },
           {
-            name: '车辆',
+            name: '出',
             type: 'bar',
-            barWidth: '10%',
+            barWidth: '30%',
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(
@@ -279,20 +286,13 @@ export default {
       this.currentPage += 1
       this.loadRecord(this.block3OptionsIndex)
     },
-    getMachineTodayInOutCount() {
+    getMkmjGateStatistics() {
       requestFN(
-        '/map/getMachineTodayInOutCount', {
-          AREA: this.area,
-          CORPINFO_ID: this.corpInfoId,
-          GANGKOU: this.gangkou,
-          id: '7'
+        '/mkmjGateStatistics/page?showCount=100&currentPage=1', {
+
         }
       ).then((data) => {
-        if (this.gangkou === '00004') {
-
-        } else {
-          this.block2OptionsList = data.varList
-        }
+        this.initEcharts1(data.varList)
       })
     },
 

From c2ef837d933cd3d0deb816a603beb91a4eb5f636 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 26 Jun 2024 15:16:36 +0800
Subject: [PATCH 27/53] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B0=8F=E7=AA=97=E5=8F=A3=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index c4b4e17..5cbdd89 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -292,7 +292,7 @@ export default {
 
         }
       ).then((data) => {
-        this.initEcharts1(data.varList)
+        this.initEcharts1(data.varList.reverse())
       })
     },
 

From 101d0fac70e551f027f9f5f231f4dee9d61c87ba Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 27 Jun 2024 09:29:00 +0800
Subject: [PATCH 28/53] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9C=B0=E5=9B=BE=E8=BF=9B=E5=85=A5=E8=BF=9B?=
 =?UTF-8?q?=E5=87=BA=E7=BB=9F=E8=AE=A1=E5=B0=8F=E7=AA=97=E5=8F=A3=E4=B8=9C?=
 =?UTF-8?q?=E8=A5=BF=E6=B8=AF=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index 5cbdd89..e3c046e 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -289,7 +289,7 @@ export default {
     getMkmjGateStatistics() {
       requestFN(
         '/mkmjGateStatistics/page?showCount=100&currentPage=1', {
-
+          AREA: this.area
         }
       ).then((data) => {
         this.initEcharts1(data.varList.reverse())

From 908bd4b53c7efc7ca55ae07b4aa46e8378bf76fe Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 10:40:42 +0800
Subject: [PATCH 29/53] =?UTF-8?q?1.=E6=B6=88=E9=98=B2=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarm/alarmDeviceMaintenance/components/list.vue          | 2 +-
 .../{ => firefighting}/alarm/alarmDeviceMaintenance/index.vue | 0
 .../alarm/alarmInfomation/components/infoList.vue             | 2 +-
 .../alarm/alarmInfomation/components/list.vue                 | 2 +-
 src/views/{ => firefighting}/alarm/alarmInfomation/index.vue  | 0
 .../alarm/alarmVideo/components/alarmInfoList.vue             | 2 +-
 .../{ => firefighting}/alarm/alarmVideo/components/list.vue   | 2 +-
 .../alarm/alarmVideo/components/videoList.vue                 | 0
 src/views/{ => firefighting}/alarm/alarmVideo/index.vue       | 0
 src/views/firefighting/alarm/index.vue                        | 4 ++++
 .../fireReport/components/fireControlRoom.vue                 | 2 +-
 .../{ => firecontrol}/fireReport/components/firePumpRoom.vue  | 2 +-
 .../{ => firecontrol}/fireReport/components/fireResources.vue | 2 +-
 .../{ => firecontrol}/fireReport/components/list.vue          | 0
 src/views/firefighting/{ => firecontrol}/fireReport/index.vue | 0
 .../{ => firecontrol}/firecontrolroom/components/list.vue     | 0
 .../firefighting/{ => firecontrol}/firecontrolroom/index.vue  | 0
 .../{ => firecontrol}/firepumproom/components/list.vue        | 2 +-
 .../firefighting/{ => firecontrol}/firepumproom/index.vue     | 0
 .../{ => firecontrol}/firerescueteam/components/list.vue      | 2 +-
 .../firefighting/{ => firecontrol}/firerescueteam/index.vue   | 0
 .../{ => firecontrol}/fireresources/components/list.vue       | 2 +-
 .../firefighting/{ => firecontrol}/fireresources/index.vue    | 0
 .../{ => firecontrol}/firewatersource/components/list.vue     | 2 +-
 .../firefighting/{ => firecontrol}/firewatersource/index.vue  | 0
 src/views/firefighting/firecontrol/index.vue                  | 4 ++++
 26 files changed, 20 insertions(+), 12 deletions(-)
 rename src/views/{ => firefighting}/alarm/alarmDeviceMaintenance/components/list.vue (99%)
 rename src/views/{ => firefighting}/alarm/alarmDeviceMaintenance/index.vue (100%)
 rename src/views/{ => firefighting}/alarm/alarmInfomation/components/infoList.vue (99%)
 rename src/views/{ => firefighting}/alarm/alarmInfomation/components/list.vue (99%)
 rename src/views/{ => firefighting}/alarm/alarmInfomation/index.vue (100%)
 rename src/views/{ => firefighting}/alarm/alarmVideo/components/alarmInfoList.vue (99%)
 rename src/views/{ => firefighting}/alarm/alarmVideo/components/list.vue (99%)
 rename src/views/{ => firefighting}/alarm/alarmVideo/components/videoList.vue (100%)
 rename src/views/{ => firefighting}/alarm/alarmVideo/index.vue (100%)
 create mode 100644 src/views/firefighting/alarm/index.vue
 rename src/views/firefighting/{ => firecontrol}/fireReport/components/fireControlRoom.vue (98%)
 rename src/views/firefighting/{ => firecontrol}/fireReport/components/firePumpRoom.vue (98%)
 rename src/views/firefighting/{ => firecontrol}/fireReport/components/fireResources.vue (98%)
 rename src/views/firefighting/{ => firecontrol}/fireReport/components/list.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/fireReport/index.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/firecontrolroom/components/list.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/firecontrolroom/index.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/firepumproom/components/list.vue (99%)
 rename src/views/firefighting/{ => firecontrol}/firepumproom/index.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/firerescueteam/components/list.vue (99%)
 rename src/views/firefighting/{ => firecontrol}/firerescueteam/index.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/fireresources/components/list.vue (99%)
 rename src/views/firefighting/{ => firecontrol}/fireresources/index.vue (100%)
 rename src/views/firefighting/{ => firecontrol}/firewatersource/components/list.vue (99%)
 rename src/views/firefighting/{ => firecontrol}/firewatersource/index.vue (100%)
 create mode 100644 src/views/firefighting/firecontrol/index.vue

diff --git a/src/views/alarm/alarmDeviceMaintenance/components/list.vue b/src/views/firefighting/alarm/alarmDeviceMaintenance/components/list.vue
similarity index 99%
rename from src/views/alarm/alarmDeviceMaintenance/components/list.vue
rename to src/views/firefighting/alarm/alarmDeviceMaintenance/components/list.vue
index 8b35795..a63dd8f 100644
--- a/src/views/alarm/alarmDeviceMaintenance/components/list.vue
+++ b/src/views/firefighting/alarm/alarmDeviceMaintenance/components/list.vue
@@ -222,7 +222,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {
diff --git a/src/views/alarm/alarmDeviceMaintenance/index.vue b/src/views/firefighting/alarm/alarmDeviceMaintenance/index.vue
similarity index 100%
rename from src/views/alarm/alarmDeviceMaintenance/index.vue
rename to src/views/firefighting/alarm/alarmDeviceMaintenance/index.vue
diff --git a/src/views/alarm/alarmInfomation/components/infoList.vue b/src/views/firefighting/alarm/alarmInfomation/components/infoList.vue
similarity index 99%
rename from src/views/alarm/alarmInfomation/components/infoList.vue
rename to src/views/firefighting/alarm/alarmInfomation/components/infoList.vue
index cbeaf18..1f0690f 100644
--- a/src/views/alarm/alarmInfomation/components/infoList.vue
+++ b/src/views/firefighting/alarm/alarmInfomation/components/infoList.vue
@@ -191,7 +191,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {
diff --git a/src/views/alarm/alarmInfomation/components/list.vue b/src/views/firefighting/alarm/alarmInfomation/components/list.vue
similarity index 99%
rename from src/views/alarm/alarmInfomation/components/list.vue
rename to src/views/firefighting/alarm/alarmInfomation/components/list.vue
index 309c6e5..2fccf4b 100644
--- a/src/views/alarm/alarmInfomation/components/list.vue
+++ b/src/views/firefighting/alarm/alarmInfomation/components/list.vue
@@ -193,7 +193,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {
diff --git a/src/views/alarm/alarmInfomation/index.vue b/src/views/firefighting/alarm/alarmInfomation/index.vue
similarity index 100%
rename from src/views/alarm/alarmInfomation/index.vue
rename to src/views/firefighting/alarm/alarmInfomation/index.vue
diff --git a/src/views/alarm/alarmVideo/components/alarmInfoList.vue b/src/views/firefighting/alarm/alarmVideo/components/alarmInfoList.vue
similarity index 99%
rename from src/views/alarm/alarmVideo/components/alarmInfoList.vue
rename to src/views/firefighting/alarm/alarmVideo/components/alarmInfoList.vue
index 1053f71..9a5380d 100644
--- a/src/views/alarm/alarmVideo/components/alarmInfoList.vue
+++ b/src/views/firefighting/alarm/alarmVideo/components/alarmInfoList.vue
@@ -130,7 +130,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {
diff --git a/src/views/alarm/alarmVideo/components/list.vue b/src/views/firefighting/alarm/alarmVideo/components/list.vue
similarity index 99%
rename from src/views/alarm/alarmVideo/components/list.vue
rename to src/views/firefighting/alarm/alarmVideo/components/list.vue
index 313d924..de112dd 100644
--- a/src/views/alarm/alarmVideo/components/list.vue
+++ b/src/views/firefighting/alarm/alarmVideo/components/list.vue
@@ -193,7 +193,7 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 import SelectTree from '@/components/SelectTree'
 
 export default {
diff --git a/src/views/alarm/alarmVideo/components/videoList.vue b/src/views/firefighting/alarm/alarmVideo/components/videoList.vue
similarity index 100%
rename from src/views/alarm/alarmVideo/components/videoList.vue
rename to src/views/firefighting/alarm/alarmVideo/components/videoList.vue
diff --git a/src/views/alarm/alarmVideo/index.vue b/src/views/firefighting/alarm/alarmVideo/index.vue
similarity index 100%
rename from src/views/alarm/alarmVideo/index.vue
rename to src/views/firefighting/alarm/alarmVideo/index.vue
diff --git a/src/views/firefighting/alarm/index.vue b/src/views/firefighting/alarm/index.vue
new file mode 100644
index 0000000..36420c5
--- /dev/null
+++ b/src/views/firefighting/alarm/index.vue
@@ -0,0 +1,4 @@
+<template>
+  <router-view/>
+</template>
+
diff --git a/src/views/firefighting/fireReport/components/fireControlRoom.vue b/src/views/firefighting/firecontrol/fireReport/components/fireControlRoom.vue
similarity index 98%
rename from src/views/firefighting/fireReport/components/fireControlRoom.vue
rename to src/views/firefighting/firecontrol/fireReport/components/fireControlRoom.vue
index 80d63ce..80940b1 100644
--- a/src/views/firefighting/fireReport/components/fireControlRoom.vue
+++ b/src/views/firefighting/firecontrol/fireReport/components/fireControlRoom.vue
@@ -58,7 +58,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/fireReport/components/firePumpRoom.vue b/src/views/firefighting/firecontrol/fireReport/components/firePumpRoom.vue
similarity index 98%
rename from src/views/firefighting/fireReport/components/firePumpRoom.vue
rename to src/views/firefighting/firecontrol/fireReport/components/firePumpRoom.vue
index 5dd6147..ea61332 100644
--- a/src/views/firefighting/fireReport/components/firePumpRoom.vue
+++ b/src/views/firefighting/firecontrol/fireReport/components/firePumpRoom.vue
@@ -58,7 +58,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/fireReport/components/fireResources.vue b/src/views/firefighting/firecontrol/fireReport/components/fireResources.vue
similarity index 98%
rename from src/views/firefighting/fireReport/components/fireResources.vue
rename to src/views/firefighting/firecontrol/fireReport/components/fireResources.vue
index b434a2d..fabddb7 100644
--- a/src/views/firefighting/fireReport/components/fireResources.vue
+++ b/src/views/firefighting/firecontrol/fireReport/components/fireResources.vue
@@ -58,7 +58,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/fireReport/components/list.vue b/src/views/firefighting/firecontrol/fireReport/components/list.vue
similarity index 100%
rename from src/views/firefighting/fireReport/components/list.vue
rename to src/views/firefighting/firecontrol/fireReport/components/list.vue
diff --git a/src/views/firefighting/fireReport/index.vue b/src/views/firefighting/firecontrol/fireReport/index.vue
similarity index 100%
rename from src/views/firefighting/fireReport/index.vue
rename to src/views/firefighting/firecontrol/fireReport/index.vue
diff --git a/src/views/firefighting/firecontrolroom/components/list.vue b/src/views/firefighting/firecontrol/firecontrolroom/components/list.vue
similarity index 100%
rename from src/views/firefighting/firecontrolroom/components/list.vue
rename to src/views/firefighting/firecontrol/firecontrolroom/components/list.vue
diff --git a/src/views/firefighting/firecontrolroom/index.vue b/src/views/firefighting/firecontrol/firecontrolroom/index.vue
similarity index 100%
rename from src/views/firefighting/firecontrolroom/index.vue
rename to src/views/firefighting/firecontrol/firecontrolroom/index.vue
diff --git a/src/views/firefighting/firepumproom/components/list.vue b/src/views/firefighting/firecontrol/firepumproom/components/list.vue
similarity index 99%
rename from src/views/firefighting/firepumproom/components/list.vue
rename to src/views/firefighting/firecontrol/firepumproom/components/list.vue
index d19c373..5639146 100644
--- a/src/views/firefighting/firepumproom/components/list.vue
+++ b/src/views/firefighting/firecontrol/firepumproom/components/list.vue
@@ -257,7 +257,7 @@ import { requestFN } from '@/utils/request'
 import { upload } from '@/utils/upload'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/firepumproom/index.vue b/src/views/firefighting/firecontrol/firepumproom/index.vue
similarity index 100%
rename from src/views/firefighting/firepumproom/index.vue
rename to src/views/firefighting/firecontrol/firepumproom/index.vue
diff --git a/src/views/firefighting/firerescueteam/components/list.vue b/src/views/firefighting/firecontrol/firerescueteam/components/list.vue
similarity index 99%
rename from src/views/firefighting/firerescueteam/components/list.vue
rename to src/views/firefighting/firecontrol/firerescueteam/components/list.vue
index 92d185b..24bb9d0 100644
--- a/src/views/firefighting/firerescueteam/components/list.vue
+++ b/src/views/firefighting/firecontrol/firerescueteam/components/list.vue
@@ -168,7 +168,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/firerescueteam/index.vue b/src/views/firefighting/firecontrol/firerescueteam/index.vue
similarity index 100%
rename from src/views/firefighting/firerescueteam/index.vue
rename to src/views/firefighting/firecontrol/firerescueteam/index.vue
diff --git a/src/views/firefighting/fireresources/components/list.vue b/src/views/firefighting/firecontrol/fireresources/components/list.vue
similarity index 99%
rename from src/views/firefighting/fireresources/components/list.vue
rename to src/views/firefighting/firecontrol/fireresources/components/list.vue
index fc21b51..54348c1 100644
--- a/src/views/firefighting/fireresources/components/list.vue
+++ b/src/views/firefighting/firecontrol/fireresources/components/list.vue
@@ -204,7 +204,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/fireresources/index.vue b/src/views/firefighting/firecontrol/fireresources/index.vue
similarity index 100%
rename from src/views/firefighting/fireresources/index.vue
rename to src/views/firefighting/firecontrol/fireresources/index.vue
diff --git a/src/views/firefighting/firewatersource/components/list.vue b/src/views/firefighting/firecontrol/firewatersource/components/list.vue
similarity index 99%
rename from src/views/firefighting/firewatersource/components/list.vue
rename to src/views/firefighting/firecontrol/firewatersource/components/list.vue
index 5a7f5b7..e9a8f85 100644
--- a/src/views/firefighting/firewatersource/components/list.vue
+++ b/src/views/firefighting/firecontrol/firewatersource/components/list.vue
@@ -176,7 +176,7 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import SelectTree from '@/components/SelectTree'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Pagination, SelectTree, TiandiMap },
diff --git a/src/views/firefighting/firewatersource/index.vue b/src/views/firefighting/firecontrol/firewatersource/index.vue
similarity index 100%
rename from src/views/firefighting/firewatersource/index.vue
rename to src/views/firefighting/firecontrol/firewatersource/index.vue
diff --git a/src/views/firefighting/firecontrol/index.vue b/src/views/firefighting/firecontrol/index.vue
new file mode 100644
index 0000000..36420c5
--- /dev/null
+++ b/src/views/firefighting/firecontrol/index.vue
@@ -0,0 +1,4 @@
+<template>
+  <router-view/>
+</template>
+

From a2f1ef07ac5826ce333a99b1d269db819d811a21 Mon Sep 17 00:00:00 2001
From: zy <907315977@qq.com>
Date: Thu, 27 Jun 2024 13:35:59 +0800
Subject: [PATCH 30/53] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../breakground/components/corpInfo.vue       | 128 ++++++
 .../breakground/components/detail.vue         | 279 +++++++++++++
 .../breakground/components/list.vue           | 369 ++++++++++++++++++
 src/views/dangerousWork/breakground/index.vue |  23 ++
 src/views/dangerousWork/circuit/index.vue     |   2 +-
 .../highwork/components/corpInfo.vue          | 128 ++++++
 .../highwork/components/detail.vue            | 279 +++++++++++++
 .../highwork/components/list.vue              | 359 +++++++++++++++++
 src/views/dangerousWork/highwork/index.vue    |  20 +
 .../hoisting/components/corpInfo.vue          | 128 ++++++
 .../hoisting/components/detail.vue            | 279 +++++++++++++
 .../hoisting/components/list.vue              | 359 +++++++++++++++++
 src/views/dangerousWork/hoisting/index.vue    |  20 +
 .../lectricity/components/corpInfo.vue        | 128 ++++++
 .../lectricity/components/detail.vue          | 279 +++++++++++++
 .../lectricity/components/list.vue            | 359 +++++++++++++++++
 src/views/dangerousWork/lectricity/index.vue  |  23 ++
 .../limitspace/components/corpInfo.vue        | 128 ++++++
 .../limitspace/components/detail.vue          | 279 +++++++++++++
 .../limitspace/components/list.vue            | 359 +++++++++++++++++
 src/views/dangerousWork/limitspace/index.vue  |  23 ++
 21 files changed, 3950 insertions(+), 1 deletion(-)
 create mode 100644 src/views/dangerousWork/breakground/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/breakground/components/detail.vue
 create mode 100644 src/views/dangerousWork/breakground/components/list.vue
 create mode 100644 src/views/dangerousWork/breakground/index.vue
 create mode 100644 src/views/dangerousWork/highwork/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/highwork/components/detail.vue
 create mode 100644 src/views/dangerousWork/highwork/components/list.vue
 create mode 100644 src/views/dangerousWork/highwork/index.vue
 create mode 100644 src/views/dangerousWork/hoisting/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/hoisting/components/detail.vue
 create mode 100644 src/views/dangerousWork/hoisting/components/list.vue
 create mode 100644 src/views/dangerousWork/hoisting/index.vue
 create mode 100644 src/views/dangerousWork/lectricity/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/lectricity/components/detail.vue
 create mode 100644 src/views/dangerousWork/lectricity/components/list.vue
 create mode 100644 src/views/dangerousWork/lectricity/index.vue
 create mode 100644 src/views/dangerousWork/limitspace/components/corpInfo.vue
 create mode 100644 src/views/dangerousWork/limitspace/components/detail.vue
 create mode 100644 src/views/dangerousWork/limitspace/components/list.vue
 create mode 100644 src/views/dangerousWork/limitspace/index.vue

diff --git a/src/views/dangerousWork/breakground/components/corpInfo.vue b/src/views/dangerousWork/breakground/components/corpInfo.vue
new file mode 100644
index 0000000..b082343
--- /dev/null
+++ b/src/views/dangerousWork/breakground/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/gfBreakGround/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue
new file mode 100644
index 0000000..5adb003
--- /dev/null
+++ b/src/views/dangerousWork/breakground/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/gfBreakGround/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue
new file mode 100644
index 0000000..18587cc
--- /dev/null
+++ b/src/views/dangerousWork/breakground/components/list.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/gfBreakGround/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.cutroadfhadminadd		// 新增权限
+        this.del = data.cutroadfhadmindel		// 删除权限
+        this.edit = data.cutroadfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    goDetail(id) {
+      this.$parent.activeName = 'Detail'
+      this.$parent.CUTROAD_ID = id
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/breakground/index.vue b/src/views/dangerousWork/breakground/index.vue
new file mode 100644
index 0000000..17f8ac2
--- /dev/null
+++ b/src/views/dangerousWork/breakground/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+    <Blindboard v-if="activeName=='Blindboard'"/>
+    <Detail v-if="activeName=='Detail'"/>
+  </div>
+</template>
+<script>
+import CorpInfo from './components/corpInfo'
+import Blindboard from './components/list'
+import Detail from './components/detail'
+export default {
+  components: { CorpInfo, Blindboard,Detail },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: '',
+      CUTROAD_ID: ''
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/circuit/index.vue b/src/views/dangerousWork/circuit/index.vue
index 0c0ba5e..c5477fc 100644
--- a/src/views/dangerousWork/circuit/index.vue
+++ b/src/views/dangerousWork/circuit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-if="activeName=='circuit_list'"/>
+    <circuitList v-show="activeName=='circuit_list'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
diff --git a/src/views/dangerousWork/highwork/components/corpInfo.vue b/src/views/dangerousWork/highwork/components/corpInfo.vue
new file mode 100644
index 0000000..377ebb3
--- /dev/null
+++ b/src/views/dangerousWork/highwork/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/gfHighWork/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/highwork/components/detail.vue b/src/views/dangerousWork/highwork/components/detail.vue
new file mode 100644
index 0000000..d253af5
--- /dev/null
+++ b/src/views/dangerousWork/highwork/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue
new file mode 100644
index 0000000..37a1684
--- /dev/null
+++ b/src/views/dangerousWork/highwork/components/list.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+      </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    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
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue
new file mode 100644
index 0000000..304c72e
--- /dev/null
+++ b/src/views/dangerousWork/highwork/index.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+   <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+    <hotwork v-if="activeName=='hotwork'"/>
+  </div>
+</template>
+<script>
+ import CorpInfo from './components/corpInfo'
+ import hotwork from './components/list'
+export default {
+   components: { CorpInfo, hotwork },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: ''
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/hoisting/components/corpInfo.vue b/src/views/dangerousWork/hoisting/components/corpInfo.vue
new file mode 100644
index 0000000..d7d1966
--- /dev/null
+++ b/src/views/dangerousWork/hoisting/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/gfHoisting/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/hoisting/components/detail.vue b/src/views/dangerousWork/hoisting/components/detail.vue
new file mode 100644
index 0000000..d253af5
--- /dev/null
+++ b/src/views/dangerousWork/hoisting/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue
new file mode 100644
index 0000000..6241d41
--- /dev/null
+++ b/src/views/dangerousWork/hoisting/components/list.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+      </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    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
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/hoisting/index.vue b/src/views/dangerousWork/hoisting/index.vue
new file mode 100644
index 0000000..0795164
--- /dev/null
+++ b/src/views/dangerousWork/hoisting/index.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+   <Hoisting v-if="activeName=='Hoisting'"/>
+  </div>
+</template>
+<script>
+ import CorpInfo from './components/corpInfo'
+ import Hoisting from './components/list'
+export default {
+  components: { CorpInfo, Hoisting },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: ''
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/lectricity/components/corpInfo.vue b/src/views/dangerousWork/lectricity/components/corpInfo.vue
new file mode 100644
index 0000000..eefa197
--- /dev/null
+++ b/src/views/dangerousWork/lectricity/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/dangerousWork/gfcutroad/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/lectricity/components/detail.vue b/src/views/dangerousWork/lectricity/components/detail.vue
new file mode 100644
index 0000000..d253af5
--- /dev/null
+++ b/src/views/dangerousWork/lectricity/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/lectricity/components/list.vue b/src/views/dangerousWork/lectricity/components/list.vue
new file mode 100644
index 0000000..6241d41
--- /dev/null
+++ b/src/views/dangerousWork/lectricity/components/list.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+      </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    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
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/lectricity/index.vue b/src/views/dangerousWork/lectricity/index.vue
new file mode 100644
index 0000000..0c0ba5e
--- /dev/null
+++ b/src/views/dangerousWork/lectricity/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+    <circuitList v-if="activeName=='circuit_list'"/>
+    <Detail v-if="activeName=='Detail'"/>
+  </div>
+</template>
+<script>
+import CorpInfo from './components/corpInfo'
+import circuitList from './components/list'
+import Detail from './components/detail'
+export default {
+  components: { CorpInfo, circuitList,Detail },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: '',
+      CUTROAD_ID: ''
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/limitspace/components/corpInfo.vue b/src/views/dangerousWork/limitspace/components/corpInfo.vue
new file mode 100644
index 0000000..66c7651
--- /dev/null
+++ b/src/views/dangerousWork/limitspace/components/corpInfo.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-group ">
+        <div class="filter-lable" style="width: 60px">
+          公司名称：
+        </div>
+        <div class="filter-width">
+          <el-input v-model="KEYWORDS" placeholder="公司名称" class="filter-item" style="width: 150px;"/>
+        </div>
+      </div>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+      <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+        重置
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CORP_NAME" label="公司名称" />
+      <el-table-column prop="checkedCount" label="申请总数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('LimitSpace',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkedItemCount" label="完成数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('LimitSpace',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ybCount" label="废除数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('LimitSpace',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zdCount" label="进行数" align="center" >
+        <template slot-scope="{row}">
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('LimitSpace',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      USER_LEVEL: sessionStorage.getItem('user').LEVEL || -1,
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: []
+    }
+  },
+
+  async created() {
+    await this.getList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    // 点击列表数,跳转详情
+    goList(tableName, CORPINFO_ID, ticketType) {
+      this.$parent.activeName = tableName
+      this.$parent.CORPINFO_ID = CORPINFO_ID
+      this.$parent.ticketType = ticketType
+      this.$parent.CUTROAD_ID =''
+    },
+    getList() {
+      return new Promise((resolve) => {
+        this.listLoading = true
+        requestFN(
+          '/gfLimitSpace/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
+            KEYWORDS: this.KEYWORDS
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.varList = data.varList
+          this.total = data.page.totalResult
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dangerousWork/limitspace/components/detail.vue b/src/views/dangerousWork/limitspace/components/detail.vue
new file mode 100644
index 0000000..d253af5
--- /dev/null
+++ b/src/views/dangerousWork/limitspace/components/detail.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <table class="table-ui">
+        <thead>
+        <tr>
+          <td colspan="6" style="border: none">
+            <div class="level-title mt-20">
+              <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>
+        </tr>
+        <tr>
+          <td class="bbg">涉及相关单位（部门）</td>
+          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+        </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>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</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>
+                </td>
+                <td>
+                  {{ 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>
+                <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>
+                  <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>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.PRODUCTION_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>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </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>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      otherProtectiveMeasures: [],
+      imgList: [],
+      imgList1: [],
+      hazardIdentification: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/goEdit',
+        {
+          CUTROAD_ID: this.CUTROAD_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        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]
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'circuit_list'
+      this.$parent.CUTROAD_ID = ''
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+.bbg
+  width: 270px
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+.level-code
+  margin-left: auto
+</style>
diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue
new file mode 100644
index 0000000..6241d41
--- /dev/null
+++ b/src/views/dangerousWork/limitspace/components/list.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="50px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="编号">
+            <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="STATUS" 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-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves icon="el-icon-refresh" type="success" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </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 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="STATUS" label="审核状态">
+        <template slot-scope="{row}">
+          <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==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==-6">验收打回</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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+      </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="断路安全作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </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="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档" description="">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyVarList: [], // REPLY
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      replyTotal: 0,
+      dialogFormHuifuShow: false,
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '2', NAME: '所在单位待审核' },
+        { ID: '3', 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: '验收打回' }
+      ],
+      STATUS: '',
+      DEPTIDS: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CUTROAD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goChart(row) {
+      this.pd = row
+      this.dialogFormShow = true
+    },
+    getStatus() {
+      if (this.pd.APPLY_STATUS <= '0') {
+        return 0
+      }
+      if (this.pd.APPLY_STATUS == '1') {
+        return 1
+      }
+      if (this.pd.APPLY_STATUS == '2') {
+        return 2
+      }
+      if (this.pd.APPLY_STATUS == '3') {
+        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
+      }
+    },
+    getProcessStatus() {
+      if (this.pd.APPLY_STATUS < '0') {
+        return 'error'
+      } else {
+        return 'process'
+      }
+    },
+    getProcessMessage() {
+      let obj = {}
+      if (this.pd.APPLY_STATUS >= '0') {
+        obj = {
+          title: '',
+          USER_NAME: this.pd.APPLY_USER_NAME,
+          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,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-5') {
+        obj = {
+          title: '审批部门审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      if (this.pd.APPLY_STATUS == '-6') {
+        obj = {
+          title: '验收打回',
+          AUSER_NAME: this.pd.ACCEPT_USER_NAME,
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
+      return obj
+    },
+    getIsPase(col) {
+      if (!this.pd[col]) {
+        return '已跳过'
+      }
+    },
+    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
+    }
+  }
+}
+
+</script>
diff --git a/src/views/dangerousWork/limitspace/index.vue b/src/views/dangerousWork/limitspace/index.vue
new file mode 100644
index 0000000..d450b83
--- /dev/null
+++ b/src/views/dangerousWork/limitspace/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
+    <circuitList v-show="activeName=='LimitSpace'"/>
+    <Detail v-if="activeName=='Detail'"/>
+  </div>
+</template>
+<script>
+import CorpInfo from './components/corpInfo'
+import circuitList from './components/list'
+import Detail from './components/detail'
+export default {
+  components: { CorpInfo, circuitList,Detail },
+  data() {
+    return {
+      activeName: 'CorpInfo',
+      CORPINFO_ID: '',
+      ticketType: '',
+      CUTROAD_ID: ''
+    }
+  }
+}
+</script>

From 6561b6af7dae6c001d9ac64fb607fee08e66ea95 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 27 Jun 2024 14:06:08 +0800
Subject: [PATCH 31/53] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meteorological/components/meteorological-history.vue     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/keyprojects/meteorological/components/meteorological-history.vue b/src/views/keyprojects/meteorological/components/meteorological-history.vue
index 5dbc97f..f598d0e 100644
--- a/src/views/keyprojects/meteorological/components/meteorological-history.vue
+++ b/src/views/keyprojects/meteorological/components/meteorological-history.vue
@@ -290,7 +290,7 @@ export default {
         }
       ).then((data) => {
         this.listLoading = false
-        this.varList = data.varList.reverse()
+        this.varList = data.varList
         this.temperature = []
         this.winddirection = []
         this.windspeed = []
@@ -299,6 +299,9 @@ export default {
           this.winddirection.push([this.varList[i].OPERATTIME, this.varList[i].WINDDIRECTION])
           this.windspeed.push([this.varList[i].OPERATTIME, this.varList[i].WINDSPEED])
         }
+        this.temperature.reverse()
+        this.winddirection.reverse()
+        this.windspeed.reverse()
         this.initCharts1(this.temperature, this.winddirection, this.windspeed)
         this.initCharts2(this.temperature, this.winddirection, this.windspeed)
         this.initCharts3(this.temperature, this.winddirection, this.windspeed)

From f42d56a7c0f93a6b2165633b6d1e39000a91626a Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 27 Jun 2024 14:13:03 +0800
Subject: [PATCH 32/53] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B0=8F=E7=AA=97=E5=8F=A3=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index e3c046e..f8d47f8 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -292,7 +292,7 @@ export default {
           AREA: this.area
         }
       ).then((data) => {
-        this.initEcharts1(data.varList.reverse())
+        this.initEcharts1(data.varList)
       })
     },
 

From 7e847adc4ff3bfbe850faeb1a951ae037670d28a Mon Sep 17 00:00:00 2001
From: "1261008090@qq.com" <wangxuan>
Date: Thu, 27 Jun 2024 14:36:31 +0800
Subject: [PATCH 33/53] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=EF=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D/=E5=8E=86=E5=8F=B2=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=EF=BC=8C=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue           | 133 ++++++++++++++++++++++++------
 src/views/map/js/ry_dragentity.js |  10 +++
 2 files changed, 120 insertions(+), 23 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index ef19b57..cdfd52f 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -217,6 +217,18 @@
             </template>
           </template>
         </template>
+        <transition
+          enter-active-class="animate__animated animate__fadeInDown"
+          leave-active-class="animate__animated animate__fadeOutUp"
+        >
+        <div class="people_trajectory" v-if="isPeopleTrajectory">
+          <el-select v-model="peopleTrajectoryValue" popper-class="people_trajectory_select">
+            <el-option v-for="item in onePerLocArr" :key="item.id" :value="item.id" :label="item.id"/>
+          </el-select>
+          <el-button class="search_btn" @click="addTrajectory">搜索</el-button>
+          <el-button class="reset_btn" @click="()=>{removeTrajectory();peopleTrajectoryValue = ''}">重置</el-button>
+        </div>
+        </transition>
       </div>
     </transition>
     <div class="right_options">
@@ -1175,7 +1187,9 @@ export default {
         linkPort: '8093',
         VIIDPort: '8088'
       },
-      trajectoryEntityCollection: {}
+      trajectoryEntityCollection: {},
+      isPeopleTrajectory:false,
+      peopleTrajectoryValue:''
     }
   },
   mounted() {
@@ -1474,35 +1488,36 @@ export default {
         // var cartesian = this.getCatesian3FromPX(movement.position)
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
       viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_DOUBLE_CLICK)
-      viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+      // viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
       document.addEventListener('contextmenu', function(event) {
         event.preventDefault()
       })
-      this.handler.setInputAction(movement => {
-        const pick = viewer.scene.pick(movement.position)
-        if (Cesium.defined(pick) && (pick.id.id)) {
-          if (!pick.id._monitoItems) {
-            this.removeTrajectory()
-            return
-          }
-          const point_type = pick.id._monitoItems.data.point_type
-          const point_id = pick.id._monitoItems.data.id
-          const corpInfoId = pick.id._monitoItems.data.corpInfoId
-          if (point_type === '标记点peoplePositionOne') {
-            this.removeTrajectory()
-            this.addTrajectory(point_id, corpInfoId)
-          }
-        } else {
-          this.removeTrajectory()
-        }
-      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+    //   this.handler.setInputAction(movement => {
+    //     const pick = viewer.scene.pick(movement.position)
+    //     if (Cesium.defined(pick) && (pick.id.id)) {
+    //       if (!pick.id._monitoItems) {
+    //         this.removeTrajectory()
+    //         return
+    //       }
+    //       const point_type = pick.id._monitoItems.data.point_type
+    //       const point_id = pick.id._monitoItems.data.id
+    //       const corpInfoId = pick.id._monitoItems.data.corpInfoId
+    //       if (point_type === '标记点peoplePositionOne') {
+    //         this.removeTrajectory()
+    //         this.addTrajectory(point_id, corpInfoId)
+    //       }
+    //     } else {
+    //       this.removeTrajectory()
+    //     }
+    //   }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
     },
-    addTrajectory(point_id, corpInfoId) {
+    addTrajectory() {
+      this.removeTrajectory()
       requestFN(
         '/map/getPersonTrace',
         {
-          id: point_id,
-          corpId: corpInfoId
+          id: this.peopleTrajectoryValue,
+          corpId: this.CORP_INFO_ID
         }
       ).then((data) => {
         if (data.list) {
@@ -1964,6 +1979,7 @@ export default {
             this.bottomOptionsList[i].list[j].check = false
           }
         }
+        this.isPeopleTrajectory = false
       }
     },
     clearAllBottomOptionsItemsEntityCollection() {
@@ -2078,10 +2094,22 @@ export default {
           }
           this.carLocArr = []
         }
+        if(urlType === 'peopleTrajectory'){
+          this.isPeopleTrajectory = false
+        }
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           this.doUnSubscribe()
           this.clearMqttPoint('+/UwbBQ/')
           this.removeTrajectory()
+          for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) {
+            if(this.bottomOptionsList[pindex].list[i].type === 'peopleTrajectory'){
+              if(this.bottomOptionsList[pindex].list[i].check){
+                this.bottomOptionsList[pindex].list[i].check = false
+                this.isPeopleTrajectory = false
+                break
+              }
+            }
+          }
         }
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') {
           this.clearRYDWPoint('+/UwbBQ/')
@@ -2099,6 +2127,23 @@ export default {
           }
         })
       } else {
+        if(urlType === 'peopleTrajectory'){
+          let flag = false
+          for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) {
+            if(this.bottomOptionsList[pindex].list[i].type === 'peoplePosition'){
+              if(!this.bottomOptionsList[pindex].list[i].check){
+                flag = true
+                break
+              }
+            }
+          }
+          if(flag){
+            this.$message.warning('请先选择人员定位！！！')
+            return
+          }else{
+            this.isPeopleTrajectory = true
+          }
+        }
         // 选中
         this.bottomOptionsList[pindex].list[index].check = true
         if (this.gangkouActive === '00004') {
@@ -3614,9 +3659,51 @@ export default {
     transform: translateY(0);
   }
 }
+  .people_trajectory{
+    position: absolute;
+    top: -60px;
+    left: 0;
+    width: 400px;
+    padding: 10px;
+    background-image: linear-gradient(to right, rgb(31 62 129 / 57%) 0%, rgb(17 93 255 / 40%) 50%, rgb(31 62 129 / 57%) 100%);
+    .search_btn{
+      background-color: #1563e3;
+      color: #fff;
+      border-color: #1563e3;
+    }
+    .reset_btn{
+      background-color: #558be5;
+      color: #fff;
+      border-color: #558be5;
+    }
+  }
 </style>
 <style>
 .cesium-viewer-toolbar, .cesium-viewer-fullscreenContainer, .cesium-infoBox-visible {
   display: none !important;
+}
+  .people_trajectory .el-input__inner{
+    background-color: #100693 !important;
+    border-color: #100693 !important;
+    color: #fff !important;
+  }
+  .people_trajectory_select{
+    background-color: #100693 !important;
+    border-color: #100693 !important;
+  }
+.people_trajectory_select .el-select-dropdown__item, .el-select-dropdown__item{
+  color: #fff !important;
+}
+.people_trajectory_select .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: #2111ec !important;
+  color: #fff !important;
+}
+.people_trajectory_select .popper__arrow{
+  border-top-color: #100693 !important;
+  border-bottom-color: #100693 !important;
+}
+.people_trajectory_select .popper__arrow::after{
+  border-top-color: #100693 !important;
+  border-bottom-color: #100693 !important;
 }
 </style>
diff --git a/src/views/map/js/ry_dragentity.js b/src/views/map/js/ry_dragentity.js
index f63fb12..3a65fbb 100644
--- a/src/views/map/js/ry_dragentity.js
+++ b/src/views/map/js/ry_dragentity.js
@@ -30,6 +30,16 @@ export default class DragEntity {
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
+      label: {
+        text: point.id,
+        font: '13px sans-serif',
+        pixelOffset: new Cesium.Cartesian2(0, -55),
+        showBackground: true,
+        // eslint-disable-next-line new-cap
+        backgroundColor: new Cesium.Color.fromCssColorString('rgba(20, 58, 142, 1)'),
+        backgroundPadding: new Cesium.Cartesian2(7, 5),
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
+      },
       orientation: new Cesium.VelocityOrientationProperty(point.property),
 
       monitoItems: {

From 08555f1a10e345f41fabd149f125ea90dfaf2952 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 27 Jun 2024 14:48:12 +0800
Subject: [PATCH 34/53] =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?=
 =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/platformelectronic/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue
index 045c281..1fd60f6 100644
--- a/src/views/keyprojects/platformelectronic/index.vue
+++ b/src/views/keyprojects/platformelectronic/index.vue
@@ -334,7 +334,7 @@ export default {
           this.shexiangtouForm = data.pd
           this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
           this.getSendDic()
-          this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',')
+          this.form.bianjiequyu = data.pd.FANGQU_IDS?data.pd.FANGQU_IDS.split(','):[]
           this.form.CORPINFO_ID = data.pd.CORPINFO_ID
           this.form.VIDEONAME = data.pd.NAME
           this.form.CODE = data.pd.INDEXCODE
@@ -343,6 +343,7 @@ export default {
           this.listLoading = false
           resolve()
         }).catch((e) => {
+          console.log(e)
           this.listLoading = false
         })
       })
@@ -529,6 +530,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
+      this.form.bianjiequyu = []
       this.form.quyuList = []
       requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: this.form.SUOSHUQUYU }
       ).then((data) => {

From 3b4803ee19db4f7fdf419859c538fea0ce66ecb7 Mon Sep 17 00:00:00 2001
From: zy <907315977@qq.com>
Date: Thu, 27 Jun 2024 18:16:12 +0800
Subject: [PATCH 35/53] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blindboard/components/detail.vue          |   2 +-
 .../breakground/components/detail.vue         |   2 +-
 .../breakground/components/list.vue           |  17 +-
 .../components/corpInfo.vue                   |  10 +-
 .../electricity/components/detail.vue         | 269 +++++++++++++++++
 .../components/list.vue                       | 191 ++++--------
 .../{lectricity => electricity}/index.vue     |  21 +-
 .../highwork/components/corpInfo.vue          |  10 +-
 .../highwork/components/detail.vue            | 195 ++++++------
 .../highwork/components/list.vue              | 156 ++++------
 src/views/dangerousWork/highwork/index.vue    |  28 +-
 .../hoisting/components/corpInfo.vue          |  10 +-
 .../hoisting/components/detail.vue            | 246 ++++++++-------
 .../hoisting/components/list.vue              | 160 +++++-----
 src/views/dangerousWork/hoisting/index.vue    |  25 +-
 .../lectricity/components/detail.vue          | 279 ------------------
 .../limitspace/components/detail.vue          |   2 +-
 .../limitspace/components/list.vue            |   2 +-
 18 files changed, 771 insertions(+), 854 deletions(-)
 rename src/views/dangerousWork/{lectricity => electricity}/components/corpInfo.vue (85%)
 create mode 100644 src/views/dangerousWork/electricity/components/detail.vue
 rename src/views/dangerousWork/{lectricity => electricity}/components/list.vue (54%)
 rename src/views/dangerousWork/{lectricity => electricity}/index.vue (52%)
 delete mode 100644 src/views/dangerousWork/lectricity/components/detail.vue

diff --git a/src/views/dangerousWork/blindboard/components/detail.vue b/src/views/dangerousWork/blindboard/components/detail.vue
index d253af5..225a315 100644
--- a/src/views/dangerousWork/blindboard/components/detail.vue
+++ b/src/views/dangerousWork/blindboard/components/detail.vue
@@ -7,7 +7,7 @@
         <tr>
           <td colspan="6" style="border: none">
             <div class="level-title mt-20">
-              <h1>断路安全作业票</h1>
+              <h1>盲板作业票</h1>
               <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
             </div>
           </td>
diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue
index 5adb003..ead3fbf 100644
--- a/src/views/dangerousWork/breakground/components/detail.vue
+++ b/src/views/dangerousWork/breakground/components/detail.vue
@@ -7,7 +7,7 @@
         <tr>
           <td colspan="6" style="border: none">
             <div class="level-title mt-20">
-              <h1>断路安全作业票</h1>
+              <h1>动土安全作业票</h1>
               <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
             </div>
           </td>
diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue
index 18587cc..82cfb2e 100644
--- a/src/views/dangerousWork/breakground/components/list.vue
+++ b/src/views/dangerousWork/breakground/components/list.vue
@@ -258,22 +258,7 @@ export default {
         this.listLoading = false
       })
     },
-    // 判断按钮权限，用于是否显示按钮
-    hasButton() {
-      var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel'
-      requestFN(
-        '/head/hasButton',
-        {
-          keys: keys
-        }
-      ).then((data) => {
-        this.add = data.cutroadfhadminadd		// 新增权限
-        this.del = data.cutroadfhadmindel		// 删除权限
-        this.edit = data.cutroadfhadminedit	// 修改权限
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
+   
     goChart(row) {
       this.pd = row
       this.dialogFormShow = true
diff --git a/src/views/dangerousWork/lectricity/components/corpInfo.vue b/src/views/dangerousWork/electricity/components/corpInfo.vue
similarity index 85%
rename from src/views/dangerousWork/lectricity/components/corpInfo.vue
rename to src/views/dangerousWork/electricity/components/corpInfo.vue
index eefa197..bce1003 100644
--- a/src/views/dangerousWork/lectricity/components/corpInfo.vue
+++ b/src/views/dangerousWork/electricity/components/corpInfo.vue
@@ -33,22 +33,22 @@
       <el-table-column prop="CORP_NAME" label="公司名称" />
       <el-table-column prop="checkedCount" label="申请总数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="checkedItemCount" label="完成数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="ybCount" label="废除数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="zdCount" label="进行数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('electricity_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -108,7 +108,7 @@ export default {
       return new Promise((resolve) => {
         this.listLoading = true
         requestFN(
-          '/dangerousWork/gfcutroad/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          '/dangerousWork/gfElectricity/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/electricity/components/detail.vue b/src/views/dangerousWork/electricity/components/detail.vue
new file mode 100644
index 0000000..68d76d5
--- /dev/null
+++ b/src/views/dangerousWork/electricity/components/detail.vue
@@ -0,0 +1,269 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <div class="level-title">
+        <h1>临时用电作业许可证</h1>
+        <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
+      </div>
+      <table class="table-ui">
+        <tr>
+          <td class="bbg">申请单位</td>
+          <td colspan="2">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
+          <td class="bbg">作业申请时间</td>
+          <td colspan="2">{{ pd.CREATTIME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业地点</td>
+          <td colspan="2">{{ pd.WORK_PLACE }}</td>
+          <td class="bbg">作业内容</td>
+          <td colspan="2">{{ pd.WORK_CONTENT }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">电源接入点及许可用电功率</td>
+          <td colspan="2">{{ pd.ALLOW_POWER }}</td>
+          <td class="bbg">工作电压</td>
+          <td colspan="2">{{ pd.WORK_VOLTAGE }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">用电设备名称及额定功率</td>
+          <td>{{ pd.RATED_POWER }}</td>
+          <td class="bbg">监护人</td>
+          <td>
+            <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>
+          <td class="bbg">用电人</td>
+          <td>{{ pd.ELECTRICITY_USER }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业人</td>
+          <td colspan="2">{{ pd.WORK_USER }}</td>
+          <td class="bbg">电工证号</td>
+          <td colspan="2">{{ pd.CARD_NO }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业负责人</td>
+          <td colspan="2">{{ pd.CONFIRM_USER_NAME }}</td>
+          <td class="bbg">电工证号</td>
+          <td colspan="2">{{ pd.LEADER_CARD_NO }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">关联的其他特殊作业及安全作业票编号</td>
+          <td colspan="5">{{ pd.SPECIAL_WORK }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">风险辨识结果</td>
+          <td colspan="5">{{ pd.RISK_IDENTIFICATION }}</td>
+        </tr>
+        <tr>
+          <td class="bbg" colspan="6">可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
+        </tr>
+        <template v-for="(item,index) in gasList">
+          <tr :key="index">
+            <td class="bbg">分析时间</td>
+            <td colspan="2">{{ item.ANALYZE_TIME }}</td>
+            <td class="bbg">分析点</td>
+            <td colspan="2">{{ item.ANALYZE_PLACE }}</td>
+          </tr>
+          <tr :key="index">
+            <td class="bbg">可燃气体检测结果</td>
+            <td colspan="2">{{ item.ANALYZE_RESULT }}</td>
+            <td class="bbg">分析人</td>
+            <td colspan="2">{{ item.ANALYZE_USER }}</td>
+          </tr>
+        </template>
+        <tr>
+          <td class="bbg">作业实施时间</td>
+          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <table class="table-ui">
+              <tr>
+                <td>序号</td>
+                <td>安全措施</td>
+                <td>是否涉及</td>
+                <td>确认人</td>
+              </tr>
+              <tr v-for="(item,index) in measuresList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}</td>
+                <td>
+                  <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
+                  <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
+                </td>
+                <td>
+                  {{ item.CONFIRM_NAME }}
+                </td>
+              </tr>
+              <tr v-if="pd.CONFIRM_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES">
+                <td>{{ measuresList.length + 1 }}</td>
+                <td colspan="3">
+                  <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.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
+                  </div>
+                  <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">安全交底人</td>
+          <td colspan="10">
+            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">接受交底人</td>
+          <td colspan="10">
+            <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer v-if="pd.CONFIRM_USER_SIGNER_PATH" :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <div>用电单位意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer v-if="pd.AUDIT_USER_SIGNER_PATH" :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <div>配送电单位意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer v-if="pd.APPROVE_USER_SIGNER_PATH" :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer v-if="pd.ACCEPT_USER_SIGNER_PATH" :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+      </table>
+
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+export default {
+  data() {
+    return {
+      config: config,
+      ELECTRICITY_ID: this.$parent.ELECTRICITY_ID, // 主键ID
+      pd: [], // 存放字段参数
+      measuresList: [],
+      gasList: [],
+      otherProtectiveMeasures: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    validStr(str) {
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      return false
+    },
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.ELECTRICITY_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/dangerousWork/gfElectricity/goEdit',
+        {
+          ELECTRICITY_ID: this.ELECTRICITY_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+        this.measuresList = data.measuresList // 参数map
+        this.gasList = data.gasList // 参数map
+        this.otherProtectiveMeasures = this.validStr(this.pd.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+  .print-approval-p10
+    padding: 20px 0
+    span
+      vertical-align: middle
+
+  .print-approval-img
+    width: 200px
+    height: 97px
+    display: inline-block
+    img
+      width: 100%
+      height: 100%
+</style>
diff --git a/src/views/dangerousWork/lectricity/components/list.vue b/src/views/dangerousWork/electricity/components/list.vue
similarity index 54%
rename from src/views/dangerousWork/lectricity/components/list.vue
rename to src/views/dangerousWork/electricity/components/list.vue
index 6241d41..5a22405 100644
--- a/src/views/dangerousWork/lectricity/components/list.vue
+++ b/src/views/dangerousWork/electricity/components/list.vue
@@ -27,58 +27,46 @@
       </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="CHECK_NO" label="编号" />
+      <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="AUDIT_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==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==-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==-6">验收打回</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>
         </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.ELECTRICITY_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-step title="临时用电作业提交">
           <template slot="description">
             <div>{{ getProcessMessage().title }}</div>
             <div>{{ getProcessMessage().USER_NAME }}</div>
@@ -87,85 +75,40 @@
         </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 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.AUDIT_USER_NAME }}</div>
+            <div>{{ pd.AUDIT_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
-        <el-step title="消防、安全管理部门意见" >
+        <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>
+            <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('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>
           </template>
         </el-step>
       </el-steps>
-      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
-        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: red">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
-          </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>
       </div>
     </el-dialog>
-    <div style="height: 60px;"></div>
-    <div  class="ui-foot">
-      <el-button type="primary" @click="goBack">返 回</el-button>
-    </div>
   </div>
 </template>
 <script>
@@ -204,18 +147,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: '5', NAME: '待验收' },
-        { ID: '6', NAME: '验收归档' },
+        { ID: '2', NAME: '用电单位待审核' },
+        { ID: '3', NAME: '配送电单位待审核' },
+        { ID: '4', NAME: '待验收' },
+        { ID: '5', NAME: '验收归档' },
         { ID: '-2', NAME: '作业负责人审核打回' },
-        { ID: '-3', NAME: '所在单位审核打回' },
-        { ID: '-4', NAME: '消防、安全管理部门审核打回' },
-        { ID: '-5', NAME: '审批部门审核打回' },
-        { ID: '-6', NAME: '验收打回' }
+        { ID: '-3', NAME: '用电单位审核打回' },
+        { ID: '-4', NAME: '配送电单位审核打回' },
+        { ID: '-5', NAME: '验收打回' }
       ],
       STATUS: '',
       DEPTIDS: ''
@@ -226,7 +167,7 @@ export default {
   },
   methods: {
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.ELECTRICITY_ID
     },
     // 搜索
     getQuery() {
@@ -242,17 +183,32 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/dangerousWork/gfElectricity/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
-          CORPINFO_ID: this.$parent.CORPINFO_ID,
-          ticketType: this.$parent.ticketType
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
         }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.varList
         this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'electricity:add,electricity:del,electricity:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.electricityfhadminadd		// 新增权限
+        this.del = data.electricityfhadmindel		// 删除权限
+        this.edit = data.electricityfhadminedit	// 修改权限
       }).catch((e) => {
         this.listLoading = false
       })
@@ -278,10 +234,7 @@ export default {
         return 4
       }
       if (this.pd.APPLY_STATUS == '5') {
-        return 5
-      }
-      if (this.pd.APPLY_STATUS == '6') {
-        return 7
+        return 6
       }
     },
     getProcessStatus() {
@@ -303,32 +256,25 @@ export default {
       if (this.pd.APPLY_STATUS == '-2') {
         obj = {
           title: '作业负责人审核打回',
-          USER_NAME: this.pd.CONSTRUCTION_USER_NAME,
+          USER_NAME: this.pd.CONFIRM_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-3') {
         obj = {
-          title: '所在单位审核打回',
-          USER_NAME: this.pd.PRODUCTION_USER_NAME,
+          title: '用电单位审核打回',
+          USER_NAME: this.pd.AUDIT_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.APPROVE_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-5') {
-        obj = {
-          title: '审批部门审核打回',
-          USER_NAME: this.pd.LEADER_USER_NAME,
-          OPERATTIME: this.pd.OPERATTIME
-        }
-      }
-      if (this.pd.APPLY_STATUS == '-6') {
         obj = {
           title: '验收打回',
           AUSER_NAME: this.pd.ACCEPT_USER_NAME,
@@ -342,16 +288,9 @@ export default {
         return '已跳过'
       }
     },
-    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
+      this.$parent.ELECTRICITY_ID = id
     }
   }
 }
diff --git a/src/views/dangerousWork/lectricity/index.vue b/src/views/dangerousWork/electricity/index.vue
similarity index 52%
rename from src/views/dangerousWork/lectricity/index.vue
rename to src/views/dangerousWork/electricity/index.vue
index 0c0ba5e..5f08fe2 100644
--- a/src/views/dangerousWork/lectricity/index.vue
+++ b/src/views/dangerousWork/electricity/index.vue
@@ -1,23 +1,32 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-if="activeName=='circuit_list'"/>
+    <List v-show="activeName=='electricity_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
+
 <script>
 import CorpInfo from './components/corpInfo'
-import circuitList from './components/list'
+import List from './components/list'
 import Detail from './components/detail'
 export default {
-  components: { CorpInfo, circuitList,Detail },
+  components: { CorpInfo, List, Detail },
   data() {
     return {
       activeName: 'CorpInfo',
-      CORPINFO_ID: '',
-      ticketType: '',
-      CUTROAD_ID: ''
+      ELECTRICITY_ID: ''
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        this.$refs.list.getQuery()
+      }
     }
   }
 }
 </script>
+
+<style scoped>
+</style>
diff --git a/src/views/dangerousWork/highwork/components/corpInfo.vue b/src/views/dangerousWork/highwork/components/corpInfo.vue
index 377ebb3..9c4b976 100644
--- a/src/views/dangerousWork/highwork/components/corpInfo.vue
+++ b/src/views/dangerousWork/highwork/components/corpInfo.vue
@@ -33,22 +33,22 @@
       <el-table-column prop="CORP_NAME" label="公司名称" />
       <el-table-column prop="checkedCount" label="申请总数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="checkedItemCount" label="完成数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="ybCount" label="废除数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="zdCount" label="进行数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hotwork',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('highwork_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -108,7 +108,7 @@ export default {
       return new Promise((resolve) => {
         this.listLoading = true
         requestFN(
-          '/gfHighWork/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          '/dangerousWork/gfHighWork/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/highwork/components/detail.vue b/src/views/dangerousWork/highwork/components/detail.vue
index d253af5..b551ab1 100644
--- a/src/views/dangerousWork/highwork/components/detail.vue
+++ b/src/views/dangerousWork/highwork/components/detail.vue
@@ -4,26 +4,41 @@
       <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
       <table class="table-ui">
         <thead>
-        <tr>
-          <td colspan="6" style="border: none">
-            <div class="level-title mt-20">
-              <h1>断路安全作业票</h1>
-              <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
-            </div>
-          </td>
-        </tr>
+          <tr>
+            <td colspan="4" style="border: none">
+              <div class="level-title mt-20">
+                <h1>高处安全作业票</h1>
+                <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
+              </div>
+            </td>
+          </tr>
         </thead>
         <tr>
-          <td class="bbg">申请单位</td>
+          <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>{{ pd.CREATTIME }}</td>
         </tr>
         <tr>
-          <td class="bbg">涉及相关单位（部门）</td>
-          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">作业地点</td>
+          <td>{{ pd.WORK_PLACE }}</td>
+          <td class="bbg">作业内容</td>
+          <td>{{ pd.WORK_CONTENT }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业高度</td>
+          <td>{{ pd.WORK_HIGH }}</td>
+          <td class="bbg">高处作业级别</td>
+          <td>
+            {{ pd.WORK_LEVEL == '1' ? 'I级高处作业' : '' }}
+            {{ pd.WORK_LEVEL == '2' ? 'II级高处作业' : '' }}
+            {{ pd.WORK_LEVEL == '3' ? 'III级高处作业' : '' }}
+            {{ pd.WORK_LEVEL == '4' ? 'IV级高处作业' : '' }}
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">作业单位</td>
+          <td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
           <td class="bbg">监护人</td>
           <td>
             <div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
@@ -34,36 +49,25 @@
           </td>
         </tr>
         <tr>
-          <td class="bbg">断路原因</td>
-          <td colspan="5">{{ pd.WORK_REASON }}</td>
+          <td class="bbg">作业人</td>
+          <td>{{ pd.PROJECT_MANAGER }}</td>
+          <td class="bbg">作业负责人</td>
+          <td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
         </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="3">{{ pd.SPECIAL_WORK }}</td>
         </tr>
         <tr>
           <td class="bbg">风险辨识结果</td>
-          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+          <td colspan="3">{{ pd.HAZARD_IDENTIFICATION }}</td>
         </tr>
         <tr>
           <td class="bbg">作业实施时间</td>
-          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+          <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
         <tr>
-          <td colspan="6">
+          <td colspan="4">
             <table class="table-ui">
               <tr>
                 <td>序号</td>
@@ -75,36 +79,32 @@
                 <td>{{ index + 1 }}</td>
                 <td>{{ item.PROTECTIVE_MEASURES }}</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>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
                   <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
                 </td>
                 <td>
                   {{ 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 ">
+              <tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_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>
-                  <div v-if="pd.CONSTRUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }}</span>
+                  <div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
+                    <span>其他安全措施：{{ pd.CONFIRM_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;">
+                  <div v-if="pd.LEADER_USER_ID && pd.CONFIRM_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>
+                  <div v-if="pd.AUDIT_USER_ID && pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
+                  </div>
+                  <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
+                  </div>
                 </td>
               </tr>
             </table>
@@ -123,15 +123,15 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+            <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
         <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
+          <td colspan="4">
             <div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
@@ -140,29 +140,9 @@
             </div>
           </td>
         </tr>
-        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>所在单位意见：{{ pd.PRODUCTION_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>
+          <td colspan="4">
+            <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">
@@ -170,19 +150,39 @@
             </div>
           </td>
         </tr>
-        <tr v-if="imgList1.length>0">
-          <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
-            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+        <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
+          <td colspan="4">
+            <div>审核部门意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
+          <td colspan="4">
+            <div>审批部门意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</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>
+        <tr v-if="pd.ACCEPT_USER_SIGNER_PATH">
+          <td colspan="4">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
       </table>
     </div>
-    <div style="padding-top: 100px"/>
+    <!--    <div class="ui-height" />-->
     <div class="ui-foot">
       <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
     </div>
@@ -196,12 +196,10 @@ export default {
   data() {
     return {
       config: config,
-      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      HIGHWORK_ID: this.$parent.HIGHWORK_ID, // 主键ID
       pd: [], // 存放字段参数
       measuresList: [],
       otherProtectiveMeasures: [],
-      imgList: [],
-      imgList1: [],
       hazardIdentification: []
     }
   },
@@ -228,32 +226,29 @@ export default {
       }
     },
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.HIGHWORK_ID
     },
     getData() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/goEdit',
+        '/dangerousWork/gfHighWork/goEdit',
         {
-          CUTROAD_ID: this.CUTROAD_ID
+          HIGHWORK_ID: this.HIGHWORK_ID
         }
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
         this.measuresList = data.measuresList // 参数map
-        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.pd.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
+        this.pd.LEADER_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
+        this.pd.AUDIT_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
+        this.pd.APPROVE_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
       }).catch((e) => {
         this.listLoading = false
       })
     },
     goBack() {
-      this.$parent.activeName = 'circuit_list'
-      this.$parent.CUTROAD_ID = ''
+      this.$parent.activeName = 'List'
     }
 
   }
@@ -274,6 +269,6 @@ export default {
   img
     width: 100%
     height: 100%
-.level-code
-  margin-left: auto
+.app-container
+  margin-bottom: 50px
 </style>
diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue
index 37a1684..b2ab9b8 100644
--- a/src/views/dangerousWork/highwork/components/list.vue
+++ b/src/views/dangerousWork/highwork/components/list.vue
@@ -27,39 +27,39 @@
       </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="APPLY_USER" 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 >
+      <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="AUDIT_USER_NAME" label="审核部门负责人" show-overflow-tooltip >
+        <template slot-scope="{row}">
+          {{ row.AUDIT_USER_NAME || ' 已跳过' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="APPROVE_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
+        <template slot-scope="{row}">
+          {{ row.APPROVE_USER_NAME || ' 已跳过' }}
+        </template>
+      </el-table-column>
       <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
       <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==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==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==-4">审核部门审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-5">审批部门审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
@@ -67,51 +67,53 @@
       <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.HIGHWORK_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-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1350px">
       <el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
-        <el-step title="断路安全作业提交">
+        <el-step title="高处作业提交">
           <template slot="description">
             <div>{{ getProcessMessage().title }}</div>
             <div>{{ getProcessMessage().USER_NAME }}</div>
             <div>{{ getProcessMessage().OPERATTIME }}</div>
           </template>
         </el-step>
-        <el-step title="作业负责人意见">
+        <el-step title="作业负责人意见" description="">
           <template slot="description">
             <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
             <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
         <el-step 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>
-          </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="审核部门意见" >
+          <template slot="description">
+            <div v-if="getIsPase('AUDIT_USER_NAME')">{{ '已跳过' }}</div>
+            <div v-else>{{ pd.AUDIT_USER_NAME }}</div>
+            <div>{{ pd.AUDIT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step :description="getIsPase('APPROVE_USER_NAME')" title="审批部门意见" >
+          <template slot="description">
+            <div v-if="getIsPase('APPROVE_USER_NAME')">{{ '已跳过' }}</div>
+            <div v-else>{{ pd.APPROVE_USER_NAME }}</div>
+            <div>{{ pd.APPROVE_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
         <el-step title="完成验收" description="">
           <template slot="description">
             <div>{{ pd.ACCEPT_USER_NAME }}</div>
@@ -125,47 +127,11 @@
           </template>
         </el-step>
       </el-steps>
-      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
-        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: red">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
-          </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>
       </div>
     </el-dialog>
-    <div style="height: 60px;"></div>
-    <div  class="ui-foot">
-      <el-button type="primary" @click="goBack">返 回</el-button>
-    </div>
   </div>
 </template>
 <script>
@@ -204,16 +170,16 @@ export default {
       dialogFormHuifuShow: false,
       statusList: [
         { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '0', NAME: '高处作业待提交' },
         { ID: '1', NAME: '作业负责人待审核' },
         { ID: '2', NAME: '所在单位待审核' },
-        { ID: '3', NAME: '消防、安全管理部门待审核' },
+        { ID: '3', NAME: '审核部门待审核' },
         { ID: '4', NAME: '审批部门待审核' },
         { ID: '5', NAME: '待验收' },
         { ID: '6', NAME: '验收归档' },
         { ID: '-2', NAME: '作业负责人审核打回' },
         { ID: '-3', NAME: '所在单位审核打回' },
-        { ID: '-4', NAME: '消防、安全管理部门审核打回' },
+        { ID: '-4', NAME: '审核部门审核打回' },
         { ID: '-5', NAME: '审批部门审核打回' },
         { ID: '-6', NAME: '验收打回' }
       ],
@@ -226,7 +192,7 @@ export default {
   },
   methods: {
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.HIGHWORK_ID
     },
     // 搜索
     getQuery() {
@@ -242,17 +208,32 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/dangerousWork/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
-          CORPINFO_ID: this.$parent.CORPINFO_ID,
-          ticketType: this.$parent.ticketType
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
         }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.varList
         this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'highwork:add,highwork:del,highwork:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.highworkfhadminadd		// 新增权限
+        this.del = data.highworkfhadmindel		// 删除权限
+        this.edit = data.highworkfhadminedit	// 修改权限
       }).catch((e) => {
         this.listLoading = false
       })
@@ -296,7 +277,7 @@ export default {
       if (this.pd.APPLY_STATUS >= '0') {
         obj = {
           title: '',
-          USER_NAME: this.pd.APPLY_USER_NAME,
+          USER_NAME: this.pd.APPLY_USER,
           OPERATTIME: this.pd.CREATTIME
         }
       }
@@ -310,21 +291,21 @@ export default {
       if (this.pd.APPLY_STATUS == '-3') {
         obj = {
           title: '所在单位审核打回',
-          USER_NAME: this.pd.PRODUCTION_USER_NAME,
+          USER_NAME: this.pd.LEADER_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.AUDIT_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-5') {
         obj = {
           title: '审批部门审核打回',
-          USER_NAME: this.pd.LEADER_USER_NAME,
+          USER_NAME: this.pd.APPROVE_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
@@ -342,16 +323,9 @@ export default {
         return '已跳过'
       }
     },
-    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
+      this.$parent.HIGHWORK_ID = id
     }
   }
 }
diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue
index 304c72e..0a10f2b 100644
--- a/src/views/dangerousWork/highwork/index.vue
+++ b/src/views/dangerousWork/highwork/index.vue
@@ -1,20 +1,32 @@
 <template>
   <div>
-   <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <hotwork v-if="activeName=='hotwork'"/>
+    <CorpInfo v-show="activeName=='CorpInfo'" />
+    <List v-show="activeName=='highwork_list'" />
+    <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
+
 <script>
- import CorpInfo from './components/corpInfo'
- import hotwork from './components/list'
+import List from './components/list'
+import Detail from './components/detail'
+import CorpInfo from "./components/corpInfo";
 export default {
-   components: { CorpInfo, hotwork },
+  components: {CorpInfo,List,Detail},
   data() {
     return {
-      activeName: 'CorpInfo',
-      CORPINFO_ID: '',
-      ticketType: ''
+      activeName: 'highwork_list',
+      HIGHWORK_ID: ''
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'highwork_list') {
+        this.$refs.list.getQuery()
+      }
     }
   }
 }
 </script>
+
+<style scoped>
+</style>
diff --git a/src/views/dangerousWork/hoisting/components/corpInfo.vue b/src/views/dangerousWork/hoisting/components/corpInfo.vue
index d7d1966..6d0d7d4 100644
--- a/src/views/dangerousWork/hoisting/components/corpInfo.vue
+++ b/src/views/dangerousWork/hoisting/components/corpInfo.vue
@@ -33,22 +33,22 @@
       <el-table-column prop="CORP_NAME" label="公司名称" />
       <el-table-column prop="checkedCount" label="申请总数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="checkedItemCount" label="完成数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="ybCount" label="废除数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="zdCount" label="进行数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('circuit_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('hoisting_list',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -108,7 +108,7 @@ export default {
       return new Promise((resolve) => {
         this.listLoading = true
         requestFN(
-          '/gfHoisting/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          '/dangerousWork/gfHoisting/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/hoisting/components/detail.vue b/src/views/dangerousWork/hoisting/components/detail.vue
index d253af5..5d4c98f 100644
--- a/src/views/dangerousWork/hoisting/components/detail.vue
+++ b/src/views/dangerousWork/hoisting/components/detail.vue
@@ -7,23 +7,33 @@
         <tr>
           <td colspan="6" style="border: none">
             <div class="level-title mt-20">
-              <h1>断路安全作业票</h1>
-              <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
+              <h1>吊装安全作业票</h1>
+              <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
             </div>
           </td>
         </tr>
         </thead>
         <tr>
-          <td class="bbg">申请单位</td>
+          <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>{{ pd.LEADER_DEPARTMENT_NAME }}</td>
+          <td class="bbg">作业申请时间</td>
+          <td>{{ pd.CREATTIME }}</td>
         </tr>
         <tr>
-          <td class="bbg">涉及相关单位（部门）</td>
-          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
+          <td class="bbg">吊装地点</td>
+          <td>{{ pd.WORK_PLACE }}</td>
+          <td class="bbg">吊具名称</td>
+          <td>{{ pd.TOOL_NAME }}</td>
+          <td class="bbg">吊物内容</td>
+          <td>{{ pd.WORK_CONTENT }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">吊装作业人</td>
+          <td>{{ pd.WORK_USER }}</td>
+          <td class="bbg">司索人</td>
+          <td>{{ pd.SISUO_USER }}</td>
           <td class="bbg">监护人</td>
           <td>
             <div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
@@ -34,29 +44,21 @@
           </td>
         </tr>
         <tr>
-          <td class="bbg">断路原因</td>
-          <td colspan="5">{{ pd.WORK_REASON }}</td>
-        </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 class="bbg">指挥人员</td>
+          <td>{{ pd.PROJECT_MANAGER }}</td>
+          <td class="bbg" colspan="2">吊物质量（t）及作业级别</td>
+          <td colspan="2">
+            <span>{{ pd.PART_WEIGHT }}t</span>
+            <span style="margin-left: 20px;">
+              {{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }}
+              {{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }}
+              {{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }}
+            </span>
           </td>
         </tr>
         <tr>
           <td class="bbg">风险辨识结果</td>
-          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION }}</td>
         </tr>
         <tr>
           <td class="bbg">作业实施时间</td>
@@ -73,38 +75,36 @@
               </tr>
               <tr v-for="(item,index) in measuresList" :key="index">
                 <td>{{ index + 1 }}</td>
-                <td>{{ item.PROTECTIVE_MEASURES }}</td>
+                <td>{{ item.PROTECTIVE_MEASURES }}
+
+                </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>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
                   <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
                 </td>
                 <td>
                   {{ 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 ">
+              <tr v-if="pd.LEADER_USER_MEASURES || pd.CONFIRM_USER_MEASURES || pd.AUDIT_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>
-                  <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;">
+                  <div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;">
                     <span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
                     <span>编制人：{{ pd.LEADER_USER_NAME }}</span>
                   </div>
+                  <div v-if="pd.CONSTRUCTION_USER_ID && pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
+                  </div>
+                  <div v-if="pd.AUDIT_USER_ID && pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
+                  </div>
+                  <div v-if="pd.APPROVE_USER_ID && pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                    <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
+                    <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
+                  </div>
                 </td>
               </tr>
             </table>
@@ -123,46 +123,16 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+            <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>所在单位意见：{{ pd.PRODUCTION_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>
+              <img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
         <tr v-if="pd.LEADER_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>审批部门意见：{{ pd.LEADER_CONTENT }}</div>
+            <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">
@@ -170,20 +140,51 @@
             </div>
           </td>
         </tr>
-        <tr v-if="imgList1.length>0">
-          <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
-            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>所在单位意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
+            <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + pd.CONSTRUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>审核部门意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>审批部门意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</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>
+        <tr v-if="pd.ACCEPT_USER_SIGNER_PATH">
+          <td colspan="6">
+            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
       </table>
     </div>
-    <div style="padding-top: 100px"/>
+    <!--    <div class="ui-height" />-->
     <div class="ui-foot">
+      <!--      <el-button v-print="'#printTest'" v-if="pd.APPLY_STATUS==4">打 印</el-button>-->
       <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
     </div>
   </div>
@@ -196,21 +197,47 @@ export default {
   data() {
     return {
       config: config,
-      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      HOISTING_ID: this.$parent.HOISTING_ID, // 主键ID
       pd: [], // 存放字段参数
       measuresList: [],
-      otherProtectiveMeasures: [],
-      imgList: [],
-      imgList1: [],
-      hazardIdentification: []
+      otherProtectiveMeasures: []
     }
   },
   created() {
     this.getData()
   },
   methods: {
+    handleStr(measuresList) {
+      for (let i = 0; i < measuresList.length; i++) {
+        // 将字符串转成数组
+        const PROTECTIVE_MEASURES = 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,
+              measuresList[i]['ANSWER' + j]
+            )
+          }
+        }
+        // 将数组转回字符串
+        measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
+      }
+      return measuresList
+    },
+    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
+    },
     validStr(str) {
-      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
+      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) {
+        return true
+      }
       return false
     },
     formatTime(date, column) {
@@ -228,32 +255,29 @@ export default {
       }
     },
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.HOISTING_ID
     },
     getData() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/goEdit',
+        '/dangerousWork/gfHoisting/goEdit',
         {
-          CUTROAD_ID: this.CUTROAD_ID
+          HOISTING_ID: this.HOISTING_ID
         }
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
-        this.measuresList = data.measuresList // 参数map
-        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.measuresList = this.handleStr(data.measuresList) // 参数map
+        this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
+        this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
+        this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
+        this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
       }).catch((e) => {
         this.listLoading = false
       })
     },
     goBack() {
-      this.$parent.activeName = 'circuit_list'
-      this.$parent.CUTROAD_ID = ''
+      this.$parent.activeName = 'hoisting_list'
     }
 
   }
@@ -263,17 +287,19 @@ export default {
 <style lang="sass" scoped>
 .print-approval-p10
   padding: 20px 0
+
   span
     vertical-align: middle
-.bbg
-  width: 270px
+
 .print-approval-img
   width: 200px
   height: 97px
   display: inline-block
+
   img
     width: 100%
     height: 100%
-.level-code
-  margin-left: auto
+
+.app-container
+  margin-bottom: 50px
 </style>
diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue
index 6241d41..c5f6c07 100644
--- a/src/views/dangerousWork/hoisting/components/list.vue
+++ b/src/views/dangerousWork/hoisting/components/list.vue
@@ -27,39 +27,39 @@
       </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 >
+      <el-table-column prop="LEADER_DEPARTMENT_NAME" label="作业单位" />
+      <el-table-column prop="LEADER_USER_NAME" label="作业指挥负责人" show-overflow-tooltip />
+      <el-table-column prop="CONSTRUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip>
         <template slot-scope="{row}">
-          {{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
+          {{ row.CONSTRUCTION_USER_NAME || ' 已跳过' }}
         </template>
       </el-table-column>
-      <el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
+      <el-table-column prop="AUDIT_USER_NAME" label="审核部门负责人" show-overflow-tooltip>
         <template slot-scope="{row}">
-          {{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
+          {{ row.AUDIT_USER_NAME || ' 已跳过' }}
         </template>
       </el-table-column>
-      <el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
+      <el-table-column prop="APPROVE_USER_NAME" label="审批部门负责人" show-overflow-toolti >
         <template slot-scope="{row}">
-          {{ row.LEADER_USER_NAME || ' 已跳过' }}
+          {{ row.APPROVE_USER_NAME || ' 已跳过' }}
         </template>
       </el-table-column>
       <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
       <el-table-column prop="STATUS" label="审核状态">
         <template slot-scope="{row}">
-          <span v-if="row.APPLY_STATUS==0">断路安全作业待提交</span>
-          <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</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==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==6">验收归档</span>
-          <span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</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>
         </template>
@@ -67,49 +67,51 @@
       <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.HOISTING_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-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1350px">
       <el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
-        <el-step title="断路安全作业提交">
+        <el-step title="吊装作业提交">
           <template slot="description">
             <div>{{ getProcessMessage().title }}</div>
             <div>{{ getProcessMessage().USER_NAME }}</div>
             <div>{{ getProcessMessage().OPERATTIME }}</div>
           </template>
         </el-step>
-        <el-step title="作业负责人意见">
+        <el-step title="作业指挥意见">
           <template slot="description">
-            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
-            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+            <div>{{ pd.LEADER_USER_NAME }}</div>
+            <div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
         <el-step 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 v-if="getIsPase('CONSTRUCTION_USER_NAME')">{{ '已跳过' }}</div>
+            <div v-else>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
-        <el-step title="消防、安全管理部门意见" >
+        <el-step :description="getIsPase('AUDIT_USER_NAME')" 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>
+            <div v-if="getIsPase('AUDIT_USER_NAME')">{{ '已跳过' }}</div>
+            <div v-else>{{ pd.AUDIT_USER_NAME }}</div>
+            <div>{{ pd.AUDIT_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
-        <el-step title="审批部门意见" >
+        <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>
+            <div v-if="getIsPase('APPROVE_USER_NAME')">{{ '已跳过' }}</div>
+            <div v-else>{{ pd.APPROVE_USER_NAME }}</div>
+            <div>{{ pd.APPROVE_USER_SIGNER_TIME }}</div>
           </template>
         </el-step>
         <el-step title="完成验收" description="">
@@ -125,47 +127,11 @@
           </template>
         </el-step>
       </el-steps>
-      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
-        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: red">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
-          </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>
       </div>
     </el-dialog>
-    <div style="height: 60px;"></div>
-    <div  class="ui-foot">
-      <el-button type="primary" @click="goBack">返 回</el-button>
-    </div>
   </div>
 </template>
 <script>
@@ -204,16 +170,16 @@ export default {
       dialogFormHuifuShow: false,
       statusList: [
         { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '断路安全作业待提交' },
-        { ID: '1', NAME: '作业负责人待审核' },
+        { ID: '0', NAME: '吊装作业待提交' },
+        { ID: '1', NAME: '作业指挥待审核' },
         { ID: '2', NAME: '所在单位待审核' },
-        { ID: '3', NAME: '消防、安全管理部门待审核' },
+        { ID: '3', NAME: '审核部门待审核' },
         { ID: '4', NAME: '审批部门待审核' },
         { ID: '5', NAME: '待验收' },
         { ID: '6', NAME: '验收归档' },
-        { ID: '-2', NAME: '作业负责人审核打回' },
+        { ID: '-2', NAME: '作业指挥审核打回' },
         { ID: '-3', NAME: '所在单位审核打回' },
-        { ID: '-4', NAME: '消防、安全管理部门审核打回' },
+        { ID: '-4', NAME: '审核部门审核打回' },
         { ID: '-5', NAME: '审批部门审核打回' },
         { ID: '-6', NAME: '验收打回' }
       ],
@@ -226,7 +192,7 @@ export default {
   },
   methods: {
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.HOISTING_ID
     },
     // 搜索
     getQuery() {
@@ -242,17 +208,32 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/dangerousWork/gfHoisting/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
-          CORPINFO_ID: this.$parent.CORPINFO_ID,
-          ticketType: this.$parent.ticketType
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
         }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.varList
         this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'hoisting:add,hoisting:del,hoisting:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.hoistingfhadminadd		// 新增权限
+        this.del = data.hoistingfhadmindel		// 删除权限
+        this.edit = data.hoistingfhadminedit	// 修改权限
       }).catch((e) => {
         this.listLoading = false
       })
@@ -296,35 +277,35 @@ export default {
       if (this.pd.APPLY_STATUS >= '0') {
         obj = {
           title: '',
-          USER_NAME: this.pd.APPLY_USER_NAME,
+          USER_NAME: this.pd.APPLY_USER,
           OPERATTIME: this.pd.CREATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-2') {
         obj = {
-          title: '作业负责人审核打回',
-          USER_NAME: this.pd.CONSTRUCTION_USER_NAME,
+          title: '作业指挥审核打回',
+          USER_NAME: this.pd.LEADER_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-3') {
         obj = {
           title: '所在单位审核打回',
-          USER_NAME: this.pd.PRODUCTION_USER_NAME,
+          USER_NAME: this.pd.CONSTRUCTION_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.AUDIT_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
       if (this.pd.APPLY_STATUS == '-5') {
         obj = {
           title: '审批部门审核打回',
-          USER_NAME: this.pd.LEADER_USER_NAME,
+          USER_NAME: this.pd.APPROVE_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
       }
@@ -342,16 +323,9 @@ export default {
         return '已跳过'
       }
     },
-    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
+      this.$parent.activeName = 'Hoisting'
+      this.$parent.HOISTING_ID = id
     }
   }
 }
diff --git a/src/views/dangerousWork/hoisting/index.vue b/src/views/dangerousWork/hoisting/index.vue
index 0795164..fe80378 100644
--- a/src/views/dangerousWork/hoisting/index.vue
+++ b/src/views/dangerousWork/hoisting/index.vue
@@ -1,20 +1,33 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-   <Hoisting v-if="activeName=='Hoisting'"/>
+    <List v-show="activeName=='hoisting_list'" />
+    <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
+
 <script>
- import CorpInfo from './components/corpInfo'
- import Hoisting from './components/list'
+import CorpInfo from './components/corpInfo'
+import List from './components/list'
+import Detail from './components/detail'
 export default {
-  components: { CorpInfo, Hoisting },
+  components: { CorpInfo, List, Detail },
   data() {
     return {
       activeName: 'CorpInfo',
-      CORPINFO_ID: '',
-      ticketType: ''
+      HOISTING_ID: ''
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        this.$refs.list.getQuery()
+      }
     }
   }
 }
 </script>
+
+<style scoped>
+</style>
+
diff --git a/src/views/dangerousWork/lectricity/components/detail.vue b/src/views/dangerousWork/lectricity/components/detail.vue
deleted file mode 100644
index d253af5..0000000
--- a/src/views/dangerousWork/lectricity/components/detail.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<template>
-  <div>
-    <div id="printTest" class="app-container print-work">
-      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
-      <table class="table-ui">
-        <thead>
-        <tr>
-          <td colspan="6" style="border: none">
-            <div class="level-title mt-20">
-              <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>
-        </tr>
-        <tr>
-          <td class="bbg">涉及相关单位（部门）</td>
-          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
-          <td class="bbg">监护人</td>
-          <td>
-            <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>
-        </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>
-        </tr>
-        <tr>
-          <td class="bbg">风险辨识结果</td>
-          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">作业实施时间</td>
-          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <table class="table-ui">
-              <tr>
-                <td>序号</td>
-                <td>安全措施</td>
-                <td>是否涉及</td>
-                <td>确认人</td>
-              </tr>
-              <tr v-for="(item,index) in measuresList" :key="index">
-                <td>{{ index + 1 }}</td>
-                <td>{{ item.PROTECTIVE_MEASURES }}</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>
-                </td>
-                <td>
-                  {{ 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>
-                <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>
-                  <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>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <tr>
-          <td class="bbg">安全交底人</td>
-          <td colspan="10">
-            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="bbg">接受交底人</td>
-          <td colspan="10">
-            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONSTRUCTION_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>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>所在单位意见：{{ pd.PRODUCTION_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>
-            </div>
-          </td>
-        </tr>
-        <tr v-if="imgList1.length>0">
-          <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
-            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
-            </div>
-          </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>
-  </div>
-</template>
-
-<script>
-import { requestFN } from '@/utils/request'
-import dateformat from '@/utils/dateformat'
-export default {
-  data() {
-    return {
-      config: config,
-      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
-      pd: [], // 存放字段参数
-      measuresList: [],
-      otherProtectiveMeasures: [],
-      imgList: [],
-      imgList1: [],
-      hazardIdentification: []
-    }
-  },
-  created() {
-    this.getData()
-  },
-  methods: {
-    validStr(str) {
-      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
-      return false
-    },
-    formatTime(date, column) {
-      if (date) {
-        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
-      } else {
-        return ''
-      }
-    },
-    formatDate(date, column) {
-      if (date) {
-        return dateformat(date, 'YYYY-MM-DD')
-      } else {
-        return ''
-      }
-    },
-    getRowKey(row) {
-      return row.CUTROAD_ID
-    },
-    getData() {
-      this.listLoading = true
-      requestFN(
-        '/dangerousWork/gfcutroad/goEdit',
-        {
-          CUTROAD_ID: this.CUTROAD_ID
-        }
-      ).then((data) => {
-        this.listLoading = false
-        this.pd = data.pd // 参数map
-        this.measuresList = data.measuresList // 参数map
-        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]
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-    goBack() {
-      this.$parent.activeName = 'circuit_list'
-      this.$parent.CUTROAD_ID = ''
-    }
-
-  }
-}
-</script>
-
-<style lang="sass" scoped>
-.print-approval-p10
-  padding: 20px 0
-  span
-    vertical-align: middle
-.bbg
-  width: 270px
-.print-approval-img
-  width: 200px
-  height: 97px
-  display: inline-block
-  img
-    width: 100%
-    height: 100%
-.level-code
-  margin-left: auto
-</style>
diff --git a/src/views/dangerousWork/limitspace/components/detail.vue b/src/views/dangerousWork/limitspace/components/detail.vue
index d253af5..c1dbe84 100644
--- a/src/views/dangerousWork/limitspace/components/detail.vue
+++ b/src/views/dangerousWork/limitspace/components/detail.vue
@@ -7,7 +7,7 @@
         <tr>
           <td colspan="6" style="border: none">
             <div class="level-title mt-20">
-              <h1>断路安全作业票</h1>
+              <h1>有限空间作业票</h1>
               <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
             </div>
           </td>
diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue
index 6241d41..f2b598a 100644
--- a/src/views/dangerousWork/limitspace/components/list.vue
+++ b/src/views/dangerousWork/limitspace/components/list.vue
@@ -242,7 +242,7 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/gfLimitSpace/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
           DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),

From 117daa34d04f2d90f95afec212cb897df08c2488 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 19:01:40 +0800
Subject: [PATCH 36/53] =?UTF-8?q?1.=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../limitspace/components/corpInfo.vue        |   2 +-
 .../limitspace/components/detail.vue          | 252 ++++++++++--------
 .../limitspace/components/list.vue            | 188 ++++++-------
 src/views/dangerousWork/limitspace/index.vue  |   8 +-
 4 files changed, 230 insertions(+), 220 deletions(-)

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: ''
     }
   }
 }

From ec00128c3ba3cafb1e0ab8c9165e0944dbe4149b Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 27 Jun 2024 19:13:52 +0800
Subject: [PATCH 37/53] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A-?=
 =?UTF-8?q?=E6=96=AD=E8=B7=AF=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dangerousWork/circuit/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dangerousWork/circuit/index.vue b/src/views/dangerousWork/circuit/index.vue
index c5477fc..0c0ba5e 100644
--- a/src/views/dangerousWork/circuit/index.vue
+++ b/src/views/dangerousWork/circuit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-show="activeName=='circuit_list'"/>
+    <circuitList v-if="activeName=='circuit_list'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>

From 9eda4f728d64f4247f3010886d5e2cb48cd6f7fc Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 20:15:37 +0800
Subject: [PATCH 38/53] =?UTF-8?q?1.=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9Abug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blindboard/components/corpInfo.vue        |   2 +-
 .../blindboard/components/detail.vue          | 162 +++++++--------
 .../blindboard/components/list.vue            | 189 +++---------------
 src/views/dangerousWork/blindboard/index.vue  |   2 +-
 .../breakground/components/corpInfo.vue       |   8 +-
 .../breakground/components/detail.vue         |  44 ++--
 .../breakground/components/list.vue           | 122 ++---------
 src/views/dangerousWork/breakground/index.vue |   8 +-
 src/views/dangerousWork/circuit/index.vue     |   2 +-
 9 files changed, 162 insertions(+), 377 deletions(-)

diff --git a/src/views/dangerousWork/blindboard/components/corpInfo.vue b/src/views/dangerousWork/blindboard/components/corpInfo.vue
index 44db46b..c36d20a 100644
--- a/src/views/dangerousWork/blindboard/components/corpInfo.vue
+++ b/src/views/dangerousWork/blindboard/components/corpInfo.vue
@@ -10,7 +10,7 @@
         </div>
       </div>
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索222
+        搜索
       </el-button>
       <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
         重置
diff --git a/src/views/dangerousWork/blindboard/components/detail.vue b/src/views/dangerousWork/blindboard/components/detail.vue
index 225a315..da67618 100644
--- a/src/views/dangerousWork/blindboard/components/detail.vue
+++ b/src/views/dangerousWork/blindboard/components/detail.vue
@@ -5,47 +5,54 @@
       <table class="table-ui">
         <thead>
         <tr>
-          <td colspan="6" style="border: none">
+          <td colspan="8" 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 colspan="2">{{ 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>
-        </tr>
-        <tr>
-          <td class="bbg">涉及相关单位（部门）</td>
-          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
-          <td class="bbg">监护人</td>
+          <td colspan="2">{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
+          <td class="bbg">作业类别</td>
           <td>
-            <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>
+            <input :checked="pd.WORK_TYPE=='1'" type="checkbox" disabled>堵盲板
+            <input :checked="pd.WORK_TYPE=='2'" type="checkbox" disabled>抽盲板
           </td>
         </tr>
         <tr>
-          <td class="bbg">断路原因</td>
-          <td colspan="5">{{ pd.WORK_REASON }}</td>
+          <td rowspan="2" class="bbg">设备、管道名称</td>
+          <td colspan="3" class="bbg">管道参数</td>
+          <td colspan="3" class="bbg">盲板参数</td>
+          <td rowspan="2" class="bbg">实际作业开始时间</td>
         </tr>
         <tr>
-          <td class="bbg">关联的其他特殊作业及安全作业票编号</td>
-          <td colspan="5">{{ pd.SPECIAL_WORK }}</td>
+          <td class="bbg">介质</td>
+          <td class="bbg">温度</td>
+          <td class="bbg">压力</td>
+          <td class="bbg">材质</td>
+          <td class="bbg">规格</td>
+          <td class="bbg">编号</td>
+        </tr>
+        <tr v-for="(item,index) in boardList" :key="index">
+          <td v-if="index == 0" :rowspan="boardList.length">{{ pd.NAME }}</td>
+          <td v-if="index == 0" :rowspan="boardList.length">{{ pd.MEDIUM }}</td>
+          <td v-if="index == 0" :rowspan="boardList.length">{{ pd.TEMPERATURE }}</td>
+          <td v-if="index == 0" :rowspan="boardList.length">{{ pd.PRESSURE }}</td>
+          <td>{{ item.BOARD_MATERIAL }}</td>
+          <td>{{ item.BOARD_SPECIFICATION }}</td>
+          <td>{{ item.BOARD_NO }}</td>
+          <td v-if="index == 0" :rowspan="boardList.length">{{ pd.BOARD_INSTALL_TIME }}</td>
         </tr>
         <tr>
-          <td colspan="6">
-            <div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
+          <td colspan="8">
+            <div>盲板位置图（可另附图）及编号：</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">
+              <img v-viewer :src="config.fileUrl + pd.BOARD_PATH" alt="" width="100" height="100">
               <div>
                 编制人：
                 <img v-viewer :src="config.fileUrl + pd.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -55,15 +62,29 @@
           </td>
         </tr>
         <tr>
-          <td class="bbg">风险辨识结果</td>
-          <td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
+          <td colspan="2" class="bbg">作业负责人</td>
+          <td colspan="2">{{ pd.CONSTRUCTION_USER_NAME }}</td>
+          <td class="bbg">作业人</td>
+          <td>{{ pd.WORK_USER }}</td>
+          <td class="bbg">监护人</td>
+          <td v-if="pd.GUARDIAN_USER_SIGNER_PATH" colspan="5">
+            <div 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_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+          <td colspan="2" class="bbg">关联的其他特殊作业及安全作业票编号</td>
+          <td colspan="6">{{ pd.SPECIAL_WORK }}</td>
         </tr>
         <tr>
-          <td colspan="6">
+          <td colspan="2" class="bbg">风险辨识结果</td>
+          <td colspan="6">{{ pd.BOARD_HARM }}</td>
+        </tr>
+        <tr>
+          <td colspan="8">
             <table class="table-ui">
               <tr>
                 <td>序号</td>
@@ -82,7 +103,7 @@
                   {{ 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 ">
+              <tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.LEADER_USER_MEASURES">
                 <td>{{ measuresList.length + 1 }}</td>
                 <td colspan="3">
                   <div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
@@ -93,15 +114,7 @@
                     <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;">
+                  <div v-if="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>
@@ -131,7 +144,7 @@
           </td>
         </tr>
         <tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
+          <td colspan="8">
             <div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
@@ -140,29 +153,9 @@
             </div>
           </td>
         </tr>
-        <tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
-          <td colspan="6">
-            <div>所在单位意见：{{ pd.PRODUCTION_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>
+          <td colspan="8">
+            <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">
@@ -196,23 +189,18 @@ export default {
   data() {
     return {
       config: config,
-      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      BLINDBOARD_ID: this.$parent.BLINDBOARD_ID, // 主键ID
       pd: [], // 存放字段参数
-      measuresList: [],
-      otherProtectiveMeasures: [],
+      boardList: [],
       imgList: [],
       imgList1: [],
-      hazardIdentification: []
+      measuresList: []
     }
   },
   created() {
     this.getData()
   },
   methods: {
-    validStr(str) {
-      if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
-      return false
-    },
     formatTime(date, column) {
       if (date) {
         return dateformat(date, 'YYYY年MM月DD日HH时mm分')
@@ -228,32 +216,31 @@ export default {
       }
     },
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.BLINDBOARD_ID
     },
     getData() {
       this.listLoading = true
       requestFN(
-        '/dangerousWork/gfcutroad/goEdit',
+        '/dangerousWork/gfBlindBoard/goEdit',
         {
-          CUTROAD_ID: this.CUTROAD_ID
+          BLINDBOARD_ID: this.BLINDBOARD_ID
         }
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
-        this.measuresList = data.measuresList // 参数map
         this.imgList = data.imgList
+        this.imgList1 = data.imgList
+        this.boardList = data.boardList // 参数map
+        this.measuresList = data.measuresList // 参数map
         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.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
       }).catch((e) => {
         this.listLoading = false
       })
     },
     goBack() {
-      this.$parent.activeName = 'circuit_list'
-      this.$parent.CUTROAD_ID = ''
+      this.$parent.activeName = 'Blindboard'
     }
 
   }
@@ -265,15 +252,14 @@ export default {
   padding: 20px 0
   span
     vertical-align: middle
-.bbg
-  width: 270px
-.print-approval-img
-  width: 200px
-  height: 97px
-  display: inline-block
-  img
-    width: 100%
-    height: 100%
+
+  .print-approval-img
+    width: 200px
+    height: 97px
+    display: inline-block
+    img
+      width: 100%
+      height: 100%
 .level-code
   margin-left: auto
 </style>
diff --git a/src/views/dangerousWork/blindboard/components/list.vue b/src/views/dangerousWork/blindboard/components/list.vue
index aa90270..68a27f8 100644
--- a/src/views/dangerousWork/blindboard/components/list.vue
+++ b/src/views/dangerousWork/blindboard/components/list.vue
@@ -27,47 +27,43 @@
       </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="NAME" label="设备管道名称" show-overflow-tooltip />
       <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 >
+      <el-table-column prop="APPLY_USER_NAME" label="申请人" width="100" />
+      <el-table-column prop="APPLY_DEPARTMENT_NAME" label="申请部门" />
+      <el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip >
         <template slot-scope="{row}">
-          {{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
+          {{ row.CONSTRUCTION_USER_NAME }}
         </template>
       </el-table-column>
-      <el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
+      <el-table-column prop="LEADER_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
         <template slot-scope="{row}">
-          {{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
+          {{ row.LEADER_USER_NAME }}
         </template>
       </el-table-column>
-      <el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
+      <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip >
         <template slot-scope="{row}">
-          {{ row.LEADER_USER_NAME || ' 已跳过' }}
+          {{ row.ACCEPT_USER_NAME }}
         </template>
       </el-table-column>
-      <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
       <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==-5">所在单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</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.BLINDBOARD_ID)">审批表详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -78,92 +74,6 @@
       </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="断路安全作业提交">
-          <template slot="description">
-            <div>{{ getProcessMessage().title }}</div>
-            <div>{{ getProcessMessage().USER_NAME }}</div>
-            <div>{{ getProcessMessage().OPERATTIME }}</div>
-          </template>
-        </el-step>
-        <el-step title="作业负责人意见">
-          <template slot="description">
-            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
-            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-        <el-step 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>
-          </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="">
-          <template slot="description">
-            <div>{{ pd.ACCEPT_USER_NAME }}</div>
-            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-        <el-step title="验收归档" description="">
-          <template slot="description">
-            <div>{{ pd.ACCEPT_USER_NAME }}</div>
-            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-      </el-steps>
-      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
-        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: red">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
-          </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>
-      </div>
-    </el-dialog>
     <div style="height: 60px;"></div>
     <div  class="ui-foot">
       <el-button type="primary" @click="goBack">返 回</el-button>
@@ -206,18 +116,14 @@ 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: '-2', NAME: '作业负责人待审核打回' },
+        { ID: '-5', NAME: '所在单位领导人待审核打回' },
+        { ID: '-6', NAME: '待验收打回' }
       ],
       STATUS: '',
       DEPTIDS: ''
@@ -244,36 +150,22 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/gfCutRoad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/dangerousWork/gfBlindBoard/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.varList
         this.total = data.page.totalResult
-        this.hasButton()
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-    // 判断按钮权限，用于是否显示按钮
-    hasButton() {
-      var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel'
-      requestFN(
-        '/head/hasButton',
-        {
-          keys: keys
-        }
-      ).then((data) => {
-        this.add = data.cutroadfhadminadd		// 新增权限
-        this.del = data.cutroadfhadmindel		// 删除权限
-        this.edit = data.cutroadfhadminedit	// 修改权限
       }).catch((e) => {
         this.listLoading = false
       })
     },
+
     goChart(row) {
       this.pd = row
       this.dialogFormShow = true
@@ -285,20 +177,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() {
@@ -324,23 +210,9 @@ export default {
           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,
-          OPERATTIME: this.pd.OPERATTIME
-        }
-      }
       if (this.pd.APPLY_STATUS == '-5') {
         obj = {
-          title: '审批部门审核打回',
+          title: '所在单位审核打回',
           USER_NAME: this.pd.LEADER_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
@@ -361,7 +233,10 @@ export default {
     },
     goDetail(id) {
       this.$parent.activeName = 'Detail'
-      this.$parent.CUTROAD_ID = id
+      this.$parent.BLINDBOARD_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
     }
   }
 }
diff --git a/src/views/dangerousWork/blindboard/index.vue b/src/views/dangerousWork/blindboard/index.vue
index 17f8ac2..060b772 100644
--- a/src/views/dangerousWork/blindboard/index.vue
+++ b/src/views/dangerousWork/blindboard/index.vue
@@ -16,7 +16,7 @@ export default {
       activeName: 'CorpInfo',
       CORPINFO_ID: '',
       ticketType: '',
-      CUTROAD_ID: ''
+      BLINDBOARD_ID: ''
     }
   }
 }
diff --git a/src/views/dangerousWork/breakground/components/corpInfo.vue b/src/views/dangerousWork/breakground/components/corpInfo.vue
index b082343..975c20a 100644
--- a/src/views/dangerousWork/breakground/components/corpInfo.vue
+++ b/src/views/dangerousWork/breakground/components/corpInfo.vue
@@ -33,22 +33,22 @@
       <el-table-column prop="CORP_NAME" label="公司名称" />
       <el-table-column prop="checkedCount" label="申请总数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
+          <span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="checkedItemCount" label="完成数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
+          <span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="ybCount" label="废除数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
+          <span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="zdCount" label="进行数" align="center" >
         <template slot-scope="{row}">
-          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
+          <span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue
index ead3fbf..e408759 100644
--- a/src/views/dangerousWork/breakground/components/detail.vue
+++ b/src/views/dangerousWork/breakground/components/detail.vue
@@ -8,7 +8,7 @@
           <td colspan="6" style="border: none">
             <div class="level-title mt-20">
               <h1>动土安全作业票</h1>
-              <div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
+              <div class="level-code">编号:{{ pd.CHECK_NO }}</div>
             </div>
           </td>
         </tr>
@@ -16,14 +16,18 @@
         <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" colspan="2">作业申请时间</td>
+          <td colspan="2">{{ pd.CREATTIME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">作业单位</td>
+          <td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
+          <td class="bbg">作业地点</td>
+          <td>{{ pd.WORK_PLACE }}</td>
+          <td class="bbg">作业内容</td>
+          <td>{{ pd.JOB_CONTENT }}</td>
         </tr>
         <tr>
-          <td class="bbg">涉及相关单位（部门）</td>
-          <td colspan="3">{{ pd.OTHER_DEPT }}</td>
           <td class="bbg">监护人</td>
           <td>
             <div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
@@ -32,10 +36,8 @@
               <span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
             </div>
           </td>
-        </tr>
-        <tr>
-          <td class="bbg">断路原因</td>
-          <td colspan="5">{{ pd.WORK_REASON }}</td>
+          <td class="bbg" colspan="2">作业负责人</td>
+          <td colspan="2">{{ pd.CONSTRUCTION_USER_NAME }}</td>
         </tr>
         <tr>
           <td class="bbg">关联的其他特殊作业及安全作业票编号</td>
@@ -43,7 +45,7 @@
         </tr>
         <tr>
           <td colspan="6">
-            <div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
+            <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>
@@ -82,7 +84,7 @@
                   {{ 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 ">
+              <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>
                 <td colspan="3">
                   <div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
@@ -152,7 +154,7 @@
         </tr>
         <tr v-if="pd.SAFETY_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
+            <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">
@@ -196,12 +198,12 @@ export default {
   data() {
     return {
       config: config,
-      CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
+      BREAKGROUND_ID: this.$parent.BREAKGROUND_ID, // 主键ID
       pd: [], // 存放字段参数
       measuresList: [],
-      otherProtectiveMeasures: [],
       imgList: [],
       imgList1: [],
+      otherProtectiveMeasures: [],
       hazardIdentification: []
     }
   },
@@ -228,20 +230,21 @@ export default {
       }
     },
     getRowKey(row) {
-      return row.CUTROAD_ID
+      return row.BREAKGROUND_ID
     },
     getData() {
       this.listLoading = true
       requestFN(
         '/gfBreakGround/goEdit',
         {
-          CUTROAD_ID: this.CUTROAD_ID
+          BREAKGROUND_ID: this.BREAKGROUND_ID
         }
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
-        this.measuresList = data.measuresList // 参数map
         this.imgList = data.imgList
+        this.imgList1 = data.imgList
+        this.measuresList = data.measuresList // 参数map
         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]
@@ -252,8 +255,7 @@ export default {
       })
     },
     goBack() {
-      this.$parent.activeName = 'circuit_list'
-      this.$parent.CUTROAD_ID = ''
+      this.$parent.activeName = 'Breakground'
     }
 
   }
diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue
index 82cfb2e..1099372 100644
--- a/src/views/dangerousWork/breakground/components/list.vue
+++ b/src/views/dangerousWork/breakground/components/list.vue
@@ -30,16 +30,18 @@
       <el-table-column :reserve-selection="true" type="selection" width="57" 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_DEPARTMENT_NAME" label="施工单位" />
+      <el-table-column prop="APPLY_USER_NAME" label="申请人" width="100" />
+      <el-table-column prop="APPLY_DEPARTMENT_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">
+      <el-table-column prop="SAFETY_USER_NAME" label="有关部门负责人" show-overflow-tooltip >
         <template slot-scope="{row}">
-          {{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
+          {{ row.SAFETY_USER_NAME || ' 已跳过' }}
         </template>
       </el-table-column>
       <el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
@@ -50,16 +52,16 @@
       <el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
       <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==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==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==-4">有关部门审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-5">审批部门审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
@@ -67,7 +69,7 @@
       <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.BREAKGROUND_ID)">审批表详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -78,92 +80,6 @@
       </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="断路安全作业提交">
-          <template slot="description">
-            <div>{{ getProcessMessage().title }}</div>
-            <div>{{ getProcessMessage().USER_NAME }}</div>
-            <div>{{ getProcessMessage().OPERATTIME }}</div>
-          </template>
-        </el-step>
-        <el-step title="作业负责人意见">
-          <template slot="description">
-            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
-            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-        <el-step 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>
-          </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="">
-          <template slot="description">
-            <div>{{ pd.ACCEPT_USER_NAME }}</div>
-            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-        <el-step title="验收归档" description="">
-          <template slot="description">
-            <div>{{ pd.ACCEPT_USER_NAME }}</div>
-            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
-          </template>
-        </el-step>
-      </el-steps>
-      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
-        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
-          <div style="color: red">
-            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
-          </div>
-        </div>
-        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: #13ce66">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
-          </div>
-        </div>
-        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
-          <div style="color: red">
-            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
-          </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>
-      </div>
-    </el-dialog>
     <div style="height: 60px;"></div>
     <div  class="ui-foot">
       <el-button type="primary" @click="goBack">返 回</el-button>
@@ -206,16 +122,16 @@ export default {
       dialogFormHuifuShow: false,
       statusList: [
         { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '断路安全作业待提交' },
+        { ID: '0', NAME: '动土作业待提交' },
         { ID: '1', NAME: '作业负责人待审核' },
         { ID: '2', NAME: '所在单位待审核' },
-        { ID: '3', NAME: '消防、安全管理部门待审核' },
+        { ID: '3', NAME: '有关部门待审核' },
         { ID: '4', NAME: '审批部门待审核' },
         { ID: '5', NAME: '待验收' },
         { ID: '6', NAME: '验收归档' },
         { ID: '-2', NAME: '作业负责人审核打回' },
         { ID: '-3', NAME: '所在单位审核打回' },
-        { ID: '-4', NAME: '消防、安全管理部门审核打回' },
+        { ID: '-4', NAME: '有关部门审核打回' },
         { ID: '-5', NAME: '审批部门审核打回' },
         { ID: '-6', NAME: '验收打回' }
       ],
@@ -247,7 +163,9 @@ export default {
         '/gfBreakGround/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -258,7 +176,7 @@ export default {
         this.listLoading = false
       })
     },
-   
+
     goChart(row) {
       this.pd = row
       this.dialogFormShow = true
@@ -318,7 +236,7 @@ export default {
       }
       if (this.pd.APPLY_STATUS == '-4') {
         obj = {
-          title: '消防、安全管理部门审核打回',
+          title: '有关部门审核打回',
           USER_NAME: this.pd.SAFETY_USER_NAME,
           OPERATTIME: this.pd.OPERATTIME
         }
@@ -346,7 +264,11 @@ export default {
     },
     goDetail(id) {
       this.$parent.activeName = 'Detail'
-      this.$parent.CUTROAD_ID = id
+      this.$parent.BREAKGROUND_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.BREAKGROUND_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/breakground/index.vue b/src/views/dangerousWork/breakground/index.vue
index 17f8ac2..d2b781b 100644
--- a/src/views/dangerousWork/breakground/index.vue
+++ b/src/views/dangerousWork/breakground/index.vue
@@ -1,22 +1,22 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <Blindboard v-if="activeName=='Blindboard'"/>
+    <Breakground v-if="activeName=='Breakground'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
 <script>
 import CorpInfo from './components/corpInfo'
-import Blindboard from './components/list'
+import Breakground from './components/list'
 import Detail from './components/detail'
 export default {
-  components: { CorpInfo, Blindboard,Detail },
+  components: { CorpInfo, Breakground,Detail },
   data() {
     return {
       activeName: 'CorpInfo',
       CORPINFO_ID: '',
       ticketType: '',
-      CUTROAD_ID: ''
+      BREAKGROUND_ID: ''
     }
   }
 }
diff --git a/src/views/dangerousWork/circuit/index.vue b/src/views/dangerousWork/circuit/index.vue
index c5477fc..0c0ba5e 100644
--- a/src/views/dangerousWork/circuit/index.vue
+++ b/src/views/dangerousWork/circuit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-show="activeName=='circuit_list'"/>
+    <circuitList v-if="activeName=='circuit_list'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>

From 59edf1e6af2f02d1f7e91d9ca22e2a7d54605000 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 27 Jun 2024 20:39:15 +0800
Subject: [PATCH 39/53] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A-?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dangerousWork/highwork/index.vue                 | 4 ++--
 src/views/dangerousWork/limitspace/components/corpInfo.vue | 2 +-
 src/views/dangerousWork/limitspace/components/list.vue     | 2 +-
 src/views/dangerousWork/limitspace/index.vue               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue
index 0a10f2b..59d2d6d 100644
--- a/src/views/dangerousWork/highwork/index.vue
+++ b/src/views/dangerousWork/highwork/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" />
-    <List v-show="activeName=='highwork_list'" />
+    <List v-if="activeName=='highwork_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
@@ -14,7 +14,7 @@ export default {
   components: {CorpInfo,List,Detail},
   data() {
     return {
-      activeName: 'highwork_list',
+      activeName: 'CorpInfo',
       HIGHWORK_ID: ''
     }
   },
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/list.vue b/src/views/dangerousWork/limitspace/components/list.vue
index f2b598a..44de790 100644
--- a/src/views/dangerousWork/limitspace/components/list.vue
+++ b/src/views/dangerousWork/limitspace/components/list.vue
@@ -242,7 +242,7 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/gfLimitSpace/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,
           DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
diff --git a/src/views/dangerousWork/limitspace/index.vue b/src/views/dangerousWork/limitspace/index.vue
index d450b83..6e79603 100644
--- a/src/views/dangerousWork/limitspace/index.vue
+++ b/src/views/dangerousWork/limitspace/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-show="activeName=='LimitSpace'"/>
+    <circuitList v-if="activeName=='LimitSpace'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>

From 045793c5fd09c1fcbb53fb156de02948db81d1ff Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 20:41:28 +0800
Subject: [PATCH 40/53] =?UTF-8?q?1.=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9Abug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blindboard/components/list.vue            | 71 +++++++++++++++
 .../breakground/components/detail.vue         |  8 +-
 .../breakground/components/list.vue           | 91 ++++++++++++++++++-
 3 files changed, 166 insertions(+), 4 deletions(-)

diff --git a/src/views/dangerousWork/blindboard/components/list.vue b/src/views/dangerousWork/blindboard/components/list.vue
index 68a27f8..6c2ff25 100644
--- a/src/views/dangerousWork/blindboard/components/list.vue
+++ b/src/views/dangerousWork/blindboard/components/list.vue
@@ -74,6 +74,77 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
+    <el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1200px">
+      <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>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见">
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step description="" title="所在单位意见">
+          <template slot="description">
+            <div>{{ pd.LEADER_USER_NAME }}</div>
+            <div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <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="验收归档">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
     <div style="height: 60px;"></div>
     <div  class="ui-foot">
       <el-button type="primary" @click="goBack">返 回</el-button>
diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue
index e408759..f0dc14f 100644
--- a/src/views/dangerousWork/breakground/components/detail.vue
+++ b/src/views/dangerousWork/breakground/components/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div id="printTest" class="app-container print-work">
-      <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
+      <el-page-header content="审批表详情" class="no-print" @back="goBack()"/>
       <table class="table-ui">
         <thead>
         <tr>
@@ -186,7 +186,7 @@
     </div>
     <div style="padding-top: 100px"/>
     <div class="ui-foot">
-      <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
+      <el-button icon="el-icon-arrow-left" @click="goBack()">返 回</el-button>
     </div>
   </div>
 </template>
@@ -208,6 +208,7 @@ export default {
     }
   },
   created() {
+    console.info()
     this.getData()
   },
   methods: {
@@ -257,8 +258,9 @@ export default {
     goBack() {
       this.$parent.activeName = 'Breakground'
     }
-
   }
+
+
 }
 </script>
 
diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue
index 1099372..56b5197 100644
--- a/src/views/dangerousWork/breakground/components/list.vue
+++ b/src/views/dangerousWork/breakground/components/list.vue
@@ -28,7 +28,7 @@
     </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 type="index" label="序号" width="50" align="center" />
+      <el-table-column type="index" label="序号222" width="50" align="center" />
       <el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
       <el-table-column prop="CONSTRUCTION_DEPARTMENT_NAME" label="施工单位" />
       <el-table-column prop="APPLY_USER_NAME" label="申请人" width="100" />
@@ -80,6 +80,93 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
+    <el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1350px">
+      <el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
+        <el-step title="动土作业提交">
+          <template slot="description">
+            <div>{{ getProcessMessage().title }}</div>
+            <div>{{ getProcessMessage().USER_NAME }}</div>
+            <div>{{ getProcessMessage().OPERATTIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="作业负责人意见" >
+          <template slot="description">
+            <div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
+            <div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step 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>
+          </template>
+        </el-step>
+        <el-step title="有关部门意见" >
+          <template slot="description">
+            <div v-if="getIsPase('SAFETY_USER_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="完成验收">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+        <el-step title="验收归档">
+          <template slot="description">
+            <div>{{ pd.ACCEPT_USER_NAME }}</div>
+            <div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
+          </template>
+        </el-step>
+
+      </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </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>
+      </div>
+    </el-dialog>
     <div style="height: 60px;"></div>
     <div  class="ui-foot">
       <el-button type="primary" @click="goBack">返 回</el-button>
@@ -263,6 +350,8 @@ export default {
       }
     },
     goDetail(id) {
+      console.info('222222222222222222222 ')
+      console.info(id)
       this.$parent.activeName = 'Detail'
       this.$parent.BREAKGROUND_ID = id
     },

From f2a07c9b6b90f4f76c359ee5d03f6a7505a9cadf Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 20:52:05 +0800
Subject: [PATCH 41/53] =?UTF-8?q?1.=E5=85=B6=E4=BB=96=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=9A=84=E9=A3=8E=E9=99=A9=E5=9B=9B=E8=89=B2=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dangerousWork/electricity/components/detail.vue  |  2 +-
 .../dangerousWork/electricity/components/list.vue    | 12 +++++++++++-
 src/views/dangerousWork/electricity/index.vue        |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/dangerousWork/electricity/components/detail.vue b/src/views/dangerousWork/electricity/components/detail.vue
index 68d76d5..f1d6d8e 100644
--- a/src/views/dangerousWork/electricity/components/detail.vue
+++ b/src/views/dangerousWork/electricity/components/detail.vue
@@ -246,7 +246,7 @@ export default {
       })
     },
     goBack() {
-      this.$parent.activeName = 'List'
+      this.$parent.activeName = 'electricity_list'
     }
 
   }
diff --git a/src/views/dangerousWork/electricity/components/list.vue b/src/views/dangerousWork/electricity/components/list.vue
index 5a22405..8f13eb3 100644
--- a/src/views/dangerousWork/electricity/components/list.vue
+++ b/src/views/dangerousWork/electricity/components/list.vue
@@ -109,6 +109,10 @@
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
   </div>
 </template>
 <script>
@@ -186,7 +190,9 @@ export default {
         '/dangerousWork/gfElectricity/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -291,6 +297,10 @@ export default {
     goDetail(id) {
       this.$parent.activeName = 'Detail'
       this.$parent.ELECTRICITY_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.BREAKGROUND_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/electricity/index.vue b/src/views/dangerousWork/electricity/index.vue
index 5f08fe2..45fe6f7 100644
--- a/src/views/dangerousWork/electricity/index.vue
+++ b/src/views/dangerousWork/electricity/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <List v-show="activeName=='electricity_list'" />
+    <List v-if="activeName=='electricity_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>

From 484c95f85b4ba7c9cbb391b94da3628b1793ff39 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 21:07:11 +0800
Subject: [PATCH 42/53] =?UTF-8?q?1.=E5=90=8A=E8=A3=85=E4=BD=9C=E4=B8=9Abug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dangerousWork/hoisting/components/list.vue    | 15 +++++++++++++--
 src/views/dangerousWork/hoisting/index.vue        |  5 +++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue
index c5f6c07..c4f1a5b 100644
--- a/src/views/dangerousWork/hoisting/components/list.vue
+++ b/src/views/dangerousWork/hoisting/components/list.vue
@@ -132,6 +132,10 @@
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
   </div>
 </template>
 <script>
@@ -211,7 +215,9 @@ export default {
         '/dangerousWork/gfHoisting/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -324,8 +330,13 @@ export default {
       }
     },
     goDetail(id) {
-      this.$parent.activeName = 'Hoisting'
+      this.$parent.activeName = 'Detail'
       this.$parent.HOISTING_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.HOISTING_ID = ''
+      this.$parent.ticketType =''
     }
   }
 }
diff --git a/src/views/dangerousWork/hoisting/index.vue b/src/views/dangerousWork/hoisting/index.vue
index fe80378..3bd85cb 100644
--- a/src/views/dangerousWork/hoisting/index.vue
+++ b/src/views/dangerousWork/hoisting/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <List v-show="activeName=='hoisting_list'" />
+    <List v-if="activeName=='hoisting_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
@@ -15,7 +15,8 @@ export default {
   data() {
     return {
       activeName: 'CorpInfo',
-      HOISTING_ID: ''
+      HOISTING_ID: '',
+      ticketType:''
     }
   },
   watch: {

From 2f58b6bf93f50790e347ae02571b5d248bd35ad1 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 21:22:06 +0800
Subject: [PATCH 43/53] =?UTF-8?q?1.=E7=9B=B2=E6=9D=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dangerousWork/blindboard/components/list.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/dangerousWork/blindboard/components/list.vue b/src/views/dangerousWork/blindboard/components/list.vue
index 6c2ff25..be5a21b 100644
--- a/src/views/dangerousWork/blindboard/components/list.vue
+++ b/src/views/dangerousWork/blindboard/components/list.vue
@@ -187,14 +187,14 @@ export default {
       dialogFormHuifuShow: false,
       statusList: [
         { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '待提交' },
+        { ID: '0', NAME: '盲板抽堵作业待提交' },
         { ID: '1', NAME: '作业负责人待审核' },
-        { ID: '4', NAME: '所在单位领导人待审核' },
+        { ID: '4', NAME: '所在单位待审核' },
         { ID: '5', NAME: '待验收' },
         { ID: '6', NAME: '验收归档' },
-        { ID: '-2', NAME: '作业负责人待审核打回' },
-        { ID: '-5', NAME: '所在单位领导人待审核打回' },
-        { ID: '-6', NAME: '待验收打回' }
+        { ID: '-2', NAME: '作业负责人审核打回' },
+        { ID: '-5', NAME: '所在单位审核打回' },
+        { ID: '-6', NAME: '验收打回' }
       ],
       STATUS: '',
       DEPTIDS: ''

From 7bbb361e1b876a4f5dc2e89e330c9b8b33d5a403 Mon Sep 17 00:00:00 2001
From: zy <907315977@qq.com>
Date: Thu, 27 Jun 2024 21:26:06 +0800
Subject: [PATCH 44/53] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A-?=
 =?UTF-8?q?=E9=AB=98=E5=A4=84=E4=BD=9C=E4=B8=9A-=E5=90=8A=E8=A3=85?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9Abug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../highwork/components/detail.vue            |  2 +-
 .../highwork/components/list.vue              | 15 ++++++++++++++-
 src/views/dangerousWork/highwork/index.vue    | 19 +++++++------------
 .../hoisting/components/corpInfo.vue          |  2 +-
 .../hoisting/components/list.vue              | 16 ++++++++++++++--
 src/views/dangerousWork/hoisting/index.vue    |  6 ++++--
 6 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/views/dangerousWork/highwork/components/detail.vue b/src/views/dangerousWork/highwork/components/detail.vue
index b551ab1..a83db7f 100644
--- a/src/views/dangerousWork/highwork/components/detail.vue
+++ b/src/views/dangerousWork/highwork/components/detail.vue
@@ -248,7 +248,7 @@ export default {
       })
     },
     goBack() {
-      this.$parent.activeName = 'List'
+      this.$parent.activeName = 'highwork_list'
     }
 
   }
diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue
index b2ab9b8..6b4fbf9 100644
--- a/src/views/dangerousWork/highwork/components/list.vue
+++ b/src/views/dangerousWork/highwork/components/list.vue
@@ -132,7 +132,14 @@
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+
   </div>
+
+
 </template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@@ -211,7 +218,9 @@ export default {
         '/dangerousWork/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -326,6 +335,10 @@ export default {
     goDetail(id) {
       this.$parent.activeName = 'Detail'
       this.$parent.HIGHWORK_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.HIGHWORK_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue
index 0a10f2b..1a54661 100644
--- a/src/views/dangerousWork/highwork/index.vue
+++ b/src/views/dangerousWork/highwork/index.vue
@@ -1,28 +1,23 @@
 <template>
   <div>
-    <CorpInfo v-show="activeName=='CorpInfo'" />
-    <List v-show="activeName=='highwork_list'" />
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list"/>
+    <List v-if="activeName=='highwork_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
 
 <script>
+import CorpInfo from "./components/corpInfo";
 import List from './components/list'
 import Detail from './components/detail'
-import CorpInfo from "./components/corpInfo";
 export default {
   components: {CorpInfo,List,Detail},
   data() {
     return {
-      activeName: 'highwork_list',
-      HIGHWORK_ID: ''
-    }
-  },
-  watch: {
-    activeName(val) {
-      if (val == 'highwork_list') {
-        this.$refs.list.getQuery()
-      }
+      activeName: 'CorpInfo',
+      HIGHWORK_ID: '',
+      ticketType : '',
+      CUTROAD_ID:''
     }
   }
 }
diff --git a/src/views/dangerousWork/hoisting/components/corpInfo.vue b/src/views/dangerousWork/hoisting/components/corpInfo.vue
index 6d0d7d4..ddf3ce4 100644
--- a/src/views/dangerousWork/hoisting/components/corpInfo.vue
+++ b/src/views/dangerousWork/hoisting/components/corpInfo.vue
@@ -102,7 +102,7 @@ export default {
       this.$parent.activeName = tableName
       this.$parent.CORPINFO_ID = CORPINFO_ID
       this.$parent.ticketType = ticketType
-      this.$parent.CUTROAD_ID =''
+      this.$parent.HOISTING_ID =''
     },
     getList() {
       return new Promise((resolve) => {
diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue
index c5f6c07..9ad8bc0 100644
--- a/src/views/dangerousWork/hoisting/components/list.vue
+++ b/src/views/dangerousWork/hoisting/components/list.vue
@@ -132,7 +132,13 @@
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
   </div>
+
+
 </template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@@ -211,7 +217,9 @@ export default {
         '/dangerousWork/gfHoisting/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -324,8 +332,12 @@ export default {
       }
     },
     goDetail(id) {
-      this.$parent.activeName = 'Hoisting'
+      this.$parent.activeName = 'Detail'
       this.$parent.HOISTING_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.HOISTING_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/hoisting/index.vue b/src/views/dangerousWork/hoisting/index.vue
index fe80378..07fac1c 100644
--- a/src/views/dangerousWork/hoisting/index.vue
+++ b/src/views/dangerousWork/hoisting/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <List v-show="activeName=='hoisting_list'" />
+    <List v-if="activeName=='hoisting_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
@@ -15,7 +15,9 @@ export default {
   data() {
     return {
       activeName: 'CorpInfo',
-      HOISTING_ID: ''
+      HOISTING_ID: '',
+      ticketType : '',
+      CORPINFO_ID : ''
     }
   },
   watch: {

From 900c362a1c28c89bec6d3bf3b9f37052377d1753 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Fri, 28 Jun 2024 14:45:17 +0800
Subject: [PATCH 45/53] =?UTF-8?q?1.=E8=BE=93=E5=85=A5=E6=A1=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/platformelectronic/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue
index 1fd60f6..3f896fb 100644
--- a/src/views/keyprojects/platformelectronic/index.vue
+++ b/src/views/keyprojects/platformelectronic/index.vue
@@ -101,7 +101,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="边界入侵区域" prop="bianjiequyu">
-          <el-select v-model="form.bianjiequyu" multiple placeholder="请选择监理单位" style="width: 100%;">
+          <el-select v-model="form.bianjiequyu" multiple placeholder="请选择边界入侵区域" style="width: 100%;">
             <el-option v-for="item in quyuList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
           </el-select>
         </el-form-item>

From eb0fddec8e839c01d17c17d51d092101c9624fa2 Mon Sep 17 00:00:00 2001
From: zy <907315977@qq.com>
Date: Fri, 28 Jun 2024 15:14:57 +0800
Subject: [PATCH 46/53] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dangerousWork/circuit/components/list.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/dangerousWork/circuit/components/list.vue b/src/views/dangerousWork/circuit/components/list.vue
index 6241d41..b2562a7 100644
--- a/src/views/dangerousWork/circuit/components/list.vue
+++ b/src/views/dangerousWork/circuit/components/list.vue
@@ -64,6 +64,12 @@
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</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>

From 7fe2e02c1b08fbbd41cdc14c35574ebdf41f9c68 Mon Sep 17 00:00:00 2001
From: zy <907315977@qq.com>
Date: Fri, 28 Jun 2024 15:19:04 +0800
Subject: [PATCH 47/53] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dangerousWork/blindboard/components/list.vue      | 6 ++++++
 src/views/dangerousWork/breakground/components/list.vue     | 6 ++++++
 src/views/dangerousWork/electricity/components/list.vue     | 6 ++++++
 src/views/dangerousWork/highwork/components/list.vue        | 6 ++++++
 src/views/dangerousWork/hoisting/components/list.vue        | 6 ++++++
 .../components/hotwork/hotwork_list/components/list_cfd.vue | 6 ++++++
 src/views/dangerousWork/limitspace/components/list.vue      | 6 ++++++
 7 files changed, 42 insertions(+)

diff --git a/src/views/dangerousWork/blindboard/components/list.vue b/src/views/dangerousWork/blindboard/components/list.vue
index be5a21b..0869e3b 100644
--- a/src/views/dangerousWork/blindboard/components/list.vue
+++ b/src/views/dangerousWork/blindboard/components/list.vue
@@ -60,6 +60,12 @@
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</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>
diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue
index 56b5197..e651f7a 100644
--- a/src/views/dangerousWork/breakground/components/list.vue
+++ b/src/views/dangerousWork/breakground/components/list.vue
@@ -66,6 +66,12 @@
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</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>
diff --git a/src/views/dangerousWork/electricity/components/list.vue b/src/views/dangerousWork/electricity/components/list.vue
index 8f13eb3..3a81dd2 100644
--- a/src/views/dangerousWork/electricity/components/list.vue
+++ b/src/views/dangerousWork/electricity/components/list.vue
@@ -50,6 +50,12 @@
           <span v-else-if="row.APPLY_STATUS==-5">验收打回</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</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>
diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue
index 6b4fbf9..e3bfd92 100644
--- a/src/views/dangerousWork/highwork/components/list.vue
+++ b/src/views/dangerousWork/highwork/components/list.vue
@@ -64,6 +64,12 @@
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</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>
diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue
index c4f1a5b..46a6403 100644
--- a/src/views/dangerousWork/hoisting/components/list.vue
+++ b/src/views/dangerousWork/hoisting/components/list.vue
@@ -64,6 +64,12 @@
           <span v-else-if="row.APPLY_STATUS==-6">验收打回</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</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>
diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
index a138821..5196e0a 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
@@ -93,6 +93,12 @@
         </template>
       </el-table-column>
       <el-table-column prop="WORK_LEVEL" label="动火等级" align="center"/>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="230">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORK_ID)">查看</el-button>
diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue
index a0c0e57..a36e5b9 100644
--- a/src/views/dangerousWork/limitspace/components/list.vue
+++ b/src/views/dangerousWork/limitspace/components/list.vue
@@ -49,6 +49,12 @@
           <span v-else-if="row.APPLY_STATUS==-98">已作废(未进行气体检测)</span>
         </template>
       </el-table-column>
+      <el-table-column prop="ISDELETE" label="是否删除">
+        <template slot-scope="{row}">
+          <span v-if="row.ISDELETE==0">否</span>
+          <span v-else-if="row.ISDELETE==1">是</span>
+        </template>
+      </el-table-column>
 
       <el-table-column label="操作" align="center" width="230">
         <template slot-scope="{row}">

From 1dd9262cc480bc1d8a02d40322b30b4d4d14dc08 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 28 Jun 2024 15:41:52 +0800
Subject: [PATCH 48/53] =?UTF-8?q?bug=2016519=20=E6=96=AD=E8=B7=AF=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=20=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E5=AD=97=20=E5=8F=AA=E6=9C=89=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E6=94=BE=E4=B8=8A=E9=9D=A2=E6=89=8D=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index cdfd52f..ac1f192 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -3691,10 +3691,10 @@ export default {
     background-color: #100693 !important;
     border-color: #100693 !important;
   }
-.people_trajectory_select .el-select-dropdown__item, .el-select-dropdown__item{
+.people_trajectory_select .el-select-dropdown__item{
   color: #fff !important;
 }
-.people_trajectory_select .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+.people_trajectory_select .el-select-dropdown__item.hover{
   background-color: #2111ec !important;
   color: #fff !important;
 }

From b2ffac3acdf548001f104cf392caf2c99cd92078 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 28 Jun 2024 21:06:31 +0800
Subject: [PATCH 49/53] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=20-?=
 =?UTF-8?q?=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blindboard/components/detail.vue          |  2 +-
 .../breakground/components/detail.vue         |  2 +-
 .../limitspace/components/detail.vue          |  2 +-
 src/views/map/index.vue                       | 29 ++++++++++++++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/views/dangerousWork/blindboard/components/detail.vue b/src/views/dangerousWork/blindboard/components/detail.vue
index da67618..be0f3a0 100644
--- a/src/views/dangerousWork/blindboard/components/detail.vue
+++ b/src/views/dangerousWork/blindboard/components/detail.vue
@@ -229,7 +229,7 @@ export default {
         this.listLoading = false
         this.pd = data.pd // 参数map
         this.imgList = data.imgList
-        this.imgList1 = data.imgList
+        this.imgList1 = data.imgList1
         this.boardList = data.boardList // 参数map
         this.measuresList = data.measuresList // 参数map
         this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue
index f0dc14f..4f31131 100644
--- a/src/views/dangerousWork/breakground/components/detail.vue
+++ b/src/views/dangerousWork/breakground/components/detail.vue
@@ -244,7 +244,7 @@ export default {
         this.listLoading = false
         this.pd = data.pd // 参数map
         this.imgList = data.imgList
-        this.imgList1 = data.imgList
+        this.imgList1 = data.imgList1
         this.measuresList = data.measuresList // 参数map
         this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
         this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
diff --git a/src/views/dangerousWork/limitspace/components/detail.vue b/src/views/dangerousWork/limitspace/components/detail.vue
index eb287ab..d34e32f 100644
--- a/src/views/dangerousWork/limitspace/components/detail.vue
+++ b/src/views/dangerousWork/limitspace/components/detail.vue
@@ -279,7 +279,7 @@ export default {
           data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
         }
         this.imgList = data.imgList
-        this.imgList1 = data.imgList
+        this.imgList1 = data.imgList1
         this.measuresList = data.measuresList // 参数map
         this.gasList = data.gasList // 参数map
         this.gas = data.gas || {} // 参数map
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index ac1f192..7ac59c2 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -43,8 +43,13 @@
           v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"/>
+        <menjinOld
+          v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          :corp-info-id="CORP_INFO_ID"
+          :area="area"
+          :gangkou="gangkouActive"/>
         <menjin
-          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
@@ -275,6 +280,7 @@ import cmtIndex from './components/cmt_index.vue'
 import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
+import menjinOld from './components/menjin_old.vue'
 import menjin from './components/menjin.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
@@ -332,6 +338,7 @@ export default {
     fengongsiIndex,
     caofeidianIndex,
     layoutMenu,
+    menjinOld,
     menjin,
     menjinCfd,
     menjinCmt,
@@ -485,6 +492,26 @@ export default {
               checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
               type: 'CAR',
               containAuthorization: [],
+              eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
+            },
+            {
+              label: '口门1',
+              dialog_width: '600px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              type: 'CAR',
+              containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
+              eliminateAuthorization: []
+            },
+            {
+              label: '口门2',
+              dialog_width: '600px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              type: 'CAR',
+              containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
               eliminateAuthorization: []
             },
             {

From 6e7452c11304cfaf1a8db9b5421300a8263fc7a9 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Fri, 28 Jun 2024 21:07:43 +0800
Subject: [PATCH 50/53] =?UTF-8?q?1.=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E9=97=A8=E5=8F=A3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/menjin_old.vue |  8 ++--
 src/views/map/index.vue                 | 29 ++++++++++-
 src/views/map/js/dragentity.js          | 64 +++++++++++++++++++++----
 3 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/src/views/map/components/menjin_old.vue b/src/views/map/components/menjin_old.vue
index 406ea55..8a5b5d2 100644
--- a/src/views/map/components/menjin_old.vue
+++ b/src/views/map/components/menjin_old.vue
@@ -23,7 +23,7 @@
         </div>
       </div>
     </div>
-    <!-- <div class="block2">
+    <div class="block2">
       <layout-title title="口门区域"/>
       <div class="options">
         <div class="bg"/>
@@ -35,7 +35,7 @@
           </div>
         </div>
       </div>
-    </div> -->
+    </div>
     <div class="block3">
       <layout-title title="口门进出记录"/>
       <div class="content">
@@ -56,8 +56,8 @@
             <div class="td">时间</div>
             <div class="td">状态</div>
             <div class="td">闸机名称</div>
-            <!--<div v-if="block3OptionsIndex == 0" class="td">闸机名称</div>
-            <div v-if="block3OptionsIndex == 1" class="td">来港事由</div>-->
+            <div v-if="block3OptionsIndex == 0" class="td">闸机名称</div>
+            <div v-if="block3OptionsIndex == 1" class="td">来港事由</div>
           </div>
           <div v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="scroll">
             <div v-for="(item,index) in block3List" :key="index" class="tr">
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index ac1f192..f5d8861 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -43,8 +43,13 @@
           v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"/>
+        <menjinOld
+          v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          :corp-info-id="CORP_INFO_ID"
+          :area="area"
+          :gangkou="gangkouActive"/>
         <menjin
-          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
@@ -275,6 +280,7 @@ import cmtIndex from './components/cmt_index.vue'
 import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
+import menjinOld from './components/menjin_old.vue'
 import menjin from './components/menjin.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
@@ -332,6 +338,7 @@ export default {
     fengongsiIndex,
     caofeidianIndex,
     layoutMenu,
+    menjinOld,
     menjin,
     menjinCfd,
     menjinCmt,
@@ -485,6 +492,26 @@ export default {
               checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
               type: 'CAR',
               containAuthorization: [],
+              eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
+            },
+            {
+              label: '人员',
+              dialog_width: '800px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              type: 'PERSON',
+              containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
+              eliminateAuthorization: []
+            },
+            {
+              label: '车辆',
+              dialog_width: '600px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
+              type: 'CAR',
+              containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
               eliminateAuthorization: []
             },
             {
diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js
index eedf0d3..0532a93 100644
--- a/src/views/map/js/dragentity.js
+++ b/src/views/map/js/dragentity.js
@@ -53,6 +53,8 @@ const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png')
 const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png')
 const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png')
 const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png')
+const GGimg1 = require('../../../assets/map/gangkou_index/point/ico1.png')
+const GGimg2 = require('../../../assets/map/gangkou_index/point/ico2.png')
 
 const imgMap = {
   img0_0, img0_1, img0_2,
@@ -116,15 +118,61 @@ export default class DragEntity {
       }
     }
     if (value.point_type.indexOf('标记点') !== -1) {
-      billboard = {
-        image: imgMap['img' + value.icon_type],
-        height: 36,
-        width: 30,
-        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-        heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-        disableDepthTestDistance: Number.POSITIVE_INFINITY
+      console.info('====' )
+      console.info(value )
+      console.info('====' )
+      if (value.label == '人员' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image: GGimg1,
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '车辆' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image: GGimg2,
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '摄像头' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image:  imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '摄像头' ){
+        billboard = {
+          image:  imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else{
+        billboard = {
+          image: imgMap['img' + value.icon_type],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
       }
+
     }
     // 曹妃甸使用
     if (value.gangkou === '00004') {

From ebb141a699f6c05160b716110a9179663b83a45c Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Sat, 29 Jun 2024 12:45:05 +0800
Subject: [PATCH 51/53] =?UTF-8?q?1.=E6=98=BE=E7=A4=BA=E4=B8=80=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=9A=84=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=202.=E8=B0=83=E6=95=B4=E7=9B=91=E7=AE=A1=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyprojects/videomanager/components/video-list.vue |  4 ++--
 src/views/map/components/menjin_old.vue                |  2 +-
 src/views/map/dialog/mkGateMachine.vue                 | 10 ++++++----
 src/views/map/index.vue                                |  9 ++++++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index 80881f7..fa13eec 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -154,8 +154,8 @@
     <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" :show-close="false" title="视频" width="1200px">
       <!--      <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
       <div style="display: flex;flex-wrap: wrap;justify-content: space-between">
-        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
-          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
+        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 30%">
+          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="280" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
           <div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
         </div>
       </div>
diff --git a/src/views/map/components/menjin_old.vue b/src/views/map/components/menjin_old.vue
index 8a5b5d2..e58c601 100644
--- a/src/views/map/components/menjin_old.vue
+++ b/src/views/map/components/menjin_old.vue
@@ -205,7 +205,7 @@ export default {
       requestFN(
         '/map/getOnlineGateEquipment', {
           AREA: this.area,
-          CORP_INFO_ID: this.corpInfoId,
+          CORPINFO_ID: this.corpInfoId,
           GANGKOU: this.gangkou
         }
       ).then((data) => {
diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index f8f04ae..5e76958 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -30,7 +30,7 @@
               <td>状态</td>
             </tr>
             <tr v-for="(item,index) in recordAllList" :key="index">
-              <td>{{ item.CARDTYPE }}</td> 
+              <td>{{ item.CARDTYPE }}</td>
               <td>{{ item.USERNAME }}</td>
               <td>{{ item.TIME }}</td>
               <td>
@@ -210,9 +210,11 @@ export default {
           this.info.PERSON_OUT = 0
           this.varList = data.pd.varList
           for (let i = 0; i < data.pd.varList.length; i++) {
-            if (this.type == 'CAR') {
-              this.info.CAR_IN = data.pd.varList[i].CAR_IN
-              this.info.CAR_OUT = data.pd.varList[i].CAR_OUT
+            if (data.pd.varList[i].TYPE == 'CAR_IN') {
+              this.info.CAR_IN = data.pd.varList[i].COUNT
+            }
+            if (data.pd.varList[i].TYPE == 'CAR_OUT') {
+              this.info.CAR_OUT = data.pd.varList[i].COUNT
             }
             if (data.pd.varList[i].TYPE == 'PERSON_IN') {
               this.info.PERSON_IN = data.pd.varList[i].COUNT
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 38fc09b..5f017d6 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -43,8 +43,13 @@
           v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"/>
+        <menjinOld
+          v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          :corp-info-id="CORP_INFO_ID"
+          :area="area"
+          :gangkou="gangkouActive"/>
         <menjin
-          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
@@ -276,6 +281,7 @@ import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
 import menjin from './components/menjin.vue'
+import menjinOld from './components/menjin_old.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
 import xiaofang from './components/xiaofang.vue'
@@ -332,6 +338,7 @@ export default {
     fengongsiIndex,
     caofeidianIndex,
     layoutMenu,
+    menjinOld,
     menjin,
     menjinCfd,
     menjinCmt,

From 18412553ae0de5d265767fc7f4ef590eb6287482 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Mon, 1 Jul 2024 14:46:52 +0800
Subject: [PATCH 52/53] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-?=
 =?UTF-8?q?=20=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=94=AF=E6=8C=81=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/personnelmanagement/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index a33a579..c25b95d 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="关键字搜索">
-            <el-input v-model="KEYWORDS" placeholder="搜索姓名、单位名称、特种作业证书编号"/>
+            <el-input v-model="KEYWORDS" placeholder="搜索姓名、手机号、单位名称、特种作业证书编号"/>
           </el-form-item>
         </el-col>
         <!--        <el-col :span="6">-->

From 0cdcd706bca12a8eb2a9883ff13b87fb5797d8c4 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 2 Jul 2024 15:24:09 +0800
Subject: [PATCH 53/53] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../threeSystems/lawsRegulations/components/editTextLibrary.vue | 2 +-
 src/views/threeSystems/lawsRegulations/components/list.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue b/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue
index 757be5c..57990cd 100644
--- a/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue
+++ b/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue
@@ -326,7 +326,7 @@ export default {
         SPECIFICATION_TYPES: [''],
         CATEGORY_LIST: [''],
         STATUS: '',
-        ASSOCIATION: '0',
+        ASSOCIATION: '4',
         types: [],
         specification_types: [],
         category_list: [],
diff --git a/src/views/threeSystems/lawsRegulations/components/list.vue b/src/views/threeSystems/lawsRegulations/components/list.vue
index bff4c88..3b82100 100644
--- a/src/views/threeSystems/lawsRegulations/components/list.vue
+++ b/src/views/threeSystems/lawsRegulations/components/list.vue
@@ -288,7 +288,7 @@ export default {
           STATUS: this.form.STATUS,
           TYPE: this.form.TYPE_NAME,
           DATE: this.form.DATE,
-          TEXT_NAME: this.TEXT_NAME,
+          TEXT_NAME: this.form.TEXT_NAME,
           ASSOCIATION: '4',
           CORPINFO_ID: '0',
           MIGRATION_FLAG: '1'