From c3e22a8654000519cabf0b5dfcf95579ceb74d50 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Mon, 29 Jan 2024 11:18:23 +0800
Subject: [PATCH 01/13] =?UTF-8?q?cmt=E6=B8=AF=E5=9C=B0=E5=9B=BE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 5e340c7..09aff70 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -373,7 +373,7 @@ export default {
             'x': 118.43701,
             'y': 38.9866
           },
-          CORP_INFO_ID: 'c077f4ed66844ed4a191a36fa1fc641c'
+          CORP_INFO_ID: '6aa255d41602497fa0f934a822820df4'
         }
       ],
       branchPoint: [],

From 4cdccfafa781b9001c4f65ab7a5724a12e1bb107 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Mon, 29 Jan 2024 11:55:14 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B9=E7=85=A4?=
 =?UTF-8?q?=E7=82=AD=E6=B8=AF=E5=9C=B0=E5=9B=BE=E8=A7=86=E9=A2=91=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue          |  3 ++
 src/views/map/dialog/video_play_cmt.vue | 66 +++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 src/views/map/dialog/video_play_cmt.vue

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 785972c..3fa0729 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -15,6 +15,7 @@
       <mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
       <zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
       <video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/>
+      <video-play-cmt v-if="type === 'platcamera00005' || type === 'CAMERA00005'" :id="id" :type="type" :gangkou="gangkou"/>
       <video-play-cfd v-if="type === 'CAMERA00004' || type === 'platcamera00004'" :id="id" :type="type" :gangkou="gangkou"/>
       <video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou" :corp-info-id="corpInfoId"/>
       <!--秦港一公司 边界入侵  详细页面 start-->
@@ -79,6 +80,7 @@ import blindboardOrder from './blindboardOrder.vue'
 import breakgroundOrder from './breakgroundOrder.vue'
 import hoistingOrder from './hoistingOrder.vue'
 import videoPlay from './video_play.vue'
+import videoPlayCmt from './video_play_cmt.vue'
 import videoPlayCfd from './video_play_cfd.vue'
 import videoPlayPlat from './video_play_plat.vue'
 import videoPlayBianjieruqin from './video_play_bianjieruqin.vue'
@@ -118,6 +120,7 @@ export default {
     breakgroundOrder,
     hoistingOrder,
     videoPlay,
+    videoPlayCmt,
     videoPlayCfd,
     videoPlayPlat,
     hotworkCfdD,
diff --git a/src/views/map/dialog/video_play_cmt.vue b/src/views/map/dialog/video_play_cmt.vue
new file mode 100644
index 0000000..706f9b7
--- /dev/null
+++ b/src/views/map/dialog/video_play_cmt.vue
@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <div id="aLiVideoPlayer" class="prism-player"/>
+  </div>
+</template>
+
+<script>
+
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      hls: false,
+      player: null,
+      url: ''
+    }
+  },
+  beforeDestroy() {
+    this.player && this.player.dispose()
+  },
+  created() {
+    console.info(this.id)
+    this.showVideo()
+  },
+  methods: {
+    showVideo() {
+      this.$nextTick(() => {
+        // eslint-disable-next-line no-undef
+        this.player = new Aliplayer({
+          'id': 'aLiVideoPlayer',
+          'source': config.ysVideoUrl + '/live/loadmin/38f8c7d91db97445a1f6e0ef5bbd5ae0/' + config.ysVideoDefinition + '/' + this.id + '.m3u8',
+          // 'source': 'http://172.16.11.146:8991/videoApi/live/loadmin/38f8c7d91db97445a1f6e0ef5bbd5ae0/4/MT-CFD-MK-IPC-16216_1.m3u8',
+          'width': '100%',
+          'height': '500px',
+          'autoplay': true,
+          'isLive': true,
+          'rePlay': false,
+          'playsinline': true,
+          'preload': true,
+          'controlBarVisibility': 'hover',
+          'useH5Prism': true
+        }, function(player) {
+          console.log('The player is created')
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

From fe9303df2c81630cf4eeb801c7bfab98d039ffaf Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Mon, 29 Jan 2024 12:08:05 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B9=E7=85=A4?=
 =?UTF-8?q?=E7=82=AD=E6=B8=AF=E5=9C=B0=E5=9B=BE=E4=BA=BA=E5=91=98=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E7=BB=9F=E8=AE=A1=E9=A1=B5=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuanCmt.vue | 418 ++++++++++++++++++++++++
 src/views/map/index.vue                 |   9 +-
 2 files changed, 426 insertions(+), 1 deletion(-)
 create mode 100644 src/views/map/components/renyuanCmt.vue

diff --git a/src/views/map/components/renyuanCmt.vue b/src/views/map/components/renyuanCmt.vue
new file mode 100644
index 0000000..138a6cf
--- /dev/null
+++ b/src/views/map/components/renyuanCmt.vue
@@ -0,0 +1,418 @@
+<template>
+  <div class="renyuan">
+    <div class="block1">
+      <layout-title title="定位基础信息"/>
+      <div class="options">
+        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
+          <div class="imger">
+            <img :src="item.img" alt="">
+          </div>
+          <div class="info">
+            <div class="label">{{ item.title }}</div>
+            <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>
+          </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.alarmTypeName }}：</div>
+          <div class="info">
+            <span class="count"><count-to :start-val="0" :end-val="item.alarmCount" :duration="3600"/></span>
+            <span class="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 class="td">卡号</div>
+            <div class="td">姓名</div>
+            <div 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 class="td">{{ item.devidno }}</div>
+              <div class="td">{{ item.fullName }}</div>
+              <div class="td">{{ item.onlineornot ? '在线':'离线' }}</div>
+              <!--            <div :class="['td',{error:item.STATE == '1'}]">{{ item.STATE == '1' ? '异常' : '正常' }}</div>-->
+            </div>
+            <div v-if="loading" class="tr">
+              <div class="td">加载中...</div>
+            </div>
+          </div>
+
+          <!--          <div v-for="(item,index) in block3List" :key="index" class="tr">-->
+          <!--            <div class="td">{{ item.cardNo }}</div>-->
+          <!--            <div class="td">{{ item.name }}</div>-->
+          <!--            <div class="td">{{ item.cardType }}</div>-->
+          <!--          </div>-->
+        </div>
+
+        <!--        <div v-show="block3OptionsIndex=== 1" class="table">-->
+        <!--          <div class="tr">-->
+        <!--            <div class="td">车牌号</div>-->
+        <!--            <div class="td">状态</div>-->
+        <!--          </div>-->
+        <!--          <div v-for="(item,index) in block4List" :key="index" class="tr">-->
+        <!--            <div class="td">{{ item.name }}</div>-->
+        <!--            <div class="td">在线</div>-->
+        <!--          </div>-->
+        <!--        </div>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import layoutTitle from './title.vue'
+import { requestFN } from '../../../utils/request'
+import CountTo from 'vue-count-to'
+export default {
+  components: {
+    layoutTitle,
+    CountTo
+  },
+  data() {
+    return {
+      block1OptionsList: [
+        {
+          title: '在线员工',
+          img: require('../../../assets/map/renyuan/img1ico1.png'),
+          count: 0
+        },
+        {
+          title: '外协人员',
+          img: require('../../../assets/map/renyuan/img1ico4.png'),
+          count: 0
+        },
+        {
+          title: '内部人员',
+          img: require('../../../assets/map/renyuan/img1ico3.png'),
+          count: 0
+        }
+        // ,
+        // {
+        //   title: '在线车辆',
+        //   img: require('../../../assets/map/renyuan/img1ico2.png'),
+        //   count: 0
+        // },
+        // {
+        //   title: '临时人员',
+        //   img: require('../../../assets/map/renyuan/img1ico5.png'),
+        //   count: 0
+        // }
+      ],
+      block2OptionsList: [
+        {
+          title: '电子围栏告警',
+          count: 0
+        },
+        {
+          title: '静超时告警',
+          count: 0
+        },
+        {
+          title: '超员/缺员告警',
+          count: 0
+        },
+        {
+          title: '离岗告警',
+          count: 0
+        },
+        {
+          title: '车辆超速告警',
+          count: 0
+        },
+        {
+          title: 'SOS求救',
+          count: 0
+        }
+      ],
+      block3OptionsList: ['相关方员工', '普通员工'],
+      block3OptionsIndex: 0,
+      currentPage: 1,
+      loading: false,
+      count: 0,
+      totalPage: 0,
+      block3List: [],
+      block4List: [],
+      timer: ''
+    }
+  },
+  computed: {
+    noMore() {
+      return this.currentPage >= this.totalPage
+    },
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
+  mounted() {
+    // this.obtainPersonnelData()
+    // this.personPositioningStatistics()
+    // this.startPersonnelDataTimer() // 定时获取
+    // this.obtainCarData()
+    // this.carPositioningStatistics()
+  },
+  destroyed() {
+    clearInterval(this.timer) // 关闭定时器
+  },
+  created() {
+    this.getCmtWorkCardLocationCount()
+  },
+  methods: {
+    getCmtWorkCardLocationCount() {
+      requestFN(
+        '/map/findWorkCardLocation',
+        {}
+      ).then((data) => {
+        this.block1OptionsList[0].count = data.onlineCount
+      }).catch((e) => {
+      })
+    },
+    getCmtWorkCardLocation() {
+      requestFN(
+        '/map/findWorkCardLocation',
+        {}
+      ).then((data) => {
+        this.block3List = this.block3List.concat(data.list)
+      }).catch((e) => {
+      })
+    },
+    block3OptionsClick(index) {
+      this.currentPage = 1
+      this.block3List = []
+      this.block3OptionsIndex = index
+      if (index === 1) {
+        this.getCmtWorkCardLocation()
+      }
+      // this.getCzksPersonStaffListPage()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.renyuan {
+  .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 {
+      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;
+
+      .option {
+        display: flex;
+        width: 50%;
+        align-items: center;
+        margin-top: 10px;
+
+        &:nth-child(-n+2) {
+          margin-top: 0;
+        }
+
+        .imger {
+          width: 50px;
+          height: 50px;
+          background-image: url("../../../assets/map/menjin/img1.png");
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
+          text-align: center;
+          margin-left: 20px;
+
+          img {
+            width: 30px;
+            height: 30px;
+            animation: scale 2s infinite;
+            margin-top: 10px;
+          }
+        }
+
+        .info {
+          color: #FFFFFF;
+          margin-left: 10px;
+
+          .label {
+            font-size: 12px;
+            height: 25px;
+            line-height: 25px;
+          }
+
+          .text {
+            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;
+            margin-top: -5px;
+          }
+        }
+      }
+    }
+  }
+
+  .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/renyuan/img2.png");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        width: 287px;
+        height: 244px;
+        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: 400px;
+    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: 250px;
+          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 {
+          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 {
+  0% {
+    transform: scale(0.9);
+  }
+  50% {
+    transform: scale(0.8);
+  }
+  100% {
+    transform: scale(0.9);
+  }
+}
+</style>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 09aff70..64ce599 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -84,7 +84,7 @@
           :area="area"
           :gangkou="gangkouActive"/>
         <renyuan
-          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && bottomOptionsIndex === 4"
+          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && gangkouActive !== '00005' && bottomOptionsIndex === 4"
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
@@ -98,6 +98,11 @@
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
+        <renyuanCmt
+          v-if="gangkouActive && gangkouActive === '00005' && bottomOptionsIndex === 4"
+          :corp-info-id="CORP_INFO_ID"
+          :area="area"
+          :gangkou="gangkouActive"/>
         <bianjieruqin
           v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && bottomOptionsIndex === 6"
           :corp-info-id="CORP_INFO_ID"
@@ -245,6 +250,7 @@ import caofeidianIndex from './components/caofeidian_index.vue'
 import czksIndex from './components/czks_index.vue'
 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 menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
@@ -292,6 +298,7 @@ export default {
     czksIndex,
     menjinCzks,
     renyuanCzks,
+    renyuanCmt,
     // navigation,
     gangkouIndex,
     fengongsiIndex,

From 3a20fce48601bd688b0f6927a82614fb16cbbfe8 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 29 Jan 2024 17:20:48 +0800
Subject: [PATCH 04/13] =?UTF-8?q?1=E3=80=81=E9=94=99=E5=88=AB=E5=AD=97?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=202=E3=80=81=E7=9B=91=E7=AE=A1=E7=AB=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=203?=
 =?UTF-8?q?=E3=80=81=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E=E6=9C=AA?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue   | 1 +
 src/views/xgf/peopleList/components/list.vue | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 5b1469e..e8326ae 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -132,6 +132,7 @@ export default {
               this.$message.success('推送成功')
               this.visible = false
               this.$emit('refresh', '')
+              this.handleClose()
             })
             .catch((e) => {
               console.log(e)
diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue
index a96ceb0..d882573 100644
--- a/src/views/xgf/peopleList/components/list.vue
+++ b/src/views/xgf/peopleList/components/list.vue
@@ -146,12 +146,10 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/xgf/user/getAppointApproveList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/xgf/user/getRecord?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
-          STATUS: '1',
-          EMPLOY_FLAG: '1',
-          CHECK_STATUS: '1'
+          Step: '1'
         }
       ).then((data) => {
         this.listLoading = false

From 07de513dc5347a1f61965ceff358005a1bd3f1dc Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 30 Jan 2024 10:08:31 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue |  6 ++---
 src/views/map/index.vue        | 45 +++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 0b0be60..3f011a6 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -82,7 +82,6 @@ import blindboardOrder from './blindboardOrder.vue'
 import breakgroundOrder from './breakgroundOrder.vue'
 import hoistingOrder from './hoistingOrder.vue'
 import videoPlay from './video_play.vue'
-import videoPlayCmt from './video_play_cmt.vue'
 import videoPlayCfd from './video_play_cfd.vue'
 import videoPlayCmt from './video_play_cmt.vue'
 import videoPlayPlat from './video_play_plat.vue'
@@ -99,7 +98,7 @@ import peoplePositionCfdD from './peoplePositionCfdD.vue'
 import peoplePositionCmt from './peoplePositionCmt.vue'
 import carPositionCfdD from './carPositionCfdD.vue'
 import peoplePositionOne from './peoplePositionOne.vue'
-import hotworkFirst from "./hotworkFirst";
+import hotworkFirst from './hotworkFirst'
 import peoplePositionYGS from './peoplePositionYGS.vue'
 import outSourceInfo from './outSourceInfo.vue'
 import outSourceVideoInfo from './outSourceVideoInfo.vue'
@@ -124,7 +123,6 @@ export default {
     breakgroundOrder,
     hoistingOrder,
     videoPlay,
-    videoPlayCmt,
     videoPlayCfd,
     videoPlayCmt,
     videoPlayPlat,
@@ -184,7 +182,7 @@ export default {
     name: {
       type: String,
       default: ''
-    },
+    }
   },
   methods: {
     closeDialog() {
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 64ce599..01370cc 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -39,7 +39,7 @@
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"/>
         <menjin
-          v-if="gangkouActive && gangkouActive !== '00004' &&  gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
@@ -191,7 +191,7 @@
                 >
                   <div v-if="bottomOptionsIndex !== ''" class="item">
                     <template v-for="(item1,index1) in item.list">
-                      <template v-if="containAuthorizationShow(item1)">
+                      <template v-if="containAuthorizationShow(item1,item)">
                         <template v-if="eliminateAuthorizationShow(item1)">
                           <div
                             :key="index1"
@@ -513,16 +513,16 @@ export default {
               containAuthorization: [],
               eliminateAuthorization: []
             },
-            // {
-            //   label: '消防水源',
-            //   dialog_width: '600px',
-            //   check: false,
-            //   type: 'xfsy01',
-            //   img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
-            //   checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
-            //   containAuthorization: [],
-            //   eliminateAuthorization: []
-            // },
+            {
+              label: '消防水源',
+              dialog_width: '600px',
+              check: false,
+              type: 'xfsy01',
+              img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
+              containAuthorization: [],
+              eliminateAuthorization: []
+            },
             {
               label: '消防点位',
               dialog_width: '600px',
@@ -1406,7 +1406,7 @@ export default {
           }
           if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1') {
             // if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
-            const { label, point_type, data_id, infoname,name, code } = pick.id._monitoItems.data
+            const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data
             this.dialog.visible = true
             this.dialog.title = label
             this.dialog.type = point_type.substring(3) + this.gangkouActive
@@ -2029,7 +2029,7 @@ export default {
               } else {
                 point.infoname = varList[i].NAME
               }
-              //曹煤炭数据
+              // 曹煤炭数据
               if (this.gangkouActive === '00005') {
                 point.name = varList[i].MAP_POINT_NAME
                 point.infoname = varList[i].MAP_POINT_NAME
@@ -2865,10 +2865,21 @@ export default {
       this.bottomOptionsIndex = ''
       this.collapse = false
     },
-    containAuthorizationShow({ containAuthorization }) {
+    containAuthorizationShow(e, item) {
+      // create by liu jun (PS:此处根据[下面这个if]孙海官的需求，对消防管控的权限进行了特殊处理，未进入具体企业时，显示消防救援队，进入具体企业后，显示消防管控其他按钮)
+      if (item && item.list && item.list.length > 0) {
+        if (item.label === '消防管控') {
+          if (e.label === '消防救援队') {
+            return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+          }
+          if (e.label !== '消防救援队') {
+            return (this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+          }
+        }
+      }
       const CORP_INFO_ID = this.CORP_INFO_ID
-      if (containAuthorization.length === 0) return true
-      if (containAuthorization.includes(CORP_INFO_ID)) {
+      if (e.containAuthorization.length === 0) return true
+      if (e.containAuthorization.includes(CORP_INFO_ID)) {
         return true
       } else {
         return false

From 656614a79bc3ed14f32234c37ce81bc7bc5f707a Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 30 Jan 2024 13:49:13 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81?=
 =?UTF-8?q?=E8=82=A1=E4=BB=BD=E7=AB=AF=EF=BC=8C=E7=9B=B8=E5=85=B3=E6=96=B9?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                    |  31 ++---
 src/views/xgf/flow/components/flowInfo.vue    |  83 ++++++++++++++
 .../xgf/flow/components/flowInfoList.vue      |  87 ++++++++++++++
 src/views/xgf/flow/components/flowStep.vue    | 108 ++++++++++++++++++
 src/views/xgf/peopleList/components/list.vue  |  14 ++-
 5 files changed, 309 insertions(+), 14 deletions(-)
 create mode 100644 src/views/xgf/flow/components/flowInfo.vue
 create mode 100644 src/views/xgf/flow/components/flowInfoList.vue
 create mode 100644 src/views/xgf/flow/components/flowStep.vue

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 67fe950..029888e 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -90,17 +90,22 @@
 .el-dialog__title{
   font-size: 16px;
 }
-
-// card样式修正
-.el-card__header {
-  padding: 12px 20px;
-  color: #000;
+//当使用card时（class="box-card a"）这样写class样式就对了
+.el-card{
+  &:not(.a){
+    // card样式修正
+    .el-card__header {
+      padding: 12px 20px;
+      color: #000;
+      &::before{
+        content: '';
+        position: absolute;
+        left: 0;
+        height: 20px;
+        width: 6px;
+        background-color: #1890ff;
+      }
+    }
+  }
 }
-.el-card__header::before{
-  content: '';
-  position: absolute;
-  left: 0;
-  height: 20px;
-  width: 6px;
-  background-color: #1890ff;
-}
\ No newline at end of file
+
diff --git a/src/views/xgf/flow/components/flowInfo.vue b/src/views/xgf/flow/components/flowInfo.vue
new file mode 100644
index 0000000..7ffe2e4
--- /dev/null
+++ b/src/views/xgf/flow/components/flowInfo.vue
@@ -0,0 +1,83 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="appendToBody"
+    title="审批流程"
+    width="60%">
+    <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
+      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
+        <template slot="description">
+          <el-card class="box-card" style="width: 900px;">
+            <div slot="header" class="clearfix">
+              <span>{{ item.STEP_NAME }}</span>
+            </div>
+            <div>
+              <el-row>
+                <el-col v-if="item.APPROVER_NAME">
+                  审批人：{{ item.APPROVER_NAME }}
+                </el-col>
+                <el-col>
+                  审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
+                </el-col>
+                <el-col>
+                  审批人归属公司：{{ item.APPROVER_CORPINFO_NAME }}
+                </el-col>
+                <el-col>
+                  审批时间：{{ item.APPROVER_TIME }}
+                </el-col>
+                <el-col v-if="item.APPROVER_OPINION">
+                  审批意见：{{ item.APPROVER_OPINION }}
+                </el-col>
+                <el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
+                  审批结束
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+        </template>
+      </el-step>
+    </el-steps>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      form: {
+        XGF_USER_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.loading = false
+      this.list = e.flow
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue
new file mode 100644
index 0000000..981ccf5
--- /dev/null
+++ b/src/views/xgf/flow/components/flowInfoList.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="审批流程"
+    width="60%">
+    <el-table
+      ref="multipleTable"
+      :data="list"
+      :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="CREATOR_TIME" label="用户名" align="center"/>
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+    </div>
+    <flow-info ref="flowInfo" append-to-body/>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import FlowInfo from './flowInfo.vue'
+
+export default {
+  components: {
+    FlowInfo,
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      form: {
+        XGF_USER_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.loading = false
+      this.form.XGF_USER_ID = e.XGF_USER_ID
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN(
+        '/xgf/user/getApproveInfo', this.form
+      ).then((data) => {
+        this.list = data.list
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    handleShow(row) {
+      this.$refs.flowInfo.init(row)
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue
new file mode 100644
index 0000000..84f449a
--- /dev/null
+++ b/src/views/xgf/flow/components/flowStep.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :v-loading="loading"
+    :before-close="handleClose"
+    :append-to-body="true"
+    :title="title"
+    width="60%">
+    <el-steps :space="200" :active="+step" direction="vertical" finish-status="success">
+      <el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX" :title="item.INDEX">
+        <template slot="description">
+          <el-card class="box-card a" style="width: 900px;">
+            <div slot="header" class="clearfix">
+              <span>审批节点</span>
+            </div>
+            <div>
+              <el-row>
+                <el-col>
+                  审批人：{{ item.APPOINT_USER_NAME }}
+                </el-col>
+                <el-col>
+                  审批人公司：{{ 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.APPOINT_OPINION }}
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+        </template>
+      </el-step>
+    </el-steps>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { requestFN } from '@/utils/request'
+
+export default {
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      title: '审批流程',
+      form: {
+        XGF_USER_ID: ''
+      },
+      step: 0
+    }
+  },
+  methods: {
+    init(e) {
+      this.form.XGF_USER_ID = e.XGF_USER_ID
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN(
+        '/xgf/user/getApproveInfo', this.form
+      ).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)
+      })
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue
index d882573..46aec29 100644
--- a/src/views/xgf/peopleList/components/list.vue
+++ b/src/views/xgf/peopleList/components/list.vue
@@ -42,6 +42,8 @@
       <el-table-column label="操作" align="center" width="350">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
           <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
@@ -58,6 +60,8 @@
     <user-info ref="userInfos" append-to-body/>
     <send-util ref="sendUtil" append-to-body @refresh="getList"/>
     <entrust ref="entrust" append-to-body @refresh="getList"/>
+    <flow-step ref="step" append-to-body/>
+    <flow-info-list ref="flowInfoList" />
   </div>
 </template>
 
@@ -71,9 +75,11 @@ import user from './user.vue'
 import SendUtil from './sendUtil.vue'
 import UserInfo from '../../flow_audit/userInfo.vue'
 import Entrust from './entrust.vue'
+import FlowStep from '../../flow/components/flowStep.vue'
+import FlowInfoList from '../../flow/components/flowInfoList.vue'
 
 export default {
-  components: { Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  components: { FlowInfoList, FlowStep, Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user },
   directives: { waves },
   data() {
     return {
@@ -163,6 +169,12 @@ export default {
     handleShow(row) {
       this.$refs.userInfos.init(row)
     },
+    handleShowStep(row) {
+      this.$refs.step.init(row)
+    },
+    handleShowFlow(row) {
+      this.$refs.flowInfoList.init(row)
+    },
     approve(row) {
       this.$refs.sendUtil.init(row)
     },

From e71ba80f392d4dd481b0a7782f2fdbc973b345de Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 30 Jan 2024 15:20:59 +0800
Subject: [PATCH 07/13] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=AD=98=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81bug=E4=BF=AE=E5=A4=8D=202=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9=203=E3=80=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/entrust.vue      | 2 +-
 src/views/xgf/flow/components/flowInfo.vue     | 2 +-
 src/views/xgf/flow/components/flowInfoList.vue | 2 +-
 src/views/xgf/flow/components/flowStep.vue     | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/xgf/flow/components/entrust.vue b/src/views/xgf/flow/components/entrust.vue
index 799927c..a712c10 100644
--- a/src/views/xgf/flow/components/entrust.vue
+++ b/src/views/xgf/flow/components/entrust.vue
@@ -53,7 +53,7 @@ export default {
       visible: false,
       loading: false,
       form: {
-        STATUS: null,
+        STATUS: '1',
         APPOINT_CORP_ID: '',
         APPOINT_CORP_NAME: '',
         APPOINT_DEPARTMENT_ID: null,
diff --git a/src/views/xgf/flow/components/flowInfo.vue b/src/views/xgf/flow/components/flowInfo.vue
index 7ffe2e4..cabc7cd 100644
--- a/src/views/xgf/flow/components/flowInfo.vue
+++ b/src/views/xgf/flow/components/flowInfo.vue
@@ -9,7 +9,7 @@
     <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
       <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
         <template slot="description">
-          <el-card class="box-card" style="width: 900px;">
+          <el-card class="box-card a" style="width: 900px;">
             <div slot="header" class="clearfix">
               <span>{{ item.STEP_NAME }}</span>
             </div>
diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue
index 981ccf5..3b55422 100644
--- a/src/views/xgf/flow/components/flowInfoList.vue
+++ b/src/views/xgf/flow/components/flowInfoList.vue
@@ -15,7 +15,7 @@
       fit
       highlight-current-row>
       <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column prop="CREATOR_TIME" label="用户名" align="center"/>
+      <el-table-column prop="CREATOR_TIME" label="审批流创建时间" align="center"/>
       <el-table-column label="操作" align="center" width="250">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue
index 84f449a..6eaba65 100644
--- a/src/views/xgf/flow/components/flowStep.vue
+++ b/src/views/xgf/flow/components/flowStep.vue
@@ -19,7 +19,7 @@
                 <el-col>
                   审批人：{{ item.APPOINT_USER_NAME }}
                 </el-col>
-                <el-col>
+                <el-col v-if="item.INDEX !== step">
                   审批人公司：{{ item.APPOINT_CORP_NAME }}
                 </el-col>
                 <el-col>
@@ -31,7 +31,7 @@
                 <el-col v-if="item.INDEX !== step">
                   审批时间：{{ item.APPOINT_TIME }}
                 </el-col>
-                <el-col v-if="item.APPOINT_OPINION">
+                <el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
                   审批意见：{{ item.APPOINT_OPINION }}
                 </el-col>
               </el-row>
@@ -42,7 +42,6 @@
     </el-steps>
     <div slot="footer" class="dialog-footer">
       <el-button @click="closeWindow">取 消</el-button>
-      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -67,7 +66,8 @@ export default {
       form: {
         XGF_USER_ID: ''
       },
-      step: 0
+      step: 0,
+      endFlag: ''
     }
   },
   methods: {
@@ -81,6 +81,7 @@ export default {
       ).then((data) => {
         this.list = data.flow.info
         this.step = data.flow.STEP
+        this.step = data.flow.endFlag
         if (data.flow.endFlag === '1') {
           this.title = '审批中'
         }

From ca1d5df75053fc5e968bdde8cc1cb80e747a121f Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Wed, 31 Jan 2024 10:30:24 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AFbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A13754=E3=80=8113714?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonly/components/companiesList.vue     | 169 ++++++++++--------
 .../promise_book_issued/components/add.vue    | 128 +++++++------
 .../promise_book_issued/components/see.vue    |   9 +-
 3 files changed, 172 insertions(+), 134 deletions(-)

diff --git a/src/views/hidden/commonly/commonly/components/companiesList.vue b/src/views/hidden/commonly/commonly/components/companiesList.vue
index 6bf5042..71606b7 100644
--- a/src/views/hidden/commonly/commonly/components/companiesList.vue
+++ b/src/views/hidden/commonly/commonly/components/companiesList.vue
@@ -2,78 +2,93 @@
   <div class="app-container">
     <el-form label-width="100px">
       <el-row>
-        <el-col :span="4">
-          <el-form-item label="隐患来源">
-            <el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%">
-              <el-option :value="1" label="隐患快报"/>
-              <el-option :value="2" label="清单排查"/>
-              <el-option :value="4" label="安全环保检查(监管端)"/>
-              <el-option :value="5" label="安全环保检查(企业端)"/>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="隐患描述">
-            <el-input v-model="form.HIDDENDESCR"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="隐患发现人">
-            <el-input v-model="form.HIDDENFIND_NAME"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="隐患部位">
-            <SelectTree
-              ref="deptTree_Select"
-              :clearable="false"
-              :options="hiddenPartList"
-              :props="defaultProps"
-              v-model="form.HIDDENPART"
-              style="width: 100%;"
-              placeholder="请选择" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="隐患级别">
-            <el-select v-model="form.HIDDENLEVEL" placeholder="请选择" style="width: 100%;">
-              <el-option
-                v-for="item in hiddenlevelList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="隐患状态">
-            <el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%">
-              <el-option :value="1" label="未整改"/>
-              <el-option :value="2" label="已整改"/>
-              <el-option :value="4" label="已验收"/>
-              <el-option :value="-1" label="已过期"/>
-              <el-option :value="-2" label="待确认"/>
-              <el-option :value="16" label="确认打回"/>
-              <el-option :value="10" label="验收打回"/>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="确认人">
-            <el-input v-model="form.CONFIRM_USER"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="整改负责人">
-            <el-input v-model="form.RECTIFICATION_USER"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="验收人">
-            <el-input v-model="form.CHECK_USER"/>
-          </el-form-item>
-        </el-col>
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="隐患来源">
+              <el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%">
+                <el-option :value="1" label="隐患快报"/>
+                <el-option :value="2" label="清单排查"/>
+                <el-option :value="4" label="安全环保检查(监管端)"/>
+                <el-option :value="5" label="安全环保检查(企业端)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="隐患描述">
+              <el-input v-model="form.HIDDENDESCR"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="隐患发现人">
+              <el-input v-model="form.HIDDENFIND_NAME"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="隐患部位">
+              <SelectTree
+                ref="deptTree_Select"
+                :clearable="false"
+                :options="hiddenPartList"
+                :props="defaultProps"
+                v-model="form.HIDDENPART"
+                style="width: 100%;"
+                placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="隐患级别">
+              <el-select v-model="form.HIDDENLEVEL" placeholder="请选择" style="width: 100%;">
+                <el-option
+                  v-for="item in hiddenlevelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="隐患状态">
+              <el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%">
+                <el-option :value="1" label="未整改"/>
+                <el-option :value="2" label="已整改"/>
+                <el-option :value="4" label="已验收"/>
+                <el-option :value="-1" label="已过期"/>
+                <el-option :value="-2" label="待确认"/>
+                <el-option :value="16" label="确认打回"/>
+                <el-option :value="10" label="验收打回"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="确认人">
+              <el-input v-model="form.CONFIRM_USER"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="隐患类型" prop="HIDDENTYPE">
+              <el-cascader
+                ref="deptTree_Select3"
+                :options="hiddenTypeList"
+                :props="defaultProps2"
+                v-model="form.HIDDEN_TYPE"
+                collapse-tags
+                clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="整改负责人">
+              <el-input v-model="form.RECTIFICATION_USER"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="验收人">
+              <el-input v-model="form.CHECK_USER"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-col :span="6">
           <el-form-item label="隐患发现时间">
             <el-date-picker
@@ -209,7 +224,7 @@ export default {
       varList: [],
       treeData: [],
       hiddenPartList: [],
-      hiddenTypeList: [],
+      hiddenTypeList: [],//隐患类型
       hiddenlevelList: [
         {
           value: 'hiddenLevel1004',
@@ -230,6 +245,13 @@ export default {
         children: 'nodes',
         label: 'name'
       },
+      defaultProps2: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name',
+        multiple: true,
+        emitPath: false
+      },
       form: {
         SOURCE: undefined,
         HIDDENDESCR: '',
@@ -243,6 +265,7 @@ export default {
         CONFIRM_USER: '',
         HIDDENFIND_NAME: '',
         CORPINFO_ID: '',
+        HIDDEN_TYPE: '',
         HIDDEN_STATUS: undefined
       }
     }
diff --git a/src/views/security_commitment/promise_book_issued/components/add.vue b/src/views/security_commitment/promise_book_issued/components/add.vue
index a9e0c71..67edbf3 100644
--- a/src/views/security_commitment/promise_book_issued/components/add.vue
+++ b/src/views/security_commitment/promise_book_issued/components/add.vue
@@ -408,9 +408,15 @@ export default {
         {
           PROMISE_ID: this.$parent.PROMISE_ID
         }
-      ).then((data) => {
+      ).then(async(data) => {
         const DETAIL = data.promistDetail.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
-        this.form = { ...data.varList, DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM, DETAIL, people: [], coverpeople: [] }
+        this.form = {
+          ...data.varList,
+          DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM,
+          DETAIL,
+          people: [],
+          coverpeople: []
+        }
         this.isSelectTemplate = true
         for (let i = 0; i < data.people.length; i++) {
           this.form.people.push({
@@ -426,15 +432,15 @@ export default {
           for (let j = 0; j < this.form.people.length; j++) {
             if (this.form.DISTRIBUTIONOBJECT === '1') {
               if (data.people[i].POST_ID === this.form.people[j].POST_ID) {
-                this.form.people[j].USER_ID.push(data.people[i].USER_ID)
+                this.form.people[j].USER_ID = data.people[i].USER_ID
                 this.form.people.splice(j + 1, 1)
-                this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people')
+                await this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people')
               }
             } else {
               if (data.people[i].DEPARTMENT_ID === this.form.people[j].DEPARTMENT_ID) {
-                this.form.people[j].USER_ID.push(data.people[i].USER_ID)
+                this.form.people[j].USER_ID = data.people[i].USER_ID
                 this.form.people.splice(j + 1, 1)
-                this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people')
+                await this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people')
               }
             }
           }
@@ -458,9 +464,9 @@ export default {
           })
           for (let j = 0; j < this.form.coverpeople.length; j++) {
             if (data.coverpeople[i].DEPARTMENT_ID === this.form.coverpeople[j].DEPARTMENT_ID) {
-              this.form.coverpeople[j].USER_ID.push(data.coverpeople[i].USER_ID)
+              this.form.coverpeople[j].USER_ID = data.coverpeople[i].USER_ID
               this.form.coverpeople.splice(j + 1, 1)
-              this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople')
+              await this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople')
             }
           }
         }
@@ -517,64 +523,70 @@ export default {
     },
     // 人员
     getUserList(DEPARTMENT_ID, POST_ID, index, type, list) {
-      if (type !== 'created') {
-        let flag = false
-        for (let i = 0; i < this.form[list].length; i++) {
-          if (this.form[list][i].POST_ID === POST_ID) {
-            flag = true
-            break
+      return new Promise((resolve) => {
+        if (type !== 'created') {
+          let flag = false
+          for (let i = 0; i < this.form[list].length; i++) {
+            if (this.form[list][i].POST_ID === POST_ID) {
+              flag = true
+              break
+            }
+          }
+          if (flag) {
+            this.$message.warning('不能选择相同的岗位')
+            return
+          } else {
+            this.form[list][index].POST_ID = POST_ID
           }
         }
-        if (flag) {
-          this.$message.warning('不能选择相同的岗位')
-          return
-        } else {
-          this.form[list][index].POST_ID = POST_ID
-        }
-      }
-      requestFN(
-        '/corppromise/userlistAll',
-        {
-          DEPARTMENT_ID,
-          POST_ID
-        }
-      ).then((data) => {
-        this.form[list][index].userList = data.userList
-        if (type !== 'created') {
-          this.form[list][index].USER_ID = ''
-        }
-      }).catch((e) => {
+        requestFN(
+          '/corppromise/userlistAll',
+          {
+            DEPARTMENT_ID,
+            POST_ID
+          }
+        ).then((data) => {
+          this.form[list][index].userList = data.userList
+          if (type !== 'created') {
+            this.form[list][index].USER_ID = ''
+          }
+          resolve()
+        }).catch((e) => {
+        })
       })
     },
     // 人员
     getUserList1({ id: DEPARTMENT_ID }, index, type, list) {
-      if (type !== 'created') {
-        let flag = false
-        for (let i = 0; i < this.form[list].length; i++) {
-          if (this.form[list][i].DEPARTMENT_ID === DEPARTMENT_ID) {
-            flag = true
-            break
+      return new Promise((resolve) => {
+        if (type !== 'created') {
+          let flag = false
+          for (let i = 0; i < this.form[list].length; i++) {
+            if (this.form[list][i].DEPARTMENT_ID === DEPARTMENT_ID) {
+              flag = true
+              break
+            }
+          }
+          if (flag) {
+            this.$message.warning('不能选择相同的部门')
+            this.$refs.Treeselect[index].clear()
+            return
+          } else {
+            this.form[list][index].DEPARTMENT_ID = DEPARTMENT_ID
           }
         }
-        if (flag) {
-          this.$message.warning('不能选择相同的部门')
-          this.$refs.Treeselect[index].clear()
-          return
-        } else {
-          this.form[list][index].DEPARTMENT_ID = DEPARTMENT_ID
-        }
-      }
-      requestFN(
-        '/user/listAll',
-        {
-          DEPARTMENT_ID
-        }
-      ).then((data) => {
-        this.form[list][index].userList = data.userList
-        if (type !== 'created') {
-          this.form[list][index].USER_ID = ''
-        }
-      }).catch((e) => {
+        requestFN(
+          '/user/listAll',
+          {
+            DEPARTMENT_ID
+          }
+        ).then((data) => {
+          this.form[list][index].userList = data.userList
+          if (type !== 'created') {
+            this.form[list][index].USER_ID = ''
+          }
+          resolve()
+        }).catch((e) => {
+        })
       })
     },
     addPeople() {
diff --git a/src/views/security_commitment/promise_book_issued/components/see.vue b/src/views/security_commitment/promise_book_issued/components/see.vue
index b9cdf62..a38c235 100644
--- a/src/views/security_commitment/promise_book_issued/components/see.vue
+++ b/src/views/security_commitment/promise_book_issued/components/see.vue
@@ -23,7 +23,8 @@
         <td>{{ form.PROMISE_TERM_END }}</td>
       </tr>
     </table>
-    <el-divider content-position="left">承诺人</el-divider>
+    <el-divider v-if="form.TYPE != '1'" content-position="left">承诺人</el-divider>
+    <el-divider v-if="form.TYPE == '1'" content-position="left">受状人</el-divider>
     <table class="table-ui">
       <tr v-for="(item,index) in form.people" :key="item.id">
         <td v-if="form.RELEASE_PLATFORM === '1'" class="bbg">{{ '单位' + (index + 1) }}</td>
@@ -36,7 +37,8 @@
         <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
       </tr>
     </table>
-    <el-divider content-position="left">被承诺人</el-divider>
+    <el-divider v-if="form.TYPE != '1'" content-position="left">被承诺人</el-divider>
+    <el-divider v-if="form.TYPE == '1'" content-position="left">发状人</el-divider>
     <table class="table-ui">
       <tr v-for="(item,index) in form.coverpeople" :key="item.id">
         <td class="bbg">{{ '部门' + (index + 1) }}</td>
@@ -45,7 +47,8 @@
         <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
       </tr>
     </table>
-    <el-divider content-position="left">承诺内容</el-divider>
+    <el-divider v-if="form.TYPE != '1'" content-position="left">承诺内容</el-divider>
+    <el-divider v-if="form.TYPE == '1'" content-position="left">责任状内容</el-divider>
     <table class="table-ui">
       <tr>
         <td class="bbg">正文</td>

From 237801adb89e654e8917c97f6068c16228bd94e5 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 31 Jan 2024 10:51:50 +0800
Subject: [PATCH 09/13] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=90=86=202?=
 =?UTF-8?q?=E3=80=81=E5=9C=B0=E5=9B=BE=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9=203?=
 =?UTF-8?q?=E3=80=81=E6=B6=88=E9=98=B2=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=A6=E6=83=85=E5=90=8E=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2bug=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/xgf/flow/components/flowStep.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue
index 6eaba65..33be87a 100644
--- a/src/views/xgf/flow/components/flowStep.vue
+++ b/src/views/xgf/flow/components/flowStep.vue
@@ -81,7 +81,6 @@ export default {
       ).then((data) => {
         this.list = data.flow.info
         this.step = data.flow.STEP
-        this.step = data.flow.endFlag
         if (data.flow.endFlag === '1') {
           this.title = '审批中'
         }

From 688eb1bd1b251b0bfc9503c56863f2fa3c579da6 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 31 Jan 2024 14:08:31 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BE=BF=E8=B7=9F=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E6=9C=AA=E6=B8=85=E7=A9=BA=E4=BB=A5?=
 =?UTF-8?q?=E9=80=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index e8326ae..b8ced0b 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -5,7 +5,7 @@
         <el-row :gutter="12">
           <el-col :span="12">
             <el-form-item prop="STATUS" label="是否通过: ">
-              <el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择">
+              <el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择" @change="clearInfo">
                 <el-option label="是" value="1"/>
                 <el-option label="否" value="0"/>
               </el-select>
@@ -173,6 +173,7 @@ export default {
         }
       ).then((data) => {
         this.peopleList = data.userList
+        this.form.user = ''
       }).catch((e) => {
         console.log(e)
       })
@@ -210,6 +211,14 @@ export default {
         list: [],
         tm: new Date().getTime()
       }
+    },
+    clearInfo() {
+      this.form.APPOINT_DEPARTMENT_ID = null
+      this.form.APPOINT_DEPARTMENT_NAME = ''
+      this.form.APPOINT_USER_ID = null
+      this.form.APPOINT_USER_NAME = ''
+      this.form.OPINION = ''
+      this.form.user = ''
     }
   }
 }

From f8c31c41df04369f4621f997bf031ae9bbbb2b4e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 31 Jan 2024 14:13:49 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/BI/index.vue                        |  14 +-
 .../hotwork/hotwork_list/components/list.vue  |   2 +-
 .../components/hotwork/hotwork_list/index.vue |  18 +-
 src/views/firefighting/fireReport/index.vue   |   7 +-
 .../components/hidden_list.vue                |   2 +-
 .../outsourced/components/edit.vue            |   4 +-
 .../keyprojects/personnelmanagement/index.vue |   1 -
 .../keyprojects/platformelectronic/index.vue  |  60 +++----
 src/views/keyprojects/platformvideo/index.vue |   2 +-
 src/views/map/components/caofeidian_index.vue |   2 +-
 src/views/map/components/menjin.vue           |  16 +-
 src/views/map/components/menjinCfd.vue        |  14 +-
 src/views/map/components/qixiang.vue          |   4 +-
 src/views/map/dialog/blindboardCfdD.vue       | 114 ++++++-------
 src/views/map/dialog/hoistingCfdD.vue         |   8 +-
 src/views/map/dialog/hotwork.vue              |  12 +-
 src/views/map/dialog/humiditystation.vue      | 161 +++++++++---------
 src/views/map/dialog/peoplePositionCfdD.vue   |  26 +--
 src/views/map/dialog/peoplePositionOne.vue    |   4 +-
 src/views/map/dialog/temperaturestation.vue   | 161 +++++++++---------
 src/views/map/dialog/video_play_cfd.vue       |   2 +-
 src/views/map/dialog/weatherstation.vue       |  11 +-
 src/views/map/dialog/windspeedstation.vue     | 161 +++++++++---------
 src/views/map/dialog/xfControl.vue            |   8 +-
 24 files changed, 407 insertions(+), 407 deletions(-)

diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue
index 9f1872d..f2fa049 100644
--- a/src/views/BI/index.vue
+++ b/src/views/BI/index.vue
@@ -212,11 +212,11 @@
                 </div>
                 <div v-for="(item,index) in safetyEnvironmentalInspectionList" :key="index">
                   <span>{{
-                      item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE
-                    }}</span>
+                    item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE
+                  }}</span>
                   <span>{{
-                      item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START
-                    }}</span>
+                    item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START
+                  }}</span>
                 </div>
               </div>
             </div>
@@ -507,7 +507,7 @@ export default {
             count3 = item.count
           }
         })
-        this.safetyEnvironmentalInspectionList = data.insList.length > 4 ? data.insList.splice(0,4) : data.insList
+        this.safetyEnvironmentalInspectionList = data.insList.length > 4 ? data.insList.splice(0, 4) : data.insList
         this.initEcharts4(count1, count2, count3)
       })
     },
@@ -553,9 +553,9 @@ export default {
           // }
           if (item.HIDDENLEVEL == 'hiddenLevel1004') { // 轻微隐患
             yinhuanCount[0] = item.count
-          }else  if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患
+          } else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患
             yinhuanCount[1] = item.count
-          } else  if (item.HIDDENLEVEL == 'jdyh001') { //  较大隐患
+          } else if (item.HIDDENLEVEL == 'jdyh001') { //  较大隐患
             yinhuanCount[2] = item.count
           } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患
             yinhuanCount[3] = item.count
diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
index 91eb85a..e5a93c3 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
@@ -84,7 +84,7 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
-    <div style="height: 50px"></div>
+    <div style="height: 50px"/>
   </div>
 </template>
 <script>
diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/index.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/index.vue
index ea13bf1..4ef20d2 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/index.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/index.vue
@@ -14,8 +14,8 @@
 <script>
 import List from './components/list'
 import Detail from './components/detail'
-import ListCfd from "./components/list_cfd"
-import DetailCfd from "./components/detail_cfd"
+import ListCfd from './components/list_cfd'
+import DetailCfd from './components/detail_cfd'
 export default {
   components: {
     List: List,
@@ -23,13 +23,6 @@ export default {
     ListCfd: ListCfd,
     DetailCfd: DetailCfd
   },
-  created() {
-    if (this.CORPINFO_ID == '035958e685cf4850bc40151c5e0617a6') {
-      this.activeName = 'ListCfd'
-    } else {
-      this.activeName = 'List'
-    }
-  },
   data() {
     return {
       activeName: 'List',
@@ -49,6 +42,13 @@ export default {
       }
     }
   },
+  created() {
+    if (this.CORPINFO_ID == '035958e685cf4850bc40151c5e0617a6') {
+      this.activeName = 'ListCfd'
+    } else {
+      this.activeName = 'List'
+    }
+  },
   methods: {
     goBack() {
       this.$parent.activeName = 'CorpInfo'
diff --git a/src/views/firefighting/fireReport/index.vue b/src/views/firefighting/fireReport/index.vue
index fa086b6..10edae5 100644
--- a/src/views/firefighting/fireReport/index.vue
+++ b/src/views/firefighting/fireReport/index.vue
@@ -1,5 +1,10 @@
 <template>
-  <component :is="parentObj.activeName"/>
+  <div>
+    <FireControlRoom v-if="parentObj.activeName === 'FireControlRoom'"/>
+    <FirePumpRoom v-if="parentObj.activeName === 'FirePumpRoom'"/>
+    <FireResources v-if="parentObj.activeName === 'FireResources'"/>
+    <List v-show="parentObj.activeName === 'List'"/>
+  </div>
 </template>
 <script>
 import List from './components/list'
diff --git a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
index f7f545c..fb50645 100644
--- a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
+++ b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
@@ -247,7 +247,7 @@ export default {
         console.log(data.varList)
         if (data.varList) {
           this.varList = data.varList
-        }else {
+        } else {
           this.varList = []
         }
         this.total = data.page.totalResult
diff --git a/src/views/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue
index 2fdf10c..cfabc0a 100644
--- a/src/views/keyprojects/outsourced/components/edit.vue
+++ b/src/views/keyprojects/outsourced/components/edit.vue
@@ -612,7 +612,7 @@ export default {
       immediate: false
 
     },
-    //'form.ENDTIME': {
+    // 'form.ENDTIME': {
     //  handler: function() {
     //    // eslint-disable-next-line no-unused-vars
     //    var time = formatDate(new Date(), 'YYYY-MM-DD')
@@ -622,7 +622,7 @@ export default {
     //      this.form.STATE = '2'
     //    }
     //  }
-    //},
+    // },
     TRAINING_TIME: function(newData, oldData) {
       if (!newData) {
         this.TRAINING_TIME = ['', '']
diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index 4283f76..a33a579 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -82,7 +82,6 @@
       </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>
diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue
index 25cef3f..a7d2cf4 100644
--- a/src/views/keyprojects/platformelectronic/index.vue
+++ b/src/views/keyprojects/platformelectronic/index.vue
@@ -141,7 +141,7 @@ import TiandiMap from '../../../components/TianMap/TiandiMap'
 import Platformvideo from '../platformelectronic/components/platformvideo.vue'
 import SelectTree from '@/components/SelectTree'
 export default {
-  components: { Pagination, TiandiMap ,Platformvideo,SelectTree},
+  components: { Pagination, TiandiMap, Platformvideo, SelectTree },
   directives: { waves },
   data() {
     // eslint-disable-next-line no-unused-vars
@@ -163,10 +163,10 @@ export default {
       dialogFormMap: false,
       corpList: [],
       form: {
-        CORPINFO_ID:'',
-        bianjiequyu:[],
-        PLATFORMELECTRONIC_ID:'',
-        LONGITUDEANDLATITUDE:'',
+        CORPINFO_ID: '',
+        bianjiequyu: [],
+        PLATFORMELECTRONIC_ID: '',
+        LONGITUDEANDLATITUDE: '',
         VIDEOMANAGER_ID: '',
         VIDEO_RESOURCES_ID: '',
         VIDEO_TYPE: 1,
@@ -176,7 +176,7 @@ export default {
         PLATFORMVIDEOMANAGEMENT_ID: '',
         LATITUDE: '',
         LONGITUDE: '',
-        SUOSHUQUYU:''
+        SUOSHUQUYU: ''
       },
       rules: {
         CORPINFO_ID: [
@@ -189,20 +189,20 @@ export default {
           { required: true, message: '请选择摄像头', trigger: 'blur' }
         ]
       },
-      dialogForm : false,
-      msg:'add' ,
+      dialogForm: false,
+      msg: 'add',
       defaultProps: {
         value: 'id',
         children: 'nodes',
         label: 'name'
       },
-      quyuList :[],
-      shexiangtouForm:{},
+      quyuList: [],
+      shexiangtouForm: {},
       statusList: [
         { id: '0', name: '请选择' },
         { id: '1', name: '油管区' },
         { id: '2', name: '码头区' }
-      ],
+      ]
     }
   },
   async created() {
@@ -225,7 +225,7 @@ export default {
       this.KEYWORDS = ''
       this.getQuery()
     },
-    getquyuList(){ //获取区域字典信息
+    getquyuList() { // 获取区域字典信息
       requestFN(
         '/dictionaries/listSelectTree',
         {
@@ -235,7 +235,7 @@ export default {
         this.quyuList = JSON.parse(data.zTreeNodes)
       })
     },
-    getCorpList() { //获取所有的企业信息
+    getCorpList() { // 获取所有的企业信息
       requestFN(
         '/corpinfo/listAll',
         {}
@@ -245,12 +245,12 @@ export default {
       })
     },
 
-    getAllList() { //获取公司的所有摄像头
+    getAllList() { // 获取公司的所有摄像头
       return new Promise(resolve => {
         requestFN(
           '/platformelectronic/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
           {
-            KEYWORDS:this.KEYWORDS
+            KEYWORDS: this.KEYWORDS
           }
         ).then((data) => {
           this.varList = data.varList
@@ -268,16 +268,16 @@ export default {
       this.dialogForm = true
       // this.$refs.platformvideo.init()
     },
-    resetForm(){
+    resetForm() {
       this.shexiangtouForm.LONGITUDE = ''
       this.shexiangtouForm.LATITUDE = ''
       this.shexiangtouForm.SUOSHUQUYU = ''
-      this.form.LONGITUDEANDLATITUDE =  ''
+      this.form.LONGITUDEANDLATITUDE = ''
       this.shexiangtouForm = {}
-      this.form= {
-        CORPINFO_ID:'',
-        bianjiequyu:'',
-        LONGITUDEANDLATITUDE:'',
+      this.form = {
+        CORPINFO_ID: '',
+        bianjiequyu: '',
+        LONGITUDEANDLATITUDE: '',
         VIDEOMANAGER_ID: '',
         VIDEO_RESOURCES_ID: '',
         VIDEO_TYPE: 1,
@@ -290,7 +290,7 @@ export default {
       }
     },
 
-    upload(){
+    upload() {
       var _this = this
       this.$refs.form.validate(valid => {
         if (valid) {
@@ -323,14 +323,14 @@ export default {
     selectVideo(row) {
       this.$refs.platformvideo.init()
     },
-    goEdit(row){
+    goEdit(row) {
       this.dialogForm = true
       this.listLoading = true
       return new Promise(resolve => {
         requestFN(
           '/platformelectronic/goEdit',
           {
-            PLATFORMELECTRONIC_ID :row.PLATFORMELECTRONIC_ID
+            PLATFORMELECTRONIC_ID: row.PLATFORMELECTRONIC_ID
           }
         ).then((data) => {
           this.shexiangtouForm = data.pd
@@ -339,7 +339,7 @@ export default {
           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.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE
           this.listLoading = false
           resolve()
         }).catch((e) => {
@@ -370,8 +370,8 @@ export default {
         REGIONNAME: row.regionName,
         REGIONPATH: row.regionPath,
         REGIONPATHNAM: row.regionPathName,
-        VIDEONAME : row.name,
-        CODE:row.indexCode
+        VIDEONAME: row.name,
+        CODE: row.indexCode
       }
       this.$set(this.form, 'VIDEONAME', row.name)
       this.$set(this.form, 'CODE', row.indexCode)
@@ -381,7 +381,7 @@ export default {
     },
     // 获取列表
     setPosition() {
-      if(this.shexiangtouForm.PLATFORMELECTRONIC_ID != null){
+      if (this.shexiangtouForm.PLATFORMELECTRONIC_ID != null) {
 
       }
       this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE
@@ -423,10 +423,10 @@ export default {
     },
 
     handleMap(row) {
-      if(row != null){
+      if (row != null) {
         this.form.LONGITUDE = row.LONGITUDE
         this.form.LATITUDE = row.LATITUDE
-        this.shexiangtouForm =row
+        this.shexiangtouForm = row
       }
       this.dialogFormMap = true
       this.$nextTick(() => {
diff --git a/src/views/keyprojects/platformvideo/index.vue b/src/views/keyprojects/platformvideo/index.vue
index 31df8e3..8741a51 100644
--- a/src/views/keyprojects/platformvideo/index.vue
+++ b/src/views/keyprojects/platformvideo/index.vue
@@ -307,7 +307,7 @@ export default {
           {
             PLATFORMVIDEOMANAGEMENT_ID: row.PLATFORMVIDEOMANAGEMENT_ID
           }
-        ).then(async (res) => {
+        ).then(async(res) => {
           // this.dialogVideoHLS = true
           this.getList()
           await this.getAllList()
diff --git a/src/views/map/components/caofeidian_index.vue b/src/views/map/components/caofeidian_index.vue
index 91a76c6..515cf1e 100644
--- a/src/views/map/components/caofeidian_index.vue
+++ b/src/views/map/components/caofeidian_index.vue
@@ -16,7 +16,7 @@
     <div class="block3">
       <layout-title title="人员定位信息"/>
       <div class="options">
-        <div v-for="(item,index) in block3OptionsList" :key="index" class="option" v-if="index === 2">
+        <div v-for="(item,index) in block3OptionsList" v-if="index === 2" :key="index" class="option">
           <img :src="item.img" class="img_top" alt="">
           <img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt="">
           <div class="label">{{ item.label }}</div>
diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue
index 3395396..ba5d158 100644
--- a/src/views/map/components/menjin.vue
+++ b/src/views/map/components/menjin.vue
@@ -209,13 +209,13 @@ export default {
           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
+        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)
       })
@@ -281,7 +281,7 @@ export default {
       })
     },
     loadRecord(index) {
-       this.getDoorWayRecords(index)
+      this.getDoorWayRecords(index)
     },
     block3OptionsClick(index) {
       this.block3List = []
diff --git a/src/views/map/components/menjinCfd.vue b/src/views/map/components/menjinCfd.vue
index 411adf4..0851d73 100644
--- a/src/views/map/components/menjinCfd.vue
+++ b/src/views/map/components/menjinCfd.vue
@@ -95,7 +95,7 @@ export default {
           title: '人员闸机数',
           img: require('../../../assets/map/menjin/ico1.png'),
           label1: '在线数',
-          count1: 0,
+          count1: 0
           // label2: '离线数',
           // count2: 0
         },
@@ -103,7 +103,7 @@ export default {
           title: '车辆闸机数',
           img: require('../../../assets/map/menjin/ico2.png'),
           label1: '在线数',
-          count1: 0,
+          count1: 0
           // label2: '离线数',
           // count2: 0
         },
@@ -199,15 +199,15 @@ export default {
           GANGKOU: this.gangkou
         }
       ).then((data) => {
-        /*this.block1OptionsList[0].count1 = data.onlinePerGate
+        /* this.block1OptionsList[0].count1 = data.onlinePerGate
         this.block1OptionsList[0].count2 = data.offlinePerGate
         this.block1OptionsList[1].count1 = data.onlineCarGate
         this.block1OptionsList[1].count2 = data.offlineCarGate
         this.block1OptionsList[2].count1 = data.cameraCount*/
-        this.block1OptionsList[0].count1 = data.onlinePerGate+data.offlinePerGate
-        //this.block1OptionsList[0].count2 =
-        this.block1OptionsList[1].count1 = data.onlineCarGate+data.offlineCarGate
-        //this.block1OptionsList[1].count2 =
+        this.block1OptionsList[0].count1 = data.onlinePerGate + data.offlinePerGate
+        // this.block1OptionsList[0].count2 =
+        this.block1OptionsList[1].count1 = data.onlineCarGate + data.offlineCarGate
+        // this.block1OptionsList[1].count2 =
         this.block1OptionsList[2].count1 = data.cameraCount
       }).catch((e) => {
         console.log(e)
diff --git a/src/views/map/components/qixiang.vue b/src/views/map/components/qixiang.vue
index dc838a2..3516d28 100644
--- a/src/views/map/components/qixiang.vue
+++ b/src/views/map/components/qixiang.vue
@@ -19,11 +19,11 @@
           <div class="title">{{ item.title }}</div>
           <div class="info">
             <div class="img"><img :src="item.img" alt=""></div>
-            <div class="count" v-if="item.title == '监测站数'">
+            <div v-if="item.title == '监测站数'" class="count">
               <div>在线数：<count-to :start-val="0" :end-val="+item.onlinecount" :duration="3600"/></div>
               <div>离线数：<count-to :start-val="0" :end-val="+item.Offlinecount" :duration="3600"/></div>
             </div>
-            <div class="count" v-else>
+            <div v-else class="count">
               <div>在线数：-</div>
               <div>离线数：-</div>
             </div>
diff --git a/src/views/map/dialog/blindboardCfdD.vue b/src/views/map/dialog/blindboardCfdD.vue
index 87ecd0d..eaa3150 100644
--- a/src/views/map/dialog/blindboardCfdD.vue
+++ b/src/views/map/dialog/blindboardCfdD.vue
@@ -170,68 +170,68 @@
 </template>
 
 <script>
-  import { requestFN } from '@/utils/request'
-  import moment from 'moment/moment'
+import { requestFN } from '@/utils/request'
+import moment from 'moment/moment'
 
-  export default {
-    props: {
-      id: {
-        type: String,
-        default() {
-          return ''
-        }
-      },
-      type: {
-        type: String,
-        default() {
-          return ''
-        }
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
       }
     },
-    data() {
-      return {
-        config: config,
-        info: {},
-        ImgList: [],
-        boardList: [],
-        imgList: [],
-        imgList1: [],
-        measuresList: [],
-        pd: []
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      config: config,
+      info: {},
+      ImgList: [],
+      boardList: [],
+      imgList: [],
+      imgList1: [],
+      measuresList: [],
+      pd: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
       }
     },
-    created() {
-      this.getData()
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
     },
-    methods: {
-      formatTime(date, column) {
-        if (date) {
-          return dateformat(date, 'YYYY年MM月DD日HH时mm分')
-        } else {
-          return ''
+    getRowKey(row) {
+      return row.BLINDBOARD_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/map/Eight/getByIdCfdD',
+        {
+          id: this.id,
+          TYPE: this.type,
+          BLINDBOARD_ID: this.id
         }
-      },
-      formatDate(date, column) {
-        if (date) {
-          return dateformat(date, 'YYYY-MM-DD')
-        } else {
-          return ''
-        }
-      },
-      getRowKey(row) {
-        return row.BLINDBOARD_ID
-      },
-      getData() {
-        this.listLoading = true
-        requestFN(
-          '/map/Eight/getByIdCfdD',
-          {
-            id: this.id,
-            TYPE: this.type,
-            BLINDBOARD_ID: this.id
-          }
-        ).then((data) => {
-          this.listLoading = false
+      ).then((data) => {
+        this.listLoading = false
         this.pd = data.pd // 参数map
         this.imgList = data.imgList
         this.imgList1 = data.imgList1
@@ -241,11 +241,11 @@
         this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
         this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
       }).catch((e) => {
-          this.listLoading = false
+        this.listLoading = false
       })
-      }
     }
   }
+}
 </script>
 <style lang="scss" scoped>
 </style>
diff --git a/src/views/map/dialog/hoistingCfdD.vue b/src/views/map/dialog/hoistingCfdD.vue
index 2545ff3..ff8736f 100644
--- a/src/views/map/dialog/hoistingCfdD.vue
+++ b/src/views/map/dialog/hoistingCfdD.vue
@@ -43,10 +43,10 @@
         <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>
+            {{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }}
+            {{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }}
+            {{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }}
+          </span>
         </td>
       </tr>
       <tr>
diff --git a/src/views/map/dialog/hotwork.vue b/src/views/map/dialog/hotwork.vue
index 2adb22a..81b04b9 100644
--- a/src/views/map/dialog/hotwork.vue
+++ b/src/views/map/dialog/hotwork.vue
@@ -72,31 +72,31 @@
       <tr>
         <td class="bbg-transparent">动火单位(部门)负责人意见</td>
         <td colspan="5">
-          <img v-if="info.HOT_WORK_USER_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px">
+          <img v-viewer v-if="info.HOT_WORK_USER_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px">
         </td>
       </tr>
       <tr>
         <td class="bbg-transparent">现场管辖单位(部门)负责人意见</td>
         <td colspan="5">
-          <img v-if="info.UNIT_LEADER_PRINCIPAL" v-viewer :src="config.fileUrl+info.UNIT_LEADER_PRINCIPAL" width="50px" height="50px">
+          <img v-viewer v-if="info.UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+info.UNIT_LEADER_PRINCIPAL" width="50px" height="50px">
         </td>
       </tr>
       <tr>
         <td class="bbg-transparent">动火许可证签发单位意见</td>
         <td colspan="5">
-          <img v-if="info.ISSUING_PRINCIPAL" v-viewer :src="config.fileUrl+info.ISSUING_PRINCIPAL" width="50px" height="50px">
+          <img v-viewer v-if="info.ISSUING_PRINCIPAL" :src="config.fileUrl+info.ISSUING_PRINCIPAL" width="50px" height="50px">
         </td>
       </tr>
       <tr>
         <td class="bbg-transparent" rowspan="2">动火前管辖单位现场人员许可</td>
         <td colspan="2">
           姓名：
-          <img v-if="info.HOT_WORK_PERSON_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px">
+          <img v-viewer v-if="info.HOT_WORK_PERSON_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px">
         </td>
         <td class="bbg-transparent" rowspan="2">动火后管辖单位现场人员验收</td>
         <td colspan="2">
           姓名：
-          <img v-if="info.HOT_WORK_AFTER_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px">
+          <img v-viewer v-if="info.HOT_WORK_AFTER_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px">
         </td>
       </tr>
       <tr>
@@ -116,7 +116,7 @@
               <td>{{ item.userName }}</td>
               <td>{{ item.TIME }}</td>
               <td>
-                <img v-if="item.FILEPATH" v-viewer :src="config.fileUrl+item.FILEPATH" width="50px" height="50px">
+                <img v-viewer v-if="item.FILEPATH" :src="config.fileUrl+item.FILEPATH" width="50px" height="50px">
               </td>
             </tr>
           </table>
diff --git a/src/views/map/dialog/humiditystation.vue b/src/views/map/dialog/humiditystation.vue
index 29342b9..8c93751 100644
--- a/src/views/map/dialog/humiditystation.vue
+++ b/src/views/map/dialog/humiditystation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container print-work">
     <div class="level-title">
-      <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}</h1>
+      <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}</h1>
     </div>
     <div style="display: flex">
       <div id="main4"/>
@@ -32,7 +32,7 @@ import * as echarts from 'echarts'
 
 let myChart4 = null
 let myChart5 = null
-let myChart6 = null
+const myChart6 = null
 export default {
   props: {
     id: {
@@ -46,12 +46,12 @@ export default {
       default() {
         return ''
       }
-    },
+    }
   },
   data() {
     return {
       config: config,
-      info: {},
+      info: {}
     }
   },
   mounted() {
@@ -73,7 +73,7 @@ export default {
         '/map/getById',
         {
           id: this.id,
-          TYPE: this.type,
+          TYPE: this.type
         }
       ).then((data) => {
         this.listLoading = false
@@ -96,7 +96,7 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         series: {
@@ -123,60 +123,60 @@ export default {
           axisTick: {
             show: true,
             splitNumber: 5,
-            lineStyle:{
-              color:'#fff'
+            lineStyle: {
+              color: '#fff'
             }
           },
           splitLine: {
             length: 10,
             lineStyle: {
               width: 5,
-              color:'#fff'
+              color: '#fff'
             }
           },
           axisLabel: {
             formatter: function(e) {
-              switch (e + "") {
-                case "0":
-                  return "北";
-                case "45":
-                  return "东北";
-                case "135":
-                  return "东南";
-                case "225":
-                  return "西南"
-                case "315":
-                  return "西北";
-                case "360":
-                  return "北";
-                case "180":
-                  return "南";
-                case "90":
-                  return "东";
-                case "270":
-                  return "西";
+              switch (e + '') {
+                case '0':
+                  return '北'
+                case '45':
+                  return '东北'
+                case '135':
+                  return '东南'
+                case '225':
+                  return '西南'
+                case '315':
+                  return '西北'
+                case '360':
+                  return '北'
+                case '180':
+                  return '南'
+                case '90':
+                  return '东'
+                case '270':
+                  return '西'
                 default:
-                  return e;
+                  return e
               }
             },
             distance: -60,
             textStyle: {
               fontSize: 14,
-              fontWeight: "",
-              color:'#fff'
+              fontWeight: '',
+              color: '#fff'
             }
           },
           pointer: {
             show: true,
-            length:'80%',
-            width:5
+            length: '80%',
+            width: 5
           },
           detail: {
             formatter: function(param) {
-              var level = '';
-              if (param > 0 && param < 90){
+              var level = ''
+              if (param > 0 && param < 90) {
                 level = '东北'
-              } else if (param > 90 && param < 180){
+              } else if (param > 90 && param < 180) {
                 level = '东南'
               } else if (param > 180 && param < 270) {
                 level = '西南'
@@ -191,45 +191,44 @@ export default {
               } else if (param == 180) {
                 level = '正南'
               }
-              return "当前风向:"+level + "(" + param + "°)";
+              return '当前风向:' + level + '(' + param + '°)'
             },
             offsetCenter: [0, 190],
             textStyle: {
               fontSize: 14,
-              color:'#fff'
+              color: '#fff'
             }
           },
           data: [data.pd.WINDDIRECTION]
         }
-      };
+      }
       myChart4.setOption(option)
     },
     initEcharts2(data) {
       myChart5 = echarts.init(document.querySelector('#main5'))
-      var value = data.pd.TEMPERATURE;
-      var kd = [];
-// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
+      var value = data.pd.TEMPERATURE
+      var kd = []
+      // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
       for (var i = 0, len = 130; i <= len; i++) {
         if (i > 100 || i < 30) {
           kd.push('0')
         } else {
           if (i % 5 === 0) {
-            kd.push('5');
+            kd.push('5')
           } else {
-            kd.push('3');
+            kd.push('3')
           }
         }
-
       }
       // console.log(kd)
-// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
+      // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
       function getData(value) {
-        return [Number(value) + 30];
+        return [Number(value) + 30]
       }
       console.log(getData(value))
-      var data = getData(value + 30);
-      var mercuryColor = '#fd4d49';
-      var borderColor = '#fd4d49';
+      var data = getData(value + 30)
+      var mercuryColor = '#fd4d49'
+      var borderColor = '#fd4d49'
 
       const option = {
         title: {
@@ -238,18 +237,18 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         yAxis: [{
           show: false,
           min: 0,
-          max: 130,
+          max: 130
         }, {
           show: false,
           data: [],
           min: 0,
-          max: 130,
+          max: 130
         }],
         xAxis: [{
           show: false,
@@ -263,7 +262,7 @@ export default {
         }, {
           show: false,
           min: -110,
-          max: 100,
+          max: 100
 
         }],
         series: [{
@@ -276,7 +275,7 @@ export default {
           itemStyle: {
             normal: {
               color: mercuryColor,
-              barBorderRadius: 0,
+              barBorderRadius: 0
             }
           },
           label: {
@@ -285,11 +284,11 @@ export default {
               position: 'top',
               formatter: function(param) {
                 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
-                return (((param.value * 100) - (30 * 100)) / 100) + '°C';
+                return (((param.value * 100) - (30 * 100)) / 100) + '°C'
               },
               textStyle: {
                 color: '#ccc',
-                fontSize: '10',
+                fontSize: '10'
               }
             }
           },
@@ -304,7 +303,7 @@ export default {
           itemStyle: {
             normal: {
               color: '#ffffff',
-              barBorderRadius: 50,
+              barBorderRadius: 50
             }
           },
           z: 1
@@ -318,7 +317,7 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              barBorderRadius: 50,
+              barBorderRadius: 50
             }
           },
           z: 0
@@ -332,7 +331,7 @@ export default {
           itemStyle: {
             normal: {
               color: mercuryColor,
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 2
@@ -346,7 +345,7 @@ export default {
           itemStyle: {
             normal: {
               color: '#ffffff',
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 1
@@ -360,7 +359,7 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 0
@@ -379,12 +378,12 @@ export default {
               formatter: function(params) {
                 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
                 if (params.dataIndex > 100 || params.dataIndex < 30) {
-                  return '';
+                  return ''
                 } else {
                   if (params.dataIndex % 5 === 0) {
-                    return params.dataIndex - 30;
+                    return params.dataIndex - 30
                   } else {
-                    return '';
+                    return ''
                   }
                 }
               }
@@ -396,12 +395,12 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              barBorderRadius: 10,
+              barBorderRadius: 10
             }
           },
           z: 0
         }]
-      };
+      }
       myChart5.setOption(option)
     },
     initEcharts3(data) {
@@ -414,7 +413,7 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         series: [
@@ -424,7 +423,7 @@ export default {
             min: 0,
             max: 30,
             splitNumber: 10,
-            center:['50%', '55%'],
+            center: ['50%', '55%'],
             radius: '73%',
             axisLine: {
               lineStyle: {
@@ -436,7 +435,7 @@ export default {
               distance: -20,
               length: 20,
               lineStyle: {
-                width:2,
+                width: 2,
                 color: '#0F2D5B'
               }
             },
@@ -465,7 +464,7 @@ export default {
             min: 0,
             max: 30,
             splitNumber: 10,
-            center:['50%', '55%'],
+            center: ['50%', '55%'],
             radius: '65%',
             axisLine: {
               lineStyle: {
@@ -481,17 +480,17 @@ export default {
             silent: true,
             pointer: {
               length: '85%',
-              width:4,
+              width: 4,
               itemStyle: {
                 color: 'inherit',
                 borderWidth: 1,
-                borderColor:'inherit', // '#0D3778',
+                borderColor: 'inherit', // '#0D3778',
                 shadowColor: 'inherit',
                 shadowBlur: 1
               }
             },
             axisTick: {
-              show:false,
+              show: false,
               distance: -20,
               length: 5,
               lineStyle: {
@@ -502,24 +501,24 @@ export default {
               distance: -20,
               length: 20,
               lineStyle: {
-                width:2,
+                width: 2,
                 color: '#0F2D5B'
               }
             },
             axisLabel: {
               show: false
             },
-            title: {                // 仪表盘标题。
-              show: true,             // 是否显示标题,默认 true。
-              offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
-              color: '#ccc',          // 文字的颜色,默认 #333。
-              fontSize: 15           // 文字的字体大小,默认 15。
+            title: { // 仪表盘标题。
+              show: true, // 是否显示标题,默认 true。
+              offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+              color: '#ccc', // 文字的颜色,默认 #333。
+              fontSize: 15 // 文字的字体大小,默认 15。
             },
             detail: {
               valueAnimation: true,
               offsetCenter: [0, '70%'],
               formatter: '{value}',
-              color: 'inherit',        // 文字的颜色,默认 #333。
+              color: 'inherit', // 文字的颜色,默认 #333。
               fontSize: 20
             },
             data: [{
diff --git a/src/views/map/dialog/peoplePositionCfdD.vue b/src/views/map/dialog/peoplePositionCfdD.vue
index c76bec9..584a23e 100644
--- a/src/views/map/dialog/peoplePositionCfdD.vue
+++ b/src/views/map/dialog/peoplePositionCfdD.vue
@@ -14,7 +14,7 @@
       </tr>
       <tr>
         <td class="bbg-transparent">部门</td>
-        <td >{{ info?info.DEPARTMENT_NAME:''  }}</td>
+        <td >{{ info?info.DEPARTMENT_NAME:'' }}</td>
       </tr>
       <tr>
         <td class="bbg-transparent">岗位</td>
@@ -81,18 +81,18 @@ export default {
         return ''
       }
     },
-         type: {
-           type: String,
-           default() {
-             return ''
-           }
-         },
-         infoname: {
-           type: String,
-           default() {
-             return ''
-           }
-         },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    infoname: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
   },
   data() {
     return {
diff --git a/src/views/map/dialog/peoplePositionOne.vue b/src/views/map/dialog/peoplePositionOne.vue
index b8c23ad..292b967 100644
--- a/src/views/map/dialog/peoplePositionOne.vue
+++ b/src/views/map/dialog/peoplePositionOne.vue
@@ -6,7 +6,7 @@
     <table class="table-ui">
       <tr>
         <td class="bbg-transparent">姓名</td>
-        <td >{{ info?info.NAME:''  }}</td>
+        <td >{{ info?info.NAME:'' }}</td>
       </tr>
       <tr>
         <td class="bbg-transparent">工号</td>
@@ -65,7 +65,7 @@ export default {
       default() {
         return ''
       }
-    },
+    }
   },
   data() {
     return {
diff --git a/src/views/map/dialog/temperaturestation.vue b/src/views/map/dialog/temperaturestation.vue
index 29342b9..8c93751 100644
--- a/src/views/map/dialog/temperaturestation.vue
+++ b/src/views/map/dialog/temperaturestation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container print-work">
     <div class="level-title">
-      <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}</h1>
+      <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}</h1>
     </div>
     <div style="display: flex">
       <div id="main4"/>
@@ -32,7 +32,7 @@ import * as echarts from 'echarts'
 
 let myChart4 = null
 let myChart5 = null
-let myChart6 = null
+const myChart6 = null
 export default {
   props: {
     id: {
@@ -46,12 +46,12 @@ export default {
       default() {
         return ''
       }
-    },
+    }
   },
   data() {
     return {
       config: config,
-      info: {},
+      info: {}
     }
   },
   mounted() {
@@ -73,7 +73,7 @@ export default {
         '/map/getById',
         {
           id: this.id,
-          TYPE: this.type,
+          TYPE: this.type
         }
       ).then((data) => {
         this.listLoading = false
@@ -96,7 +96,7 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         series: {
@@ -123,60 +123,60 @@ export default {
           axisTick: {
             show: true,
             splitNumber: 5,
-            lineStyle:{
-              color:'#fff'
+            lineStyle: {
+              color: '#fff'
             }
           },
           splitLine: {
             length: 10,
             lineStyle: {
               width: 5,
-              color:'#fff'
+              color: '#fff'
             }
           },
           axisLabel: {
             formatter: function(e) {
-              switch (e + "") {
-                case "0":
-                  return "北";
-                case "45":
-                  return "东北";
-                case "135":
-                  return "东南";
-                case "225":
-                  return "西南"
-                case "315":
-                  return "西北";
-                case "360":
-                  return "北";
-                case "180":
-                  return "南";
-                case "90":
-                  return "东";
-                case "270":
-                  return "西";
+              switch (e + '') {
+                case '0':
+                  return '北'
+                case '45':
+                  return '东北'
+                case '135':
+                  return '东南'
+                case '225':
+                  return '西南'
+                case '315':
+                  return '西北'
+                case '360':
+                  return '北'
+                case '180':
+                  return '南'
+                case '90':
+                  return '东'
+                case '270':
+                  return '西'
                 default:
-                  return e;
+                  return e
               }
             },
             distance: -60,
             textStyle: {
               fontSize: 14,
-              fontWeight: "",
-              color:'#fff'
+              fontWeight: '',
+              color: '#fff'
             }
           },
           pointer: {
             show: true,
-            length:'80%',
-            width:5
+            length: '80%',
+            width: 5
           },
           detail: {
             formatter: function(param) {
-              var level = '';
-              if (param > 0 && param < 90){
+              var level = ''
+              if (param > 0 && param < 90) {
                 level = '东北'
-              } else if (param > 90 && param < 180){
+              } else if (param > 90 && param < 180) {
                 level = '东南'
               } else if (param > 180 && param < 270) {
                 level = '西南'
@@ -191,45 +191,44 @@ export default {
               } else if (param == 180) {
                 level = '正南'
               }
-              return "当前风向:"+level + "(" + param + "°)";
+              return '当前风向:' + level + '(' + param + '°)'
             },
             offsetCenter: [0, 190],
             textStyle: {
               fontSize: 14,
-              color:'#fff'
+              color: '#fff'
             }
           },
           data: [data.pd.WINDDIRECTION]
         }
-      };
+      }
       myChart4.setOption(option)
     },
     initEcharts2(data) {
       myChart5 = echarts.init(document.querySelector('#main5'))
-      var value = data.pd.TEMPERATURE;
-      var kd = [];
-// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
+      var value = data.pd.TEMPERATURE
+      var kd = []
+      // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
       for (var i = 0, len = 130; i <= len; i++) {
         if (i > 100 || i < 30) {
           kd.push('0')
         } else {
           if (i % 5 === 0) {
-            kd.push('5');
+            kd.push('5')
           } else {
-            kd.push('3');
+            kd.push('3')
           }
         }
-
       }
       // console.log(kd)
-// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
+      // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
       function getData(value) {
-        return [Number(value) + 30];
+        return [Number(value) + 30]
       }
       console.log(getData(value))
-      var data = getData(value + 30);
-      var mercuryColor = '#fd4d49';
-      var borderColor = '#fd4d49';
+      var data = getData(value + 30)
+      var mercuryColor = '#fd4d49'
+      var borderColor = '#fd4d49'
 
       const option = {
         title: {
@@ -238,18 +237,18 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         yAxis: [{
           show: false,
           min: 0,
-          max: 130,
+          max: 130
         }, {
           show: false,
           data: [],
           min: 0,
-          max: 130,
+          max: 130
         }],
         xAxis: [{
           show: false,
@@ -263,7 +262,7 @@ export default {
         }, {
           show: false,
           min: -110,
-          max: 100,
+          max: 100
 
         }],
         series: [{
@@ -276,7 +275,7 @@ export default {
           itemStyle: {
             normal: {
               color: mercuryColor,
-              barBorderRadius: 0,
+              barBorderRadius: 0
             }
           },
           label: {
@@ -285,11 +284,11 @@ export default {
               position: 'top',
               formatter: function(param) {
                 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
-                return (((param.value * 100) - (30 * 100)) / 100) + '°C';
+                return (((param.value * 100) - (30 * 100)) / 100) + '°C'
               },
               textStyle: {
                 color: '#ccc',
-                fontSize: '10',
+                fontSize: '10'
               }
             }
           },
@@ -304,7 +303,7 @@ export default {
           itemStyle: {
             normal: {
               color: '#ffffff',
-              barBorderRadius: 50,
+              barBorderRadius: 50
             }
           },
           z: 1
@@ -318,7 +317,7 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              barBorderRadius: 50,
+              barBorderRadius: 50
             }
           },
           z: 0
@@ -332,7 +331,7 @@ export default {
           itemStyle: {
             normal: {
               color: mercuryColor,
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 2
@@ -346,7 +345,7 @@ export default {
           itemStyle: {
             normal: {
               color: '#ffffff',
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 1
@@ -360,7 +359,7 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 0
@@ -379,12 +378,12 @@ export default {
               formatter: function(params) {
                 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
                 if (params.dataIndex > 100 || params.dataIndex < 30) {
-                  return '';
+                  return ''
                 } else {
                   if (params.dataIndex % 5 === 0) {
-                    return params.dataIndex - 30;
+                    return params.dataIndex - 30
                   } else {
-                    return '';
+                    return ''
                   }
                 }
               }
@@ -396,12 +395,12 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              barBorderRadius: 10,
+              barBorderRadius: 10
             }
           },
           z: 0
         }]
-      };
+      }
       myChart5.setOption(option)
     },
     initEcharts3(data) {
@@ -414,7 +413,7 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         series: [
@@ -424,7 +423,7 @@ export default {
             min: 0,
             max: 30,
             splitNumber: 10,
-            center:['50%', '55%'],
+            center: ['50%', '55%'],
             radius: '73%',
             axisLine: {
               lineStyle: {
@@ -436,7 +435,7 @@ export default {
               distance: -20,
               length: 20,
               lineStyle: {
-                width:2,
+                width: 2,
                 color: '#0F2D5B'
               }
             },
@@ -465,7 +464,7 @@ export default {
             min: 0,
             max: 30,
             splitNumber: 10,
-            center:['50%', '55%'],
+            center: ['50%', '55%'],
             radius: '65%',
             axisLine: {
               lineStyle: {
@@ -481,17 +480,17 @@ export default {
             silent: true,
             pointer: {
               length: '85%',
-              width:4,
+              width: 4,
               itemStyle: {
                 color: 'inherit',
                 borderWidth: 1,
-                borderColor:'inherit', // '#0D3778',
+                borderColor: 'inherit', // '#0D3778',
                 shadowColor: 'inherit',
                 shadowBlur: 1
               }
             },
             axisTick: {
-              show:false,
+              show: false,
               distance: -20,
               length: 5,
               lineStyle: {
@@ -502,24 +501,24 @@ export default {
               distance: -20,
               length: 20,
               lineStyle: {
-                width:2,
+                width: 2,
                 color: '#0F2D5B'
               }
             },
             axisLabel: {
               show: false
             },
-            title: {                // 仪表盘标题。
-              show: true,             // 是否显示标题,默认 true。
-              offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
-              color: '#ccc',          // 文字的颜色,默认 #333。
-              fontSize: 15           // 文字的字体大小,默认 15。
+            title: { // 仪表盘标题。
+              show: true, // 是否显示标题,默认 true。
+              offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+              color: '#ccc', // 文字的颜色,默认 #333。
+              fontSize: 15 // 文字的字体大小,默认 15。
             },
             detail: {
               valueAnimation: true,
               offsetCenter: [0, '70%'],
               formatter: '{value}',
-              color: 'inherit',        // 文字的颜色,默认 #333。
+              color: 'inherit', // 文字的颜色,默认 #333。
               fontSize: 20
             },
             data: [{
diff --git a/src/views/map/dialog/video_play_cfd.vue b/src/views/map/dialog/video_play_cfd.vue
index 69812ca..0e79142 100644
--- a/src/views/map/dialog/video_play_cfd.vue
+++ b/src/views/map/dialog/video_play_cfd.vue
@@ -48,7 +48,7 @@ export default {
           // eslint-disable-next-line no-undef
           this.player = new Aliplayer({
             'id': 'aLiVideoPlayer',
-            'source': res.data.url? res.data.url.replace('http://192.168.0.253:83', 'http://60.2.209.238:8992/videoApi') : '',
+            'source': res.data.url ? res.data.url.replace('http://192.168.0.253:83', 'http://60.2.209.238:8992/videoApi') : '',
             'width': '100%',
             'height': '500px',
             'autoplay': true,
diff --git a/src/views/map/dialog/weatherstation.vue b/src/views/map/dialog/weatherstation.vue
index bacf71d..15f1de7 100644
--- a/src/views/map/dialog/weatherstation.vue
+++ b/src/views/map/dialog/weatherstation.vue
@@ -95,18 +95,17 @@ export default {
         this.info.TEMPERATURE = data.pd.TEMPERATURE || '-'
         this.info.WINDSPEED = data.pd.WINDSPEED || '-'
         this.info.WINDDIRECTION = data.pd.WINDDIRECTION || '-'
-        this.$nextTick(()=>{
-          if(data.pd.WINDDIRECTION != '-'){
+        this.$nextTick(() => {
+          if (data.pd.WINDDIRECTION != '-') {
             console.log(this.info.WINDDIRECTION)
             this.initEcharts1(data)
-            this.info.WINDDIRECTION =  this.calculateWindDirection(this.info.WINDDIRECTION)
+            this.info.WINDDIRECTION = this.calculateWindDirection(this.info.WINDDIRECTION)
             console.log(this.info.WINDDIRECTION)
           }
-          if(data.pd.TEMPERATURE != '-'){
+          if (data.pd.TEMPERATURE != '-') {
             this.initEcharts2(data)
           }
-          if(data.pd.WINDSPEED != '-'){
-
+          if (data.pd.WINDSPEED != '-') {
             this.initEcharts3(data)
           }
         })
diff --git a/src/views/map/dialog/windspeedstation.vue b/src/views/map/dialog/windspeedstation.vue
index 29342b9..8c93751 100644
--- a/src/views/map/dialog/windspeedstation.vue
+++ b/src/views/map/dialog/windspeedstation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container print-work">
     <div class="level-title">
-      <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}</h1>
+      <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}</h1>
     </div>
     <div style="display: flex">
       <div id="main4"/>
@@ -32,7 +32,7 @@ import * as echarts from 'echarts'
 
 let myChart4 = null
 let myChart5 = null
-let myChart6 = null
+const myChart6 = null
 export default {
   props: {
     id: {
@@ -46,12 +46,12 @@ export default {
       default() {
         return ''
       }
-    },
+    }
   },
   data() {
     return {
       config: config,
-      info: {},
+      info: {}
     }
   },
   mounted() {
@@ -73,7 +73,7 @@ export default {
         '/map/getById',
         {
           id: this.id,
-          TYPE: this.type,
+          TYPE: this.type
         }
       ).then((data) => {
         this.listLoading = false
@@ -96,7 +96,7 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         series: {
@@ -123,60 +123,60 @@ export default {
           axisTick: {
             show: true,
             splitNumber: 5,
-            lineStyle:{
-              color:'#fff'
+            lineStyle: {
+              color: '#fff'
             }
           },
           splitLine: {
             length: 10,
             lineStyle: {
               width: 5,
-              color:'#fff'
+              color: '#fff'
             }
           },
           axisLabel: {
             formatter: function(e) {
-              switch (e + "") {
-                case "0":
-                  return "北";
-                case "45":
-                  return "东北";
-                case "135":
-                  return "东南";
-                case "225":
-                  return "西南"
-                case "315":
-                  return "西北";
-                case "360":
-                  return "北";
-                case "180":
-                  return "南";
-                case "90":
-                  return "东";
-                case "270":
-                  return "西";
+              switch (e + '') {
+                case '0':
+                  return '北'
+                case '45':
+                  return '东北'
+                case '135':
+                  return '东南'
+                case '225':
+                  return '西南'
+                case '315':
+                  return '西北'
+                case '360':
+                  return '北'
+                case '180':
+                  return '南'
+                case '90':
+                  return '东'
+                case '270':
+                  return '西'
                 default:
-                  return e;
+                  return e
               }
             },
             distance: -60,
             textStyle: {
               fontSize: 14,
-              fontWeight: "",
-              color:'#fff'
+              fontWeight: '',
+              color: '#fff'
             }
           },
           pointer: {
             show: true,
-            length:'80%',
-            width:5
+            length: '80%',
+            width: 5
           },
           detail: {
             formatter: function(param) {
-              var level = '';
-              if (param > 0 && param < 90){
+              var level = ''
+              if (param > 0 && param < 90) {
                 level = '东北'
-              } else if (param > 90 && param < 180){
+              } else if (param > 90 && param < 180) {
                 level = '东南'
               } else if (param > 180 && param < 270) {
                 level = '西南'
@@ -191,45 +191,44 @@ export default {
               } else if (param == 180) {
                 level = '正南'
               }
-              return "当前风向:"+level + "(" + param + "°)";
+              return '当前风向:' + level + '(' + param + '°)'
             },
             offsetCenter: [0, 190],
             textStyle: {
               fontSize: 14,
-              color:'#fff'
+              color: '#fff'
             }
           },
           data: [data.pd.WINDDIRECTION]
         }
-      };
+      }
       myChart4.setOption(option)
     },
     initEcharts2(data) {
       myChart5 = echarts.init(document.querySelector('#main5'))
-      var value = data.pd.TEMPERATURE;
-      var kd = [];
-// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
+      var value = data.pd.TEMPERATURE
+      var kd = []
+      // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
       for (var i = 0, len = 130; i <= len; i++) {
         if (i > 100 || i < 30) {
           kd.push('0')
         } else {
           if (i % 5 === 0) {
-            kd.push('5');
+            kd.push('5')
           } else {
-            kd.push('3');
+            kd.push('3')
           }
         }
-
       }
       // console.log(kd)
-// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
+      // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
       function getData(value) {
-        return [Number(value) + 30];
+        return [Number(value) + 30]
       }
       console.log(getData(value))
-      var data = getData(value + 30);
-      var mercuryColor = '#fd4d49';
-      var borderColor = '#fd4d49';
+      var data = getData(value + 30)
+      var mercuryColor = '#fd4d49'
+      var borderColor = '#fd4d49'
 
       const option = {
         title: {
@@ -238,18 +237,18 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         yAxis: [{
           show: false,
           min: 0,
-          max: 130,
+          max: 130
         }, {
           show: false,
           data: [],
           min: 0,
-          max: 130,
+          max: 130
         }],
         xAxis: [{
           show: false,
@@ -263,7 +262,7 @@ export default {
         }, {
           show: false,
           min: -110,
-          max: 100,
+          max: 100
 
         }],
         series: [{
@@ -276,7 +275,7 @@ export default {
           itemStyle: {
             normal: {
               color: mercuryColor,
-              barBorderRadius: 0,
+              barBorderRadius: 0
             }
           },
           label: {
@@ -285,11 +284,11 @@ export default {
               position: 'top',
               formatter: function(param) {
                 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
-                return (((param.value * 100) - (30 * 100)) / 100) + '°C';
+                return (((param.value * 100) - (30 * 100)) / 100) + '°C'
               },
               textStyle: {
                 color: '#ccc',
-                fontSize: '10',
+                fontSize: '10'
               }
             }
           },
@@ -304,7 +303,7 @@ export default {
           itemStyle: {
             normal: {
               color: '#ffffff',
-              barBorderRadius: 50,
+              barBorderRadius: 50
             }
           },
           z: 1
@@ -318,7 +317,7 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              barBorderRadius: 50,
+              barBorderRadius: 50
             }
           },
           z: 0
@@ -332,7 +331,7 @@ export default {
           itemStyle: {
             normal: {
               color: mercuryColor,
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 2
@@ -346,7 +345,7 @@ export default {
           itemStyle: {
             normal: {
               color: '#ffffff',
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 1
@@ -360,7 +359,7 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              opacity: 1,
+              opacity: 1
             }
           },
           z: 0
@@ -379,12 +378,12 @@ export default {
               formatter: function(params) {
                 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
                 if (params.dataIndex > 100 || params.dataIndex < 30) {
-                  return '';
+                  return ''
                 } else {
                   if (params.dataIndex % 5 === 0) {
-                    return params.dataIndex - 30;
+                    return params.dataIndex - 30
                   } else {
-                    return '';
+                    return ''
                   }
                 }
               }
@@ -396,12 +395,12 @@ export default {
           itemStyle: {
             normal: {
               color: borderColor,
-              barBorderRadius: 10,
+              barBorderRadius: 10
             }
           },
           z: 0
         }]
-      };
+      }
       myChart5.setOption(option)
     },
     initEcharts3(data) {
@@ -414,7 +413,7 @@ export default {
           textStyle: {
             fontWeight: 'normal',
             fontSize: 16,
-            color: "#fff"
+            color: '#fff'
           }
         },
         series: [
@@ -424,7 +423,7 @@ export default {
             min: 0,
             max: 30,
             splitNumber: 10,
-            center:['50%', '55%'],
+            center: ['50%', '55%'],
             radius: '73%',
             axisLine: {
               lineStyle: {
@@ -436,7 +435,7 @@ export default {
               distance: -20,
               length: 20,
               lineStyle: {
-                width:2,
+                width: 2,
                 color: '#0F2D5B'
               }
             },
@@ -465,7 +464,7 @@ export default {
             min: 0,
             max: 30,
             splitNumber: 10,
-            center:['50%', '55%'],
+            center: ['50%', '55%'],
             radius: '65%',
             axisLine: {
               lineStyle: {
@@ -481,17 +480,17 @@ export default {
             silent: true,
             pointer: {
               length: '85%',
-              width:4,
+              width: 4,
               itemStyle: {
                 color: 'inherit',
                 borderWidth: 1,
-                borderColor:'inherit', // '#0D3778',
+                borderColor: 'inherit', // '#0D3778',
                 shadowColor: 'inherit',
                 shadowBlur: 1
               }
             },
             axisTick: {
-              show:false,
+              show: false,
               distance: -20,
               length: 5,
               lineStyle: {
@@ -502,24 +501,24 @@ export default {
               distance: -20,
               length: 20,
               lineStyle: {
-                width:2,
+                width: 2,
                 color: '#0F2D5B'
               }
             },
             axisLabel: {
               show: false
             },
-            title: {                // 仪表盘标题。
-              show: true,             // 是否显示标题,默认 true。
-              offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
-              color: '#ccc',          // 文字的颜色,默认 #333。
-              fontSize: 15           // 文字的字体大小,默认 15。
+            title: { // 仪表盘标题。
+              show: true, // 是否显示标题,默认 true。
+              offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+              color: '#ccc', // 文字的颜色,默认 #333。
+              fontSize: 15 // 文字的字体大小,默认 15。
             },
             detail: {
               valueAnimation: true,
               offsetCenter: [0, '70%'],
               formatter: '{value}',
-              color: 'inherit',        // 文字的颜色,默认 #333。
+              color: 'inherit', // 文字的颜色,默认 #333。
               fontSize: 20
             },
             data: [{
diff --git a/src/views/map/dialog/xfControl.vue b/src/views/map/dialog/xfControl.vue
index 7dd8aa7..6e965b9 100644
--- a/src/views/map/dialog/xfControl.vue
+++ b/src/views/map/dialog/xfControl.vue
@@ -47,8 +47,8 @@
       </div>
       <el-carousel :interval="4000" type="card" height="200px">
         <el-carousel-item v-for="(image, index) in images" :key="index">
-          <img v-if="gangkou === '00004'" v-viewer :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
-          <img v-else v-viewer :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
+          <img v-viewer v-if="gangkou === '00004'" :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
+          <img v-viewer v-else :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
         </el-carousel-item>
       </el-carousel>
     </div>
@@ -109,8 +109,8 @@
       </div>
       <el-carousel :interval="4000" type="card" height="200px">
         <el-carousel-item v-for="(image, index) in images" :key="index">
-          <img v-if="gangkou === '00004'" v-viewer :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
-          <img v-else v-viewer :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
+          <img v-viewer v-if="gangkou === '00004'" :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
+          <img v-viewer v-else :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
         </el-carousel-item>
       </el-carousel>
     </div>

From afa82bcd14b6a8bc763070e9781250a85eaaa7fd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 31 Jan 2024 14:37:02 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?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/xgf/peopleList/components/list.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue
index 46aec29..03a58ef 100644
--- a/src/views/xgf/peopleList/components/list.vue
+++ b/src/views/xgf/peopleList/components/list.vue
@@ -42,8 +42,8 @@
       <el-table-column label="操作" align="center" width="350">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
           <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>

From 6e151129c595e103f0687a00ac0d43423069ebd4 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Wed, 31 Jan 2024 14:56:46 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=9B=B9=E5=A6=83=E7=94=B8=E5=AE=9E?=
 =?UTF-8?q?=E4=B8=9A=E3=80=81=E6=9B=B9=E7=85=A4=E7=82=AD=E3=80=81=E6=B2=A7?=
 =?UTF-8?q?=E5=B7=9E=E7=9F=BF=E7=9F=B3=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=8F=91=E8=B5=B7=E5=A2=9E=E5=8A=A0=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E5=91=98=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E5=AF=B9=E5=BA=94=E5=85=AC=E5=8F=B8=E5=92=8C=E7=A7=A6?=
 =?UTF-8?q?=E6=B8=AF=E4=BA=BA=E5=91=98=E5=8F=AF=E4=BB=A5=E6=98=AF=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/components/add.vue             | 60 ++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue
index 76bede6..2f76f94 100644
--- a/src/views/safetyenvironmental/inspection/components/add.vue
+++ b/src/views/safetyenvironmental/inspection/components/add.vue
@@ -22,6 +22,7 @@
                 :options="treeData"
                 :props="defaultProps"
                 v-model="form.INSPECTED_DEPARTMENT_ID"
+                @change="changeCurrentDeptId(form.INSPECTED_DEPARTMENT_ID)"
                 placeholder="请选择被检查单位"
                 style="width: 300px" />
             </el-form-item>
@@ -68,8 +69,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-divider content-position="left">检查人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider>
-        <el-form-item v-for="(item,index) in form.inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'">
+        <el-divider v-if="CURRENT_INSPECTED_DEPARTMENT_ID !== null && CURRENT_INSPECTED_DEPARTMENT_ID !== '' " content-position="left">检查人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider>
+        <el-form-item v-if="CURRENT_INSPECTED_DEPARTMENT_ID !== null && CURRENT_INSPECTED_DEPARTMENT_ID !== '' " v-for="(item,index) in form.inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'">
           <div class="uo-flex">
             <el-row :gutter="20">
               <el-col :span="12">
@@ -82,7 +83,8 @@
                     v-model="item.INSPECTION_DEPARTMENT_ID"
                     placeholder="请选择检查人员部门"
                     style="width: 300px"
-                    @change="updateInspecteDept(item.INSPECTION_DEPARTMENT_ID,index)"/>
+                    @visible-change=""
+                    @change="updateInspecteDept(item.INSPECTION_DEPARTMENT_ID,index,item)"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11">
@@ -348,6 +350,7 @@ export default {
       },
       pd: [],
       switchInspectionType: 'select',
+      CURRENT_INSPECTED_DEPARTMENT_ID: '', //当前被检查单位
       form: {
         INSPECTION_SUBJECT: '', // 检查标题
         INSPECTION_SOURCE: '4', // 检查来源（4-监管端 5-企业端）
@@ -480,6 +483,12 @@ export default {
     handleAdd() {
       this.dialogType = 'add'
     },
+    changeCurrentDeptId(id) {
+      this.form.inspectorList = []
+      this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' })
+      this.INSPECTOR_List.push([])
+      this.CURRENT_INSPECTED_DEPARTMENT_ID = id
+    },
     changeSwitch(type) {
       if (type === 'InspectionType') {
         this.form.INSPECTION_TYPE = ''
@@ -498,10 +507,46 @@ export default {
       this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' })
       this.INSPECTOR_List.push([])
     },
-    updateInspecteDept(DEPARTMENT_ID, i) {
-      this.form.inspectorList[i].INSPECTION_USER_ID = ''
-      this.form.inspectorList[i].USER_SIDE = ''
-      this.getInspectorList(DEPARTMENT_ID, i)
+    updateInspecteDept(id,i,item) {
+      // 获取人员列表
+      if (id) {
+        requestFN(
+          '/corpDepartment/checkDept',
+          {
+            DEPARTMENT_ID: this.CURRENT_INSPECTED_DEPARTMENT_ID,
+            id: id
+          }
+        ).then((data) => {
+          if (data.message!=null) {
+            this.INSPECTION_DEPARTMENT_ID = ''
+            this.INSPECTOR_List = []
+            this.INSPECTION_USER_ID = ''
+            this.$message.error(data.message)
+          }else {
+            // 获取人员列表
+            if (id) {
+              requestFN(
+                '/user/listAllManageAndCorp',
+                {
+                  DEPARTMENT_ID: id
+                }
+              ).then((data) => {
+                this.INSPECTOR_List[i] = data.userList
+                this.$forceUpdate()
+              }).catch((e) => {
+              })
+            }
+            this.form.inspectorList[i].INSPECTION_USER_ID = ''
+            this.form.inspectorList[i].USER_SIDE = ''
+            this.$message.success('检查人员部门选择成功')
+            this.getInspectorList(DEPARTMENT_ID, i)
+          }
+        }).catch((e) => {
+        })
+      }
+      this.form.inspectorList = []
+      this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE })
+      this.INSPECTOR_List.push([])
     },
     // 获取人员列表
     getInspectorList(DEPARTMENT_ID, i) {
@@ -509,6 +554,7 @@ export default {
         requestFN(
           '/user/listAllManageAndCorp',
           {
+            CURRENT_INSPECTED_DEPARTMENT_ID: this.CURRENT_INSPECTED_DEPARTMENT_ID,
             DEPARTMENT_ID: DEPARTMENT_ID,
             NOMAIN: '1'
           }