From da01631b41b0b4e44c0a794887dd4c34db50ee23 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 20 May 2024 13:44:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E5=9C=B0=E5=9B=BE=E9=97=A8=E5=8F=A3=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E5=B1=95=E7=A4=BA=E6=94=B9=E4=B8=BA=E5=92=8C=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AB=AF=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue         |  2 +-
 src/views/map/dialog/mkGateMachine.vue |  9 ++++++++-
 src/views/map/index.vue                | 10 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 69bd9b9..7f20057 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -11,7 +11,7 @@
       <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"/>
+      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou" :corp-id="corpInfoId"/>
       <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/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index 33d8cbd..2d30780 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -79,6 +79,12 @@ export default {
     gangkou: {
       type: String,
       default: ''
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
@@ -107,7 +113,8 @@ export default {
         {
           GATE_AREA_ID: this.id,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         Object.assign(this.info, data.pd)
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 4f6f9fd..c052698 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -459,6 +459,16 @@ export default {
           containAuthorization: [],
           eliminateAuthorization: [],
           list: [
+            {
+              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: [],
+              eliminateAuthorization: []
+            },
             {
               label: '车辆',
               dialog_width: '600px',

From 93ffe2b5af8d6580818874048a4019612cb8c51a Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 20 May 2024 14:46:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E9=97=A8?=
 =?UTF-8?q?=E5=8F=A3=E9=97=A8=E7=A6=81=E5=9C=B0=E5=9B=BE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/mkGateMachine.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index 2d30780..aa3ba24 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -34,8 +34,8 @@
               <td>{{ item.USERNAME }}</td>
               <td>{{ item.TIME }}</td>
               <td>
-                <span v-if="item.STATE === '0'">进入</span>
-                <span v-if="item.STATE === '1'">出去</span>
+                <span v-if="item.STATE === 0">进入</span>
+                <span v-if="item.STATE === 1">出去</span>
               </td>
             </tr>
           </table>
@@ -150,7 +150,8 @@ export default {
         {
           GATE_AREA_ID: this.id,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         this.recordAllList = data.recordAllList