From 198649e568b1009f123c1445ee47c2ee3d2686eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 9 Sep 2022 14:24:09 +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

---
 .../parkingAreaControlCarInouts.html          |  5 +++++
 .../parkingAreaControlCarInouts.js            | 19 ++++++++++++-------
 .../parkingAreaControlFee.js                  |  7 +++++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html
index 9a47d16c2..5f9001f53 100644
--- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html
+++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html
@@ -42,6 +42,7 @@
         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
             <thead>
                 <tr>
+                    <th class="text-center"><span><vc:i18n name="进场图" namespace="parkingAreaControlCarInouts"></vc:i18n></span></th>
                     <th class="text-center"><span><vc:i18n name="进出场编号" namespace="parkingAreaControlCarInouts"></vc:i18n></span></th>
                     <th class="text-center"><span><vc:i18n name="车辆状态" namespace="parkingAreaControlCarInouts"></vc:i18n></span></th>
                     <th class="text-center"><span><vc:i18n name="车牌号" namespace="parkingAreaControlCarInouts"></vc:i18n></span></th>
@@ -57,6 +58,9 @@
             </thead>
             <tbody>
                 <tr v-for="carIn in parkingAreaControlCarInoutsInfo.carIns">
+                    <td class="text-center" style="white-space: nowrap;">
+                        <img style="width: 60px; height: 60px;" v-bind:src="carIn.photoJpg" v-on:click="_carInoutOpenFile(carIn.photoJpg)" />
+                    </td>
                     <td class="text-center">{{carIn.inoutId}}</td>
                     <td class="text-center">{{carIn.carInout == '3306'?'进场':'出场'}}({{carIn.stateName}})</td>
                     <td class="text-center">{{carIn.carNum}}
@@ -92,4 +96,5 @@
         <!-- 分页 -->
         <vc:create path="frame/paginationPlus" namespace="parkingAreaControlCarInouts"></vc:create>
     </div>
+    <vc:create path="common/viewImage"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
index dfa4905f5..01ae92cf9 100644
--- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
+++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
@@ -14,7 +14,7 @@
                 startTime: '',
                 endTime: '',
                 carType: '',
-                machineId:''
+                machineId: ''
             }
         },
         _initMethod: function() {
@@ -34,9 +34,9 @@
                 function(_currentPage) {
                     vc.component._loadParkingAreaControlCarInouts(_currentPage, DEFAULT_ROWS);
                 });
-                vc.on('parkingAreaControlCarInouts', 'changeMachine',function(_data){
-                    $that.parkingAreaControlCarInoutsInfo.machineId = _data.machineId;
-                })
+            vc.on('parkingAreaControlCarInouts', 'changeMachine', function(_data) {
+                $that.parkingAreaControlCarInoutsInfo.machineId = _data.machineId;
+            })
         },
         methods: {
 
@@ -109,16 +109,21 @@
                     }
                 );
             },
-            _carInoutTempCarPayFee:function(carIn){
+            _carInoutTempCarPayFee: function(carIn) {
                 vc.emit('parkingAreaControlCustomCarInout', 'open', {
                     type: "1102", //1101 手动入场 1102 手动出场
                     carNum: carIn.carNum,
                     amount: carIn.payCharge,
                     payCharge: carIn.payCharge,
-                    machineId:$that.parkingAreaControlCarInoutsInfo.machineId,
+                    machineId: $that.parkingAreaControlCarInoutsInfo.machineId,
                     boxId: $that.parkingAreaControlCarInoutsInfo.boxId,
                 })
-            }
+            },
+            _carInoutOpenFile: function(_url) {
+                vc.emit('viewImage', 'showImage', {
+                    url: _url
+                });
+            },
 
         }
     });
diff --git a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js
index 385a2d45c..3a847154d 100644
--- a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js
+++ b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js
@@ -29,16 +29,19 @@
                     return;
                 }
                 let _machineId = $that.parkingAreaControlFeeInfo.outMachineId;
+                //进场覆盖问题
+                let _oldPayCharge = $that.parkingAreaControlFeeInfo.payCharge;
                 vc.copyObject(_data, $that.parkingAreaControlFeeInfo);
                 $that.parkingAreaControlFeeInfo.openMsg = _data.remark;
 
                 //出场摄像头
                 if (_machineId == _data.extMachineId) {
                     $that.parkingAreaControlFeeInfo.feeCarNum = _data.carNum;
-                    $that.parkingAreaControlFeeInfo.costMin = _data.hours + "小时" + _data.hours + "分钟"
+                    $that.parkingAreaControlFeeInfo.costMin = _data.hours + "小时" + _data.min + "分钟"
                     $that.parkingAreaControlFeeInfo.pay = _data.payCharge;
                     $that.parkingAreaControlFeeInfo.remark = '';
-
+                } else {
+                    $that.parkingAreaControlFeeInfo.pay = _oldPayCharge;
                 }