Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet

src/views/keyprojects/videomanager/components/video-list.vue

@@ -154,8 +154,8 @@
     <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" :show-close="false" title="视频" width="1200px">
       <!--      <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
       <div style="display: flex;flex-wrap: wrap;justify-content: space-between">
-        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
+        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 30%">
-          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
+          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="280" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
           <div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
         </div>
       </div>

src/views/map/components/menjin_old.vue

@@ -23,7 +23,7 @@
         </div>
       </div>
     </div>
-    <!-- <div class="block2">
+    <div class="block2">
       <layout-title title="口门区域"/>
       <div class="options">
         <div class="bg"/>
@@ -35,7 +35,7 @@
           </div>
         </div>
       </div>
-    </div> -->
+    </div>
     <div class="block3">
       <layout-title title="口门进出记录"/>
       <div class="content">
@@ -56,8 +56,8 @@
             <div class="td">时间</div>
             <div class="td">状态</div>
             <div class="td">闸机名称</div>
-            <!--<div v-if="block3OptionsIndex == 0" class="td">闸机名称</div>
+            <div v-if="block3OptionsIndex == 0" class="td">闸机名称</div>
-            <div v-if="block3OptionsIndex == 1" class="td">来港事由</div>-->
+            <div v-if="block3OptionsIndex == 1" class="td">来港事由</div>
           </div>
           <div v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="scroll">
             <div v-for="(item,index) in block3List" :key="index" class="tr">
@@ -205,7 +205,7 @@ export default {
       requestFN(
         '/map/getOnlineGateEquipment', {
           AREA: this.area,
-          CORP_INFO_ID: this.corpInfoId,
+          CORPINFO_ID: this.corpInfoId,
           GANGKOU: this.gangkou
         }
       ).then((data) => {

src/views/map/dialog/mkGateMachine.vue

@@ -30,7 +30,7 @@
               <td>状态</td>
             </tr>
             <tr v-for="(item,index) in recordAllList" :key="index">
-              <td>{{ item.CARDTYPE }}</td> 
+              <td>{{ item.CARDTYPE }}</td>
               <td>{{ item.USERNAME }}</td>
               <td>{{ item.TIME }}</td>
               <td>
@@ -210,9 +210,11 @@ export default {
           this.info.PERSON_OUT = 0
           this.varList = data.pd.varList
           for (let i = 0; i < data.pd.varList.length; i++) {
-            if (this.type == 'CAR') {
+            if (data.pd.varList[i].TYPE == 'CAR_IN') {
-              this.info.CAR_IN = data.pd.varList[i].CAR_IN
+              this.info.CAR_IN = data.pd.varList[i].COUNT
-              this.info.CAR_OUT = data.pd.varList[i].CAR_OUT
+            }
+            if (data.pd.varList[i].TYPE == 'CAR_OUT') {
+              this.info.CAR_OUT = data.pd.varList[i].COUNT
             }
             if (data.pd.varList[i].TYPE == 'PERSON_IN') {
               this.info.PERSON_IN = data.pd.varList[i].COUNT

src/views/map/index.vue

@@ -280,8 +280,8 @@ import cmtIndex from './components/cmt_index.vue'
 import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
-import menjinOld from './components/menjin_old.vue'
 import menjin from './components/menjin.vue'
+import menjinOld from './components/menjin_old.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
 import xiaofang from './components/xiaofang.vue'
@@ -495,21 +495,21 @@ export default {
               eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
             },
             {
-              label: '口门1',
+              label: '人员',
-              dialog_width: '600px',
+              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: 'CAR',
+              type: 'PERSON',
               containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
               eliminateAuthorization: []
             },
             {
-              label: '口门2',
+              label: '车辆',
               dialog_width: '600px',
               check: false,
-              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
               type: 'CAR',
               containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
               eliminateAuthorization: []

src/views/map/js/dragentity.js

@@ -53,6 +53,8 @@ const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png')
 const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png')
 const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png')
 const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png')
+const GGimg1 = require('../../../assets/map/gangkou_index/point/ico1.png')
+const GGimg2 = require('../../../assets/map/gangkou_index/point/ico2.png')
 
 const imgMap = {
   img0_0, img0_1, img0_2,
@@ -116,15 +118,61 @@ export default class DragEntity {
       }
     }
     if (value.point_type.indexOf('标记点') !== -1) {
-      billboard = {
+      console.info('====' )
-        image: imgMap['img' + value.icon_type],
+      console.info(value )
-        height: 36,
+      console.info('====' )
-        width: 30,
+      if (value.label == '人员' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
-        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        billboard = {
-        horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          image: GGimg1,
-        heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          height: 36,
-        disableDepthTestDistance: Number.POSITIVE_INFINITY
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '车辆' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image: GGimg2,
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '摄像头' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image:  imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '摄像头' ){
+        billboard = {
+          image:  imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else{
+        billboard = {
+          image: imgMap['img' + value.icon_type],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
       }
+
     }
     // 曹妃甸使用
     if (value.gangkou === '00004') {