From ebb141a699f6c05160b716110a9179663b83a45c Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Sat, 29 Jun 2024 12:45:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=98=BE=E7=A4=BA=E4=B8=80=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=202.=E8=B0=83=E6=95=B4=E7=9B=91=E7=AE=A1=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E8=A7=86=E9=A2=91=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyprojects/videomanager/components/video-list.vue |  4 ++--
 src/views/map/components/menjin_old.vue                |  2 +-
 src/views/map/dialog/mkGateMachine.vue                 | 10 ++++++----
 src/views/map/index.vue                                |  9 ++++++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index 80881f7..fa13eec 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -154,8 +154,8 @@
     <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" :show-close="false" title="视频" width="1200px">
       <!--      <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
       <div style="display: flex;flex-wrap: wrap;justify-content: space-between">
-        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
-          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
+        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 30%">
+          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="280" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
           <div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
         </div>
       </div>
diff --git a/src/views/map/components/menjin_old.vue b/src/views/map/components/menjin_old.vue
index 8a5b5d2..e58c601 100644
--- a/src/views/map/components/menjin_old.vue
+++ b/src/views/map/components/menjin_old.vue
@@ -205,7 +205,7 @@ export default {
       requestFN(
         '/map/getOnlineGateEquipment', {
           AREA: this.area,
-          CORP_INFO_ID: this.corpInfoId,
+          CORPINFO_ID: this.corpInfoId,
           GANGKOU: this.gangkou
         }
       ).then((data) => {
diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index f8f04ae..5e76958 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -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>
@@ -210,9 +210,11 @@ export default {
           this.info.PERSON_OUT = 0
           this.varList = data.pd.varList
           for (let i = 0; i < data.pd.varList.length; i++) {
-            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 == '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 (data.pd.varList[i].TYPE == 'PERSON_IN') {
               this.info.PERSON_IN = data.pd.varList[i].COUNT
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 38fc09b..5f017d6 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -43,8 +43,13 @@
           v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"/>
+        <menjinOld
+          v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          :corp-info-id="CORP_INFO_ID"
+          :area="area"
+          :gangkou="gangkouActive"/>
         <menjin
-          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
+          v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
@@ -276,6 +281,7 @@ import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
 import menjin from './components/menjin.vue'
+import menjinOld from './components/menjin_old.vue'
 import menjinCfd from './components/menjinCfd.vue'
 import menjinCmt from './components/menjinCmt.vue'
 import xiaofang from './components/xiaofang.vue'
@@ -332,6 +338,7 @@ export default {
     fengongsiIndex,
     caofeidianIndex,
     layoutMenu,
+    menjinOld,
     menjin,
     menjinCfd,
     menjinCmt,