From d7c0b172de8551b631f63e884df8277cdd02e8a4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 27 Sep 2022 00:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parkingAreaTotalControlVideo.html               |  2 +-
 .../parkingAreaTotalControlVideo.js                 | 13 ++++++++-----
 .../parkingAreaTotalControl.html                    |  8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.html b/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.html
index 698f71072..7014d5ff0 100644
--- a/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.html
+++ b/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.html
@@ -27,7 +27,7 @@
                 <div :id="'receiverDiv'+item.machineId" style="border: 1px solid #dee2e6;">
                     <img width="100%" src="../../../img/init.jpg" height="300px" :id="'receiver'+item.machineId"
                         style="border: 1;" />
-                    <img :src="item.inOutImg" style="position: absolute;left: 15px;bottom: 50px;"/>
+                    <img :src="item.inOutImg" style="position: absolute;left: 0px;bottom: 0px;height: 70px;z-index:1;"/>
                 </div>
                 <div class="margin-top-sm margin-left-sm" style="font-size: 14px;" v-if="item.carNum">
                     <span class="fa fa-bell" style="color: #007bff;"></span>
diff --git a/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js b/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js
index cbf4db08c..f699fce54 100644
--- a/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js
+++ b/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js
@@ -28,8 +28,8 @@
             });
 
             vc.on('parkingAreaTotalControlVideo', 'notify', function (_data) {
-                $that._showCarInoutMachineImgInfo(_data);
                 $that._showCarInoutMachineInoutInfo(_data);
+                $that._showCarInoutMachineImgInfo(_data);
 
                 let _machines = $that.parkingAreaTotalControlVideoInfo.machines;
 
@@ -57,6 +57,8 @@
                     if (item.machineId == _data.extMachineId) {
                         setTimeout(function () {
                             item.inOutImg = _data.img.replace('.jpg', '_plate.jpg');
+                            //强制刷新下
+                            $that.$forceUpdate();
                         }, 1500);
                     }
                 })
@@ -65,12 +67,13 @@
                 if (_data.action != 'FEE_INFO') {
                     return;
                 }
+                let _machines = $that.parkingAreaTotalControlVideoInfo.machines;
                 _machines.forEach(item => {
                     if (item.machineId == _data.extMachineId) {
-                        item.carNum = param.carNum;
-                        item.inOutTime = param.inOutTime;
-                        item.open = param.open;
-                        item.openMsg = param.remark;
+                        item.carNum = _data.carNum;
+                        item.inOutTime = _data.inOutTime;
+                        item.open = _data.open;
+                        item.openMsg = _data.remark;
                     }
                 })
             },
diff --git a/public/pages/property/parkingAreaTotalControl/parkingAreaTotalControl.html b/public/pages/property/parkingAreaTotalControl/parkingAreaTotalControl.html
index 23901747f..91226252c 100644
--- a/public/pages/property/parkingAreaTotalControl/parkingAreaTotalControl.html
+++ b/public/pages/property/parkingAreaTotalControl/parkingAreaTotalControl.html
@@ -28,11 +28,11 @@
                             <span><vc:i18n name="月租车" namespace="parkingAreaTotalControl"></vc:i18n></span>
                         </a>
                     </li>
-                    <!-- <li class="nav-item">
+                    <li class="nav-item">
                         <a class="nav-link" v-bind:class="{active:parkingAreaTotalControlInfo._currentTab == 'parkingAreaControlTempCar'}" v-on:click="changeTab('parkingAreaControlTempCar')">
                             <span><vc:i18n name="临时车" namespace="parkingAreaTotalControl"></vc:i18n></span>
                         </a>
-                    </li> -->
+                    </li>
                     <li class="nav-item">
                         <a class="nav-link" v-bind:class="{active:parkingAreaTotalControlInfo._currentTab == 'parkingAreaControlWhiteCar'}" v-on:click="changeTab('parkingAreaControlWhiteCar')">
                             <span><vc:i18n name="白名单" namespace="parkingAreaTotalControl"></vc:i18n></span>
@@ -43,11 +43,11 @@
                             <span><vc:i18n name="黑名单" namespace="parkingAreaTotalControl"></vc:i18n></span>
                         </a>
                     </li>
-                    <!-- <li class="nav-item">
+                    <li class="nav-item">
                         <a class="nav-link" v-bind:class="{active:parkingAreaTotalControlInfo._currentTab == 'parkingAreaControlRemaining'}" v-on:click="changeTab('parkingAreaControlRemaining')">
                             <span><vc:i18n name="剩余车位" namespace="parkingAreaTotalControl"></vc:i18n></span>
                         </a>
-                    </li> -->
+                    </li>
                     <li class="nav-item">
                         <a class="nav-link" v-bind:class="{active:parkingAreaTotalControlInfo._currentTab == 'parkingAreaControlPaymentSummary'}" v-on:click="changeTab('parkingAreaControlPaymentSummary')">
                             <span><vc:i18n name="收费统计" namespace="parkingAreaTotalControl"></vc:i18n></span>