海康口门门禁地图显示

src/views/map/dialog/index.vue

@@ -11,10 +11,13 @@
       <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"/>
       <alarm-device v-if="type === 'alarm'" :id="id" :type="type" :gangkou="gangkou"/>
-      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'"
+      <mk-gate-machine
-                       :id="id" :type="type" :gangkou="gangkou"
+        v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'"
+        :id="id"
+        :type="type"
+        :gangkou="gangkou"
         :corp-id="corpInfoId"
-                       :GATE_VIDEO_ID="GATE_VIDEO_ID"/>
+        :gate-video-id="GATE_VIDEO_ID"/>
       <mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
       <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"/>
@@ -220,7 +223,7 @@ export default {
     GATE_VIDEO_ID: {
       type: String,
       default: ''
-    },
+    }
   },
   methods: {
     closeDialog() {

src/views/map/index.vue

@@ -492,27 +492,7 @@ export default {
               checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
               type: 'CAR',
               containAuthorization: [],
-              eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
+              eliminateAuthorization: ['all']
-            },
-            {
-              label: '人员',  //杂货公司的人员
-              dialog_width: '800px',
-              check: false,
-              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
-              type: 'PERSON',
-              containAuthorization: ['033549ed3bd648e49c8a65eb4993ec2f'],
-              eliminateAuthorization: []
-            },
-            {
-              label: '车辆',//杂货公司的车辆
-              dialog_width: '600px',
-              check: false,
-              img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
-              type: 'CAR',
-              containAuthorization: ['033549ed3bd648e49c8a65eb4993ec2f'],
-              eliminateAuthorization: []
             },
             {
               label: '人员',
@@ -534,6 +514,26 @@ export default {
               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',
@@ -2223,6 +2223,7 @@ export default {
             const points = []
             const varList = this.filterNull(data.varList)
             for (let i = 0; i < varList.length; i++) {
+              console.log(pindex + '_' + index)
               const point = {}
               point.id = pindex + '_' + index + '_' + i
               point.data_id = varList[i].id
@@ -3309,6 +3310,8 @@ export default {
       if (e.containAuthorization.length === 0) return true
       if (e.containAuthorization.includes(CORP_INFO_ID)) {
         return true
+      } else if (e.containAuthorization.includes('allCorp') && CORP_INFO_ID) {
+        return true
       } else {
         return false
       }
@@ -3318,6 +3321,8 @@ export default {
       if (eliminateAuthorization.length === 0) return true
       if (eliminateAuthorization.includes(CORP_INFO_ID)) {
         return false
+      } else if (eliminateAuthorization.includes('all') && CORP_INFO_ID) {
+        return false
       } else {
         return true
       }

src/views/map/js/dragentity.js

@@ -118,10 +118,10 @@ export default class DragEntity {
       }
     }
     if (value.point_type.indexOf('标记点') !== -1) {
-      console.info('====' )
+      console.info('====')
-      console.info(value )
+      console.info(value)
-      console.info('====' )
+      console.info('====')
-      if (value.label == '人员' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+      if (value.label == '人员' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6') {
         billboard = {
           image: GGimg1,
           height: 36,
@@ -131,7 +131,7 @@ export default class DragEntity {
           heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
-      }else if (value.label == '车辆' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+      } else if (value.label == '车辆' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6') {
         billboard = {
           image: GGimg2,
           height: 36,
@@ -141,7 +141,7 @@ export default class DragEntity {
           heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
-      }else if (value.label == '摄像头' &&  value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){
+      } else if (value.label == '摄像头' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6') {
         billboard = {
           image: imgMap['img0_2' ],
           height: 36,
@@ -151,7 +151,7 @@ export default class DragEntity {
           heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
-      }else if (value.label == '摄像头' ){
+      } else if (value.label == '摄像头') {
         billboard = {
           image: imgMap['img0_2' ],
           height: 36,
@@ -161,7 +161,27 @@ export default class DragEntity {
           heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
-      }else{
+      } else 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 {
         billboard = {
           image: imgMap['img' + value.icon_type],
           height: 36,
@@ -172,7 +192,6 @@ export default class DragEntity {
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
       }
-
     }
     // 曹妃甸使用
     if (value.gangkou === '00004') {