5555

smart/src/views/accessRecord/setpPage/details.vue

@@ -11,6 +11,10 @@
             v-for="item in vehiclePicture"
             :key="item"
           >
+            <img
+              :src="item"
+              alt=""
+            >
           </el-carousel-item>
         </el-carousel>
       </div>
@@ -117,7 +121,8 @@ export default {
                     : this.params.row.passType == 8 ? '远程放行'
                       : '相机缓慢放行';
 
-    this.vehiclePicture.push(this.params.row.imgName)
+    debugger
+    this.vehiclePicture.push(this.params.row.imgInfo)
 
   }
 }

smart/src/views/onSiteVehicles/setpPage/details.vue

@@ -11,7 +11,10 @@
             v-for="item in vehiclePicture"
             :key="item"
           >
-            <!-- <h3>{{ item }}</h3> -->
+            <img
+              :src="item"
+              alt=""
+            >
           </el-carousel-item>
         </el-carousel>
       </div>

smart/src/views/parkingSpaceManagement/parkingSpaceList.vue

@@ -52,7 +52,7 @@
             @click="addOrEdit('add')"
           ></i>
         </el-tooltip>
-        <!-- <el-tooltip
+        <el-tooltip
           class="item"
           effect="light"
           placement="bottom"
@@ -62,13 +62,13 @@
             class="zoniot_font zoniot-icon-shanchu2"
             @click="deleteRow"
           ></i>
-        </el-tooltip> -->
+        </el-tooltip>
       </div>
     </div>
     <div>
       <zz-table
         :cols="cols"
-        :settings="{ showCheckbox: false, showIndex: true, stripe: true }"
+        :settings="{ showCheckbox: true, showIndex: true, stripe: true }"
         :data="mixins_list"
         :loading="mixins_onQuery"
         :pageset="mixins_pageset"

smart/src/views/rechargeRecord/index.js

@@ -49,7 +49,8 @@ export default {
                 },
                 {
                     label: '充值数额',
-                    prop: 'amount',
+                    // prop: 'amount',  chargeNumber
+                    prop: 'chargeNumber',
                     format(val) {
                         return val + '月';
                     }

smart/src/views/temporaryStopCharge/setpPage/details.vue

@@ -18,7 +18,11 @@
             </el-col>
           </template>
         </el-form>
-        <div class="formContent-item_title">物业信息</div>
+        <div class="formContent-item_title">物业信息
+          <span style="color: #29B6FF; font-size: 12px;">(已支付)</span>
+        </div>
+        <!-- <div style="color: #29B6FF;">已支付</div> -->
+
         <el-form
           label-width="110px"
           class="formContent_laber"
@@ -70,7 +74,7 @@ export default {
         },
         {
           name: '支付渠道',//payType  6
-          label: '其他'
+          label: '其他'//payMethod
         },
         {
           name: '订单类型',
@@ -109,7 +113,7 @@ export default {
     this.cols[2].label = this.params.row.freeMoney || '--';
     this.cols[3].label = this.params.row.deductionAmount || '--';
     this.cols[4].label = this.params.row.freeTime || '--';
-    this.cols[5].label = this.params.row.payMethod || '--';
+    this.cols[5].label = this.params.row.payMethod == 1 ? '微信' : this.params.row.payMethod == 2 ? '支付宝' : this.params.row.payMethod == 3 ? '现金' : this.params.row.payMethod == 4 ? '预存' : '其他' || '--';
 
     this.cols[8].label = this.params.row.chargePeople || '--';
     this.cols[9].label = this.params.row.createTime || '--';

smart/src/views/vehicleInformation/setpPage/details.vue

@@ -208,24 +208,24 @@
           style="width: 100%"
           :cell-style="{'text-align':'center'}"
         >
-          <div style="float: left;">111</div>
-
           <el-table-column
             label="可停区域"
             class="tableColumn"
             align="center"
           >
             <template slot-scope="scope">
-              <span style="width: 5px;color: #F56C6C;">*</span>
+              <span style="width: 5px;color: #F56C6C; float: left;">*</span>
               <el-form-item
                 prop="parkingArea"
                 ref="againValue"
+                style="float: left;"
               >
 
                 <el-select
                   placeholder="请选择"
                   v-model="tableData[scope.$index].parkingArea"
                   @click.native="parking"
+                  style="float: left;"
                 >
                   <el-option
                     v-for="(item,index) in eloption"
@@ -821,6 +821,7 @@ export default {
       return;
     },
     positionInformation (id) {
+      debugger
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/vehicleInformation/setpPage/native.vue',
@@ -829,13 +830,15 @@ export default {
           props: {
             callback: resolve,
             id: id,
-            positionInformation: this.tableData
+            positionInformation: this.tableData[id].positionInformation,
+            value: this.tableData[id].parkingId,
           },
 
           hideStar: true,
           title: '选择车位'
         });
       }).then((data) => {
+        debugger
         var id = data[0].id;
         this.tableData[id].positionInformation = data[0].positionInformation;
         this.tableData[id].parkingId = data[0].value;
@@ -857,6 +860,7 @@ export default {
       }
     },
     addEdit (row) {
+
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/vehicleInformation/setpPage/configure.vue',
@@ -873,6 +877,7 @@ export default {
           title: '更多配置'
         });
       }).then((data) => {
+
         var id = data.id;
         this.form[id].vehicleType = data.vehicleType;
         this.form[id].vehicleColor = data.vehicleColor;

smart/src/views/vehicleInformation/setpPage/native.vue

@@ -95,6 +95,7 @@ export default {
           this.Information = data.name;
         }
       }
+      debugger
       this.value = this.checkedData.value;
       console.log("checked data", data, this.checkedData)
       this.Information = this.checkedData.name
@@ -137,9 +138,18 @@ export default {
     }
   },
   created () {
+    debugger
     this.id = this.params.id;
     console.log(this.id);
-    this.Information = this.params.positionInformation[0].positionInformation;
+    this.Information = this.params.positionInformation;
+    this.value = this.params.value;
+    this.checkedData = {
+      name: this.Information,
+      value: this.value,
+      id: "57-592011253-2-4793",
+      parentId: "57-592011253-2"
+
+    }
     this.garage();
   }
 }

smart/src/views/vehicleInformation/setpPage/recharge.vue

@@ -44,10 +44,10 @@
           <el-col :span="24">
             <el-col :span="12">
               <el-col
-                :span="1"
+                :span="0.5"
                 style="content: '*';color: #F56C6C;"
               >*</el-col>
-              <el-col :span="7">充值天数</el-col>
+              <el-col :span="8">充值天数</el-col>
               <el-col :span="15">
                 <el-form-item
                   prop="parkingDays"
@@ -67,7 +67,7 @@
             </el-col>
             <el-col :span="12">
               <el-col :span="8">赠送天数</el-col>
-              <el-col :span="16">
+              <el-col :span="15">
                 <el-select
                   disabled
                   :placeholder='valueselect'
@@ -101,7 +101,10 @@
             </el-col>
           </el-col>
           <el-col :span="24">
-            <el-col :span="5">结束时间</el-col>
+            <el-col
+              :span="4"
+              style="margin-right: 5px;"
+            >结束时间</el-col>
             <el-col :span="18">
               <el-date-picker
                 v-model="value2"
@@ -140,8 +143,11 @@
               :span="0.5"
               style="content: '*';color: #F56C6C;"
             >*</el-col>
-            <el-col :span="4">支付方式</el-col>
-            <el-col :span="18">
+            <el-col
+              :span="4"
+              style="margin-right: -5px;"
+            >支付方式</el-col>
+            <el-col :span="17">
               <el-form-item
                 prop="parkingMethod"
                 ref="againMethod"