From dbfd7c58b05dddd2c7b57b1dfb50611f3b75c8e9 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 18 Jun 2024 19:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE-=E5=8F=A3=E9=97=A8=E8=BF=9B=E5=87=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=BD=A6=E8=A1=8C=E3=80=81=E4=BA=BA=E8=A1=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/mkGateMachine.vue | 92 +++++++++++++++++++++++---
 src/views/map/index.vue                | 16 +++--
 2 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index cb8083a..8e8e1e7 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="app-container print-work">
+    <div class="app-container print-work" v-if="corpId == '035958e685cf4850bc40151c5e0617a6' ">
     <div v-if= "type !== 'CAMERA'" class="level-title">
       <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
     </div>
-    <table v-for="(item,index) in varList" :key="index" v-if= "type !== 'CAMERA'" class="table-ui">
+    <table v-if= "type !== 'CAMERA'" class="table-ui">
       <tr>
         <td class="bbg-transparent">闸机名称</td>
-        <td colspan="5">{{ item.GATE_NAME }}</td>
+        <td colspan="5">{{ info.GATE_MACHINE_NAME }}</td>
       </tr>
       <!--      <tr>-->
       <!--        <td class="bbg-transparent">型号</td>-->
@@ -14,11 +14,11 @@
       <!--      </tr>-->
       <tr>
         <td class="bbg-transparent">今日进</td>
-        <td width="60px">{{ type == 'CAR'? item.CAR_IN : info.PERSON_IN }}</td>
+        <td>{{ type == 'CAR'? info.CAR_IN : info.PERSON_IN }}</td>
         <td class="bbg-transparent">今日出</td>
-        <td width="60px">{{ type == 'CAR'? item.CAR_OUT : info.PERSON_OUT }}</td>
+        <td>{{ type == 'CAR'? info.CAR_OUT : info.PERSON_OUT }}</td>
         <td class="bbg-transparent">当前滞留</td>
-        <td width="60px">{{ type == 'CAR'? item.CAR_IN - item.CAR_OUT : info.PERSON_IN - info.PERSON_OUT }}</td>
+        <td>{{ type == 'CAR'? info.CAR_IN - info.CAR_OUT : info.PERSON_IN - info.PERSON_OUT }}</td>
       </tr>
       <tr v-if="type == 'PERSON'">
         <td colspan="6">
@@ -30,7 +30,7 @@
               <td>状态</td>
             </tr>
             <tr v-for="(item,index) in recordAllList" :key="index">
-              <td>{{ item.CARDTYPE }}</td>
+              <td>{{ item.CARDTYPE }}</td> 
               <td>{{ item.USERNAME }}</td>
               <td>{{ item.TIME }}</td>
               <td>
@@ -55,6 +55,80 @@
       <video-play v-if="type === 'CAMERA' && info.GATEVIDEO_ID" :id="info.GATEVIDEO_ID" :type="type" :gangkou="gangkou"/>
     </div>
   </div>
+  <div class="app-container print-work" v-else>
+    <div v-if= "type !== 'CAMERA'" class="level-title">
+      <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
+    </div>
+    <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">{{ item.GATE_NAME }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">今日进</td>
+        <td width="80px">{{ item.CAR_IN}}</td>
+        <td class="bbg-transparent">今日出</td>
+        <td width="80px">{{ item.CAR_OUT}}</td>
+        <td class="bbg-transparent">当前滞留</td>
+        <td width="80px">{{ item.CAR_IN - item.CAR_OUT}}</td>
+      </tr>
+    </table>
+    <table class="table-ui">
+    <tr v-if="carRecordAllList != null && carRecordAllList.length > 0">
+        <td colspan="6">
+          <table class="table-ui">
+            <tr>
+              <td class="bbg-transparent">车牌</td>
+              <td class="bbg-transparent">时间</td>
+              <td class="bbg-transparent">闸机</td>
+              <td class="bbg-transparent">状态</td>
+            </tr>
+            <tr v-for="(item,index) in carRecordAllList" :key="index">
+              <td>{{ item.LICENSE_PLATE }}</td>
+              <td>{{ item.TIME }}</td>
+              <td>{{ item.COMING_REASON }}</td>
+              <td>{{ item.STATE == '0' ? '进港': '出港' }}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr v-if="recordAllList != null && recordAllList.length > 0">
+        <td colspan="6">
+          <table class="table-ui">
+            <tr>
+              <td>卡号</td>
+              <td>人员姓名</td>
+              <td>刷卡时间</td>
+              <td>闸机</td>
+              <td>状态</td>
+            </tr>
+            <tr v-for="(item,index) in recordAllList" :key="index">
+              <td>{{ item.CARDTYPE }}</td>
+              <td>{{ item.USERNAME }}</td>
+              <td>{{ item.TIME }}</td>
+              <td>{{ item.EQUIPMENTNAME }}</td>
+              <td>
+                <span v-if="item.STATE == '0'">进</span>
+                <span v-if="item.STATE == '1'">出</span>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <div v-if= "type == 'CAMERA'" class="level-title">
+      <h1>摄像头名称：{{ info.VIDEONAME }}</h1>
+    </div>
+    <table v-if= "type == 'CAMERA'" class="table-ui">
+      <tr>
+        <td class="bbg-transparent">编码</td>
+        <td >{{ info.CODE }}</td>
+      </tr>
+    </table>
+    <div class="video">
+      <video-play v-if="type === 'CAMERA' && info.GATEVIDEO_ID" :id="info.GATEVIDEO_ID" :type="type" :gangkou="gangkou"/>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -98,7 +172,8 @@ export default {
       config: config,
       info: {},
       recordAllList: [],
-      varList:[]
+      varList:[],
+      carRecordAllList:[]
     }
   },
 
@@ -163,6 +238,7 @@ export default {
         }
       ).then((data) => {
         this.recordAllList = data.recordAllList
+        this.carRecordAllList = data.carRecordAllList
         this.$forceUpdate()
       }).catch((e) => {
       })
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index abd5d14..a162166 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -466,11 +466,11 @@ export default {
           eliminateAuthorization: [],
           list: [
             {
-              label: '车辆',
+              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'),
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
               type: 'CAR',
               containAuthorization: [],
               eliminateAuthorization: []
@@ -875,7 +875,8 @@ export default {
         RyDeptName: '',
         RyPostName: '',
         RyRealName: '',
-        personTypeName: ''
+        personTypeName: '',
+        GATE_VIDEO_ID:''
       },
       /* 曹妃甸使用参数开始*/
       // 人员定位
@@ -1383,6 +1384,13 @@ export default {
           }
           const point_type = pick.id._monitoItems.data.point_type
           const point_id = pick.id._monitoItems.data.id
+          if (point_type == '标记点CAMERA'){
+            const { GATE_VIDEO_ID } = pick.id._monitoItems.data
+            alert(GATE_VIDEO_ID)
+            alert(pick.id._monitoItems.data)
+            console.log(pick.id._monitoItems.data)
+            this.dialog.GATE_VIDEO_ID = GATE_VIDEO_ID
+          }
           if (point_type === '报警') {
             viewer.dataSources.remove(this.myEntityCollection[pick.id._monitoItems.data.id])
             delete this.poinEntity[pick.id._monitoItems.data.id]