1.移植门口门禁系统和

2.升级js
3.还原安全环保检查

src/views/corpInfo/user/components/list.vue

@@ -798,7 +798,7 @@ export default {
           SHIFTDUTYTWO: this.SHIFTDUTYTWO,
           IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
           USER_ID: this.USER_ID,
-          ISPUSH:'2'
+          ISPUSH: '2'
         }
       ).then((data) => {
         this.listLoading = false

src/views/map/components/menjin2.vue

@@ -0,0 +1,470 @@
+<template>
+  <div class="menjin">
+    <div class="block1">
+      <layout-title title="设备在线情况"/>
+      <div class="options">
+        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
+          <div class="title active">{{ item.title }}</div>
+          <div class="circular">
+            <img :src="item.img" alt="">
+          </div>
+          <div class="label">
+            {{ item.label1 }}：<count-to :start-val="0" :end-val="item.count1" :duration="3600"/>
+          </div>
+          <div v-if="item.label2" class="label">
+            {{ item.label2 }}：<count-to :start-val="0" :end-val="item.count2" :duration="3600"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="block4">
+      <layout-title title="区域进出记录"/>
+      <div class="content">
+        <div class="options">
+          <div
+            v-for="(item,index) in block4OptionsTabs"
+            :key="index"
+            :class="['title', {active:index === block4OptionsIndex}]"
+            @click="block4OptionsClick(index)"
+          >
+            {{ item }}
+          </div>
+        </div>
+        <div id="main1"/>
+      </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">{{ block3OptionsIndex===0 ? '人员':'车牌' }}</div>
+            <div class="td">时间</div>
+            <div class="td">状态</div>
+          </div>
+          <div v-for="(item,index) in block3List" :key="index" class="tr">
+            <div class="td line1">{{ item.DOORNAME }}</div>
+            <div class="td">{{ item.NAME }}</div>
+            <div class="td line1">{{ item.TIME.substring(11) }}</div>
+            <div class="td">{{ item.STATUS }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import layoutTitle from './title.vue'
+import CountTo from 'vue-count-to'
+import { requestFN } from '@/utils/request'
+import * as echarts from 'echarts'
+
+let myChart1
+export default {
+  components: {
+    layoutTitle,
+    CountTo
+  },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    },
+    area: {
+      type: String,
+      default: ''
+    },
+    gangkou: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      block1OptionsList: [
+        {
+          title: '人员闸机数',
+          img: require('../../../assets/map/menjin/ico1.png'),
+          label1: '在线数',
+          count1: 0
+          // label2: '离线数',
+          // count2: 0
+        },
+        {
+          title: '车辆闸机数',
+          img: require('../../../assets/map/menjin/ico2.png'),
+          label1: '在线数',
+          count1: 0
+          // label2: '离线数',
+          // count2: 0
+        },
+        {
+          title: '摄像头数',
+          img: require('../../../assets/map/menjin/ico3.png'),
+          label1: '摄像头数',
+          count1: 0
+        }
+      ],
+      block3OptionsList: ['人员闸机', '车辆闸机'],
+      block3OptionsIndex: 1,
+      block2List: [],
+      block3List: [],
+      block4OptionsTabs: ['人员', '车辆'],
+      block4OptionsIndex: 0,
+      block4OptionsList: []
+    }
+  },
+  mounted() {
+    this.getMachineCount() // 设备数
+    this.getEntryAndExitCount()// echar
+    this.listPerpleCarGateMachine('1') // 进出记录
+    window.onresize = function() {
+      myChart1 && myChart1.resize()
+    }
+  },
+  destroyed() {
+    myChart1 = null
+  },
+  methods: {
+    getEntryAndExitCount() {
+      requestFN(
+        '/mkmjRelation/getAllCarAndPeopleInfoCountByArea',
+        { CORPINFO_ID: this.corpInfoId }
+      ).then((data) => {
+        this.block4OptionsList = data.varList
+        this.initEcharts1(this.block4OptionsList)
+      }).catch((e) => {
+      })
+    },
+    initEcharts1(data) {
+      const xAxisData = []
+      const entryData = []
+      const exitData = []
+      for (let i = 0; i < data.length; i++) {
+        if (this.block4OptionsIndex === 0) {
+          if (data[i].TYPE === 'person') {
+            xAxisData.push(data[i].AREA_NAME)
+            console.log(data[i])
+            entryData.push(data[i].INPERSONCOUNT)
+            exitData.push(data[i].OUTPERSONCOUNT)
+          }
+        }
+        if (this.block4OptionsIndex === 1) {
+          if (data[i].TYPE === 'car') {
+            xAxisData.push(data[i].AREA_NAME)
+            console.log(data[i])
+            entryData.push(data[i].INCARCOUNT)
+            exitData.push(data[i].OUTCARCOUNT)
+          }
+        }
+      }
+      myChart1 && myChart1.dispose()
+      myChart1 = echarts.init(document.querySelector('#main1'))
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          left: '2%',
+          right: '4%',
+          bottom: '8%',
+          top: '16%',
+          containLabel: true
+        },
+        legend: {
+          data: ['进', '出'],
+          right: 10,
+          top: 12,
+          textStyle: {
+            color: '#fff'
+          },
+          itemWidth: 12,
+          itemHeight: 10
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxisData,
+          axisLine: {
+            lineStyle: {
+              color: 'white'
+            }
+          },
+          axisLabel: {
+            textStyle: {
+              fontFamily: 'Microsoft YaHei'
+            }
+          }
+        },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: 'white'
+            }
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: 'rgba(255,255,255,0.3)'
+            }
+          },
+          axisLabel: {}
+        },
+        series: [{
+          name: '进',
+          type: 'bar',
+          barWidth: '15%',
+          itemStyle: {
+            normal: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                offset: 0,
+                color: '#8bd46e'
+              }, {
+                offset: 1,
+                color: '#09bcb7'
+              }]),
+              barBorderRadius: 12
+            }
+          },
+          data: entryData
+        },
+        {
+          name: '出',
+          type: 'bar',
+          barWidth: '15%',
+          itemStyle: {
+            normal: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                offset: 0,
+                color: '#fccb05'
+              }, {
+                offset: 1,
+                color: '#f5804d'
+              }]),
+              barBorderRadius: 11
+            }
+
+          },
+          data: exitData
+        }
+        ]
+      }
+      myChart1.setOption(option)
+    },
+    block4OptionsClick(index) {
+      console.log(index)
+      this.block4OptionsIndex = index
+      this.initEcharts1(this.block4OptionsList)
+    },
+    getMachineCount() {
+      requestFN(
+        '/map/getDoorCount',
+        {
+          CORPINFO_ID: this.corpInfoId
+        }
+      ).then((data) => {
+        this.block1OptionsList[0].count1 = data.data.personMachineCount
+        this.block1OptionsList[1].count1 = data.data.carMachineCount
+        this.block1OptionsList[2].count1 = data.data.cameraCount
+      }).catch((e) => {
+      })
+    },
+
+    listPerpleCarGateMachine(type) {
+      requestFN(
+        '/map/getDoorRecord',
+        {
+          TYPE: type,
+          CORPINFO_ID: this.corpInfoId
+        }
+      ).then((data) => {
+        this.block3List = data.varList.slice(0, 8)
+      }).catch((e) => {
+      })
+    },
+    block3OptionsClick(index) {
+      this.block3OptionsIndex = index
+      this.listPerpleCarGateMachine(index)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.menjin {
+  .title {
+    background-image: url("../../../assets/map/menjin/title_on.png");
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    width: 113px;
+    height: 26px;
+    font-size: 14px;
+    line-height: 26px;
+    text-align: center;
+    color: #fff;
+
+    &.active {
+      background-image: url("../../../assets/map/menjin/title.png");
+    }
+  }
+
+  .block1 {
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 15px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .circular {
+          margin-top: 5px;
+          background-image: url("../../../assets/map/menjin/img1.png");
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
+          width: 50px;
+          height: 50px;
+          text-align: center;
+          padding-top: 13px;
+
+          img {
+            width: 30px;
+            height: 26px;
+            animation: scale 2s infinite;
+          }
+        }
+
+        .label {
+          margin-top: 5px;
+          font-size: 12px;
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  .block4 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+      #main1{
+        margin-top: 10px;
+        width: 100%;
+        height: 200px;
+      }
+    }
+  }
+
+  .block3 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+
+            &:nth-child(2) {
+              flex-basis: 20%;
+            }
+
+            &.green {
+              color: #7ccf41;
+            }
+
+            &.yellow {
+              color: #ffcb05;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@keyframes scale {
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(0.8);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+.line1 {
+  width: 150px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

src/views/map/components/menjin_index.vue

@@ -0,0 +1,207 @@
+<template>
+  <div>
+    {{ corpInfoId }}
+    {{ area }}
+    {{ gangkou }}
+    <menjin2 v-if="corpInfoId" :corp-info-id="corpInfoId" :area="area" :gangkou="gangkou"/>
+    <menjin v-else :corp-info-id="corpInfoId" :area="area" :gangkou="gangkou"/>
+  </div>
+</template>
+
+<script>
+import menjin from './menjin'
+import menjin2 from './menjin2'
+export default {
+  components: {
+    menjin,
+    menjin2
+  },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    },
+    area: {
+      type: String,
+      default: ''
+    },
+    gangkou: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.menjin {
+  .title {
+    background-image: url("../../../assets/map/menjin/title_on.png");
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    width: 113px;
+    height: 26px;
+    font-size: 14px;
+    line-height: 26px;
+    text-align: center;
+    color: #fff;
+
+    &.active {
+      background-image: url("../../../assets/map/menjin/title.png");
+    }
+  }
+
+  .block1 {
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 15px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        display: flex;
+        align-items: center;
+        .img{
+          width: 81px;
+          height: 93px;
+          img{
+            width: 100%;
+            height: 100%;
+          }
+        }
+        .info{
+          margin-left: 10px;
+          font-size: 14px;
+          color: #fff;
+          div{
+            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;
+      #main1{
+        width: 100%;
+        height: 300px;
+      }
+    }
+  }
+
+  .block3 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+        .scroll {
+          max-height: 200px;
+          overflow-y: auto;
+
+          &::-webkit-scrollbar {
+            width: 5px;
+          }
+
+          &::-webkit-scrollbar-thumb {
+            border-radius: 5px;
+            background: rgba(2, 30, 81, 0.851);
+          }
+
+          &::-webkit-scrollbar-track {
+            border-radius: 5px;
+            background: rgba(255, 255, 255, 0.1);
+          }
+
+          .tr {
+            &:nth-child(odd) {
+              background-color: transparent;
+            }
+          }
+        }
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+
+            &:nth-child(2) {
+              flex-basis: 20%;
+            }
+
+            &:nth-child(3) {
+              flex: none;
+              flex-basis: 50px;
+            }
+
+            &.green {
+              color: #7ccf41;
+            }
+
+            &.yellow {
+              color: #ffcb05;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@keyframes scale {
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(0.8);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+.line1 {
+  width: 150px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

src/views/map/dialog/index.vue

@@ -9,7 +9,15 @@
       <windspeedstation v-if="type === '2da29f00852a4653ba3e760b9de57412'" :id="id" :type="type" :gangkou="gangkou"/>
       <xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
       <xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
-      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/>
+      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'|| type ==='PERSON_MACHINE'|| type ==='CAR_MACHINE' "
+                       :id="id"
+                       :type="type"
+                       :gangkou="gangkou"
+                       :corp-id="corpInfoId"
+                       :gate-video-id="GATE_VIDEO_ID"
+                       :code = "code"
+                       :video-type="videoType"
+                       :name = "name" />
       <mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :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"/>
@@ -180,6 +188,14 @@ export default {
     infoname: {
       type: String,
       default: ''
+    },
+    videoType: {
+      type: String,
+      default: ''
+    },
+    code: {
+      type: String,
+      default: ''
     }
   },
   methods: {

src/views/map/dialog/mkGateMachine.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container print-work" style="width: 100%">
+  <div v-if="corpId == '035958e685cf4850bc40151c5e0617a6' " class="app-container print-work">
-    <div v-if= "type !== 'CAMERA'" class="level-title">
+    <div v-if= "type !== 'CAMERA'" class="level-title">\
       <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
     </div>
     <table v-if= "type !== 'CAMERA'" class="table-ui">
@@ -55,14 +55,89 @@
       <video-play v-if="type === 'CAMERA' && info.GATEVIDEO_ID" :id="info.GATEVIDEO_ID" :type="type" :gangkou="gangkou"/>
     </div>
   </div>
+  <div v-else class="app-container print-work">
+    <div v-if= "type !== 'CAMERA'" class="level-title">
+      <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
+    </div>
+    <table v-for="(item,index) in varList" v-if= "type !== 'CAMERA'" :key="index" class="table-ui">
+      <tr>
+        <td class="bbg-transparent">闸机名称</td>
+        <td colspan="5">{{ item.GATE_NAME }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">今日进</td>
+        <td width="80px">{{ item.CAR_IN }}</td>
+        <td class="bbg-transparent">今日出</td>
+        <td width="80px">{{ item.CAR_OUT }}</td>
+        <td class="bbg-transparent">当前滞留</td>
+        <td width="80px">{{ item.CAR_IN - item.CAR_OUT }}</td>
+      </tr>
+    </table>
+    <table v-if= "type != 'CAMERA'" class="table-ui">
+      <tr v-if="carRecordAllList != null && carRecordAllList.length > 0">
+        <td colspan="6">
+          <table class="table-ui">
+            <tr>
+              <td class="bbg-transparent">车牌</td>
+              <td class="bbg-transparent">时间</td>
+              <td class="bbg-transparent">闸机</td>
+              <td class="bbg-transparent">状态</td>
+            </tr>
+            <tr v-for="(item,index) in carRecordAllList" :key="index">
+              <td>{{ item.LICENSE_PLATE }}</td>
+              <td>{{ item.TIME }}</td>
+              <td>{{ item.COMING_REASON }}</td>
+              <td>{{ item.STATE == '0' ? '进港': '出港' }}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr v-if="recordAllList != null && recordAllList.length > 0">
+        <td colspan="6">
+          <table class="table-ui">
+            <tr>
+              <td>卡号</td>
+              <td>人员姓名</td>
+              <td>刷卡时间</td>
+              <td>闸机</td>
+              <td>状态</td>
+            </tr>
+            <tr v-for="(item,index) in recordAllList" :key="index">
+              <td>{{ item.CARDTYPE }}</td>
+              <td>{{ item.USERNAME }}</td>
+              <td>{{ item.TIME }}</td>
+              <td>{{ item.EQUIPMENTNAME }}</td>
+              <td>
+                <span v-if="item.STATE == '0'">进</span>
+                <span v-if="item.STATE == '1'">出</span>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <div v-if= "type == 'CAMERA'" class="level-title">
+      <h1>摄像头名称：{{ name }}</h1>
+    </div>
+    <table v-if= "type == 'CAMERA'" class="table-ui">
+      <tr>
+        <td class="bbg-transparent">编码</td>
+        <td >{{ code }}</td>
+      </tr>
+    </table>
+    <div class="video">
+      <video-play-gate v-if="type === 'CAMERA' && code" :id="code" :type="videoType" :gangkou="gangkou"/>
+    </div>
+  </div>
 </template>
 
 <script>
 import { requestFN } from '@/utils/request'
 import moment from 'moment'
 import videoPlay from './video_play.vue'
+import videoPlayGate from './video_play_gate.vue'
 export default {
-  components: { videoPlay },
+  components: { videoPlay, videoPlayGate },
   props: {
     id: {
       type: String,
@@ -79,19 +154,53 @@ export default {
     gangkou: {
       type: String,
       default: ''
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    GATE_VIDEO_ID: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    code: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    videoType: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    name: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
     return {
       config: config,
       info: {},
-      recordAllList: []
+      recordAllList: [],
+      varList: [],
+      carRecordAllList: []
     }
   },
 
   created() {
+    if (this.type !== 'CAMERA') {
       this.getData()
       this.getListData()
+    }
   },
   methods: {
     formatDate(date, format) {
@@ -106,8 +215,10 @@ export default {
         '/map/getGatesInAndOutNumById',
         {
           GATE_AREA_ID: this.id,
+          GATE_VIDEO_ID: this.GATE_VIDEO_ID,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         Object.assign(this.info, data.pd)
@@ -117,6 +228,7 @@ export default {
           this.info.CAR_OUT = 0
           this.info.PERSON_IN = 0
           this.info.PERSON_OUT = 0
+          this.varList = data.pd.varList
           for (let i = 0; i < data.pd.varList.length; i++) {
             if (data.pd.varList[i].TYPE == 'CAR_IN') {
               this.info.CAR_IN = data.pd.varList[i].COUNT
@@ -132,6 +244,11 @@ export default {
             }
           }
         }
+        if (this.type == 'CAMERA') {
+          Object.assign(this.info, data.pd.info)
+          this.info.CODE = data.pd.video.EXTERNALINDEXCODE
+          this.info.VIDEONAME = data.pd.video.NAME
+        }
 
         this.$forceUpdate()
       }).catch((e) => {
@@ -142,11 +259,15 @@ export default {
         '/map/getGatesInAndOutListById?showCount=10000&currentPage=1',
         {
           GATE_AREA_ID: this.id,
+          GATE_VIDEO_ID: this.GATE_VIDEO_ID,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         this.recordAllList = data.recordAllList
+        this.carRecordAllList = data.carRecordAllList
+        console.info( this.CODE )
         this.$forceUpdate()
       }).catch((e) => {
       })

src/views/map/dialog/video_play_gate.vue

@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <div id="aLiVideoPlayer" class="prism-player"/>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    gangkou: {
+      type: String,
+      default: ''
+    },
+    requestUrl: {
+      type: String,
+      default: '/mkmjGateVideo/goAllVideo'
+    }
+  },
+  data() {
+    return {
+      hls: false,
+      player: null,
+      url: ''
+    }
+  },
+  beforeDestroy() {
+    this.player && this.player.dispose()
+  },
+  created() {
+    this.showVideo()
+  },
+  methods: {
+    showVideo() {
+      requestFN(
+        '/platform/door/video/getHlsPath',
+        {
+          INDEXCODE: this.id
+        }
+      ).then((res) => {
+        // for (let i = 0; i < data.videoList.length; i++) {
+        // if (data.videoList[0].HLSVIDEOURL) {
+        //   this.url = data.videoList[0].GBSVIDEOURL
+        //   this.hls = true
+        // } else {
+        this.hls = false
+        this.$nextTick(() => {
+          // eslint-disable-next-line no-undef
+          this.player = new Aliplayer({
+            'id': 'aLiVideoPlayer',
+            'source': res.data.url,
+            '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>

src/views/map/index.vue

@@ -215,6 +215,8 @@
       :corp-info-id="dialog.corpInfoId"
       :gangkou="gangkouActive"
       :infoname="dialog.infoname"
+      :code="dialog.code"
+      :video-type="dialog.video_type"
     />
   </div>
 </template>
@@ -229,7 +231,7 @@ import { requestFN } from '@/utils/request'
 import gangkouIndex from './components/gangkou_index.vue'
 import fengongsiIndex from './components/fengongsi_index.vue'
 import caofeidianIndex from './components/caofeidian_index.vue'
-import menjin from './components/menjin.vue'
+import menjin from './components/menjin_index.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import xiaofang from './components/xiaofang.vue'
 import anquan from './components/anquan.vue'
@@ -415,7 +417,7 @@ export default {
               img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
               checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
               type: 'PERSON',
-              containAuthorization: [],
+              containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
               eliminateAuthorization: []
             },
             {
@@ -425,9 +427,29 @@ export default {
               img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
               checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
               type: 'CAR',
-              containAuthorization: [],
+              containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
               eliminateAuthorization: []
             },
+            {
+              label: '人员闸机', // 杂货公司的人员
+              dialog_width: '800px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              type: 'PERSON_MACHINE',
+              containAuthorization: ['allCorp'],
+              eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
+            },
+            {
+              label: '车辆闸机', // 杂货公司的车辆
+              dialog_width: '600px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
+              type: 'CAR_MACHINE',
+              containAuthorization: ['allCorp'],
+              eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
+            },
             {
               label: '摄像头',
               dialog_width: '600px',
@@ -1194,7 +1216,7 @@ export default {
           }
           const point_type = pick.id._monitoItems.data.point_type
           if (point_type.indexOf('标记点') !== -1) {
-            const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = pick.id._monitoItems.data
+            const { label, point_type, data_id, corpInfoId, dialog_width, infoname, code, video_type, name } = pick.id._monitoItems.data
             this.dialog.visible = true
             this.dialog.title = label
             this.dialog.type = point_type.substring(3)
@@ -1202,6 +1224,9 @@ export default {
             this.dialog.corpInfoId = corpInfoId
             this.dialog.infoname = infoname
             this.dialog.width = dialog_width || '50%'
+            this.dialog.code = code
+            this.dialog.video_type = video_type
+            this.dialog.name = name
           }
         } else {
           this.closeBubbles()
@@ -1781,7 +1806,9 @@ export default {
             }
           }
         }
-        if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') {
+        if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' &&
+          this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' &&
+          urlType === 'peoplePosition') {
           this.clearRYDWPoint('+/UwbBQ/')
           this.removeTrajectory()
         }
@@ -1819,12 +1846,23 @@ export default {
           this.cfdBottomOptionsList[pindex].list[index].check = true
           this.bottomOptionsList[pindex].list[index].check = false
         }
+        console.info('---------')
+        console.info('---------')
+        console.info(this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f')
+        console.info('---------')
+        console.info('---------')
 
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
-        } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') {
+        } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' &&
+            urlType === 'peoplePosition') {
           // websocket实时获取人员定位
+          console.info('Assssssss')
           this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26')
+        } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' && urlType === 'peoplePosition') {
+          // websocket实时获取人员定位
+          console.info('Assssssss')
+          this.initRYDWWebsocket('033549ed3bd648e49c8a65eb4993ec2f')
         } else {
           requestFN(
             pointUrl,
@@ -1837,6 +1875,7 @@ export default {
           ).then(async(data) => {
             const points = []
             const varList = this.filterNull(data.varList)
+            console.info(data)
             for (let i = 0; i < varList.length; i++) {
               const point = {}
               point.id = pindex + '_' + index + '_' + i
@@ -1879,6 +1918,7 @@ export default {
               }
               points.push(point)
             }
+            console.info(points)
             if (this.gangkouActive === '00004' && urlType === 'carPosition') {
               this.timerCfdCarDingwei()
               this.carLocArr = points
@@ -2717,6 +2757,8 @@ export default {
       if (containAuthorization.length === 0) return true
       if (containAuthorization.includes(CORP_INFO_ID)) {
         return true
+      } else if (containAuthorization.includes('allCorp') && CORP_INFO_ID) {
+        return true
       } else {
         return false
       }

src/views/map/js/dragentity.js

@@ -111,6 +111,37 @@ export default class DragEntity {
       }
     }
     if (value.point_type.indexOf('标记点') !== -1) {
+      if (value.label == '人员闸机') {
+        billboard = {
+          image: imgMap['img0_0' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      } else if (value.label == '车辆闸机') {
+        billboard = {
+          image: imgMap['img0_1' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      } else if (value.label == '摄像头') {
+        billboard = {
+          image: imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      } else {
         billboard = {
           image: imgMap['img' + value.icon_type],
           height: 36,
@@ -121,6 +152,7 @@ export default class DragEntity {
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
       }
+    }
     // 曹妃甸使用
     if (value.gangkou === '00004') {
       if (value.label === '人员定位') {

src/views/safetyenvironmental/archive/components/accept.vue

@@ -595,7 +595,7 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           requestFN(
-            '/safetyenvironmental/V2/finalcheck',
+            '/hidden/finalcheck',
             {
               HIDDEN_ID: this.HIDDEN_ID,
               FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR,

src/views/safetyenvironmental/inspected/components/list.vue

@@ -330,7 +330,7 @@ export default {
     hiddenCount(INSPECTION_ID) {
       this.listLoading = true
       requestFN(
-        '/safetyenvironmental/V2/hiddencount',
+        '/safetyenvironmentalexplain/hiddencount',
         {
           INSPECTION_ID: INSPECTION_ID
         }

src/views/safetyenvironmental/inspection/components/add.vue

@@ -96,7 +96,7 @@
               <el-col :span="11">
                 <el-form-item label="检查人员" prop="INSPECTION_USER_ID">
                   <el-select v-model="item.INSPECTION_USER_ID" clearable placeholder="请选择检查人员" @change="changeHiddenUserList">
-                    <el-option v-for="data in INSPECTED_SITEUSER_List" :key="data.USER_ID" :label="data.NAME" :value="data.NAME" />
+                    <el-option v-for="data in INSPECTOR_List[index]" :key="data.USER_ID" :label="data.NAME" :value="data.USER_ID" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -530,7 +530,7 @@ export default {
           this.INSPECTED_SITEUSER_List = []
         }
         if (newVal != null && newVal != '') {
-          this.getXgfUserList(newVal)
+          this.getUserList(newVal)
         }
       },
       immediate: false
@@ -600,7 +600,9 @@ export default {
     updateInspecteDept(DEPARTMENT_ID, i) {
       // this.form.inspectorList[i].INSPECTION_USER_ID = ''
       // this.getInspectorList(DEPARTMENT_ID, i)
-      this.getXgfUserList(DEPARTMENT_ID)
+      // this.getXgfUserList(DEPARTMENT_ID)
+      this.form.inspectorList[i].INSPECTION_USER_ID = ''
+      this.getInspectorList(DEPARTMENT_ID, i)
     },
     // 获取人员列表
     getInspectorList(DEPARTMENT_ID, i) {

static/bi/tree/index.html

@@ -16,7 +16,7 @@
 <script src="js/IndoorMap3d.js"></script>
 <script src="js/Theme.js"></script>
 <link href="css/indoor3D.css" rel="stylesheet">
-<script type="text/javascript" src="../js/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript" src="../js/pre-loader.js"></script>
 <!-- vue -->
 <script src="../js/vue.js"></script>

static/qrcode/views/bsbw/detail.html

@@ -71,7 +71,7 @@
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
  -->
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
 		<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
 		<script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/bsbw/part-detail.html

@@ -373,7 +373,7 @@
 <div style="padding: 0 20px;">
   <a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 </div>
-<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
 <script src="../../../bi/js/sweetalert.min.js"></script>
 <script type="text/javascript">

static/qrcode/views/bsbw/part-list.html

@@ -81,7 +81,7 @@
 		</div>
 
     <script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/bsbw/point-info.html

@@ -91,7 +91,7 @@
 
 
 <!--<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>-->
-<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
 <script src="../../../bi/js/sweetalert.min.js"></script>
 <script src="../../assets/js/vant.min.js"></script>

static/qrcode/views/bsbw/point_list.html

@@ -116,7 +116,7 @@
   </div>
 </div>
 </body>
-<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+<script type="text/javascript" src=".../../../bi/js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
 <script src="../../../bi/js/sweetalert.min.js"></script>
 <script src="../../assets/js/vant.min.js"></script>

static/qrcode/views/bsbw/record_list.html

@@ -119,7 +119,7 @@
 				</div>
 			</div>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/carscanregister.html

@@ -12,7 +12,7 @@
   <!--全局配置-->
   <script src="../../../config.js"></script>
   <script src="../../assets/js/vant.min.js"></script>
-  <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+  <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
   <style>
     .wrapper {
       display: flex;

static/qrcode/views/fxfb/detail.html

@@ -70,7 +70,7 @@
 		<div style="padding: 0 20px;">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/index.html

@@ -85,7 +85,7 @@
 				</ul>
 			</div>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 

static/qrcode/views/fxfb/outsidersscanregister.html

@@ -12,7 +12,7 @@
   <!--全局配置-->
   <script src="../../../config.js"></script>
   <script src="../../assets/js/vant.min.js"></script>
-  <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+  <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
   <style>
     .wrapper {
       display: flex;

static/qrcode/views/fxfb/part-detail.html

@@ -321,7 +321,7 @@
 		<div style="padding: 0 20px;">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/part-list.html

@@ -82,7 +82,7 @@
 
 
 <script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/record_list.html

@@ -60,7 +60,7 @@
 		<div style="padding: 0 20px;margin-top:20px">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
     <script src="../../../bi/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/success.html

@@ -49,7 +49,7 @@
   </div>
 </div>
 
-<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
 <script src="../../../bi/js/sweetalert.min.js"></script>
 <script src="../../../request.js"></script>