Merge remote-tracking branch 'origin/pet' into pet

# Conflicts:
#	src/views/map/index.vue

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">

src/views/map/index.vue

@@ -43,13 +43,8 @@
           v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"/>
-        <menjinOld
-          v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
-          :corp-info-id="CORP_INFO_ID"
-          :area="area"
-          :gangkou="gangkouActive"/>
         <menjin
-          v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && 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"/>
@@ -280,7 +275,6 @@ import cmtIndex from './components/cmt_index.vue'
 import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
-import menjinOld from './components/menjin_old.vue'
 import menjin from './components/menjin.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
@@ -338,7 +332,6 @@ export default {
     fengongsiIndex,
     caofeidianIndex,
     layoutMenu,
-    menjinOld,
     menjin,
     menjinCfd,
     menjinCmt,
@@ -495,21 +488,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,6 +118,50 @@ export default class DragEntity {
       }
     }
     if (value.point_type.indexOf('标记点') !== -1) {
+      console.info('====' )
+      console.info(value )
+      console.info('====' )
+      if (value.label == '人员' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image: GGimg1,
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '车辆' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image: GGimg2,
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '摄像头' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+        billboard = {
+          image:  imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else if (value.label == '摄像头' ){
+        billboard = {
+          image:  imgMap['img0_2' ],
+          height: 36,
+          width: 30,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      }else{
         billboard = {
           image: imgMap['img' + value.icon_type],
           height: 36,
@@ -126,6 +172,8 @@ export default class DragEntity {
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
       }
+
+    }
     // 曹妃甸使用
     if (value.gangkou === '00004') {
       if (value.label === '人员定位') {