From 7b3cda27062397864e441fe5db2972e75ac97b07 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 14 Jun 2024 17:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E6=A0=87=E7=82=B9=E8=BF=9B=E5=87=BA=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/mkGateMachine.vue | 30 ++++++++++++++++----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index aa3ba24..cb8083a 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -3,10 +3,10 @@
     <div v-if= "type !== 'CAMERA'" class="level-title">
       <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
     </div>
-    <table v-if= "type !== 'CAMERA'" class="table-ui">
+    <table v-for="(item,index) in varList" :key="index" v-if= "type !== 'CAMERA'" class="table-ui">
       <tr>
         <td class="bbg-transparent">闸机名称</td>
-        <td colspan="5">{{ info.GATE_MACHINE_NAME }}</td>
+        <td colspan="5">{{ item.GATE_NAME }}</td>
       </tr>
       <!--      <tr>-->
       <!--        <td class="bbg-transparent">型号</td>-->
@@ -14,11 +14,11 @@
       <!--      </tr>-->
       <tr>
         <td class="bbg-transparent">今日进</td>
-        <td>{{ type == 'CAR'? info.CAR_IN : info.PERSON_IN }}</td>
+        <td width="60px">{{ type == 'CAR'? item.CAR_IN : info.PERSON_IN }}</td>
         <td class="bbg-transparent">今日出</td>
-        <td>{{ type == 'CAR'? info.CAR_OUT : info.PERSON_OUT }}</td>
+        <td width="60px">{{ type == 'CAR'? item.CAR_OUT : info.PERSON_OUT }}</td>
         <td class="bbg-transparent">当前滞留</td>
-        <td>{{ type == 'CAR'? info.CAR_IN - info.CAR_OUT : info.PERSON_IN - info.PERSON_OUT }}</td>
+        <td width="60px">{{ type == 'CAR'? item.CAR_IN - item.CAR_OUT : info.PERSON_IN - info.PERSON_OUT }}</td>
       </tr>
       <tr v-if="type == 'PERSON'">
         <td colspan="6">
@@ -85,13 +85,20 @@ export default {
       default() {
         return ''
       }
+    },
+    GATE_VIDEO_ID: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
     return {
       config: config,
       info: {},
-      recordAllList: []
+      recordAllList: [],
+      varList:[]
     }
   },
 
@@ -112,6 +119,7 @@ export default {
         '/map/getGatesInAndOutNumById',
         {
           GATE_AREA_ID: this.id,
+          GATE_VIDEO_ID: this.GATE_VIDEO_ID,
           TYPE: this.type,
           GANGKOU: this.gangkou,
           CORPINFO_ID: this.corpId
@@ -124,12 +132,11 @@ export default {
           this.info.CAR_OUT = 0
           this.info.PERSON_IN = 0
           this.info.PERSON_OUT = 0
+          this.varList = data.pd.varList
           for (let i = 0; i < data.pd.varList.length; i++) {
-            if (data.pd.varList[i].TYPE == 'CAR_IN') {
-              this.info.CAR_IN = data.pd.varList[i].COUNT
-            }
-            if (data.pd.varList[i].TYPE == 'CAR_OUT') {
-              this.info.CAR_OUT = data.pd.varList[i].COUNT
+            if (this.type == 'CAR') {
+              this.info.CAR_IN = data.pd.varList[i].CAR_IN
+              this.info.CAR_OUT = data.pd.varList[i].CAR_OUT
             }
             if (data.pd.varList[i].TYPE == 'PERSON_IN') {
               this.info.PERSON_IN = data.pd.varList[i].COUNT
@@ -149,6 +156,7 @@ export default {
         '/map/getGatesInAndOutListById?showCount=10000&currentPage=1',
         {
           GATE_AREA_ID: this.id,
+          GATE_VIDEO_ID: this.GATE_VIDEO_ID,
           TYPE: this.type,
           GANGKOU: this.gangkou,
           CORPINFO_ID: this.corpId