From 6e18df9743572ba4bbb34cf2f6ed18638a9b96fb Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 5 Sep 2024 16:02:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue |  5 ++++-
 src/views/map/index.vue        | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 7ebba32..452518e 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -11,7 +11,10 @@
       <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'" :id="id" :type="type" :gangkou="gangkou" :corp-id="corpInfoId" :GATE_VIDEO_ID="GATE_VIDEO_ID"/>
+      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'"
+                       :id="id" :type="type" :gangkou="gangkou"
+                       :corp-id="corpInfoId"
+                       :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"/>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 5f017d6..e5deb36 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -494,6 +494,26 @@ export default {
               containAuthorization: [],
               eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
             },
+            {
+              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: '人员',
               dialog_width: '800px',