44444

smart/src/views/accessRecord/index.vue

@@ -29,6 +29,7 @@
         end-placeholder="结束日期"
         @change="timeToggle"
         :editable="false"
+        v-model="startTime"
       ></el-date-picker>
       <!-- @click="mixins_search" -->
       <el-button
@@ -78,6 +79,7 @@ export default {
       mixins_post: 'post',
       nameParkingLot: [],
       parkName: '',
+      startTime: '',
       mixins_pageset: {
         total: 0,
         pageIndex: 1,
@@ -88,12 +90,26 @@ export default {
     }
   },
   methods: {
+    timeToggle (e) {
+      debugger
+      console.log(e);
+      let start = '00:00:00',
+        end = '23:59:59';
+      if (!!e) {
+        this.mixins_query.startTime = `${e[0]} ${start}`;
+        this.mixins_query.endTime = `${e[1]} ${end}`;
+      } else {
+        this.mixins_query.startTime = null;
+        this.mixins_query.endTime = null;
+      }
+      // console.log(this.startTime);
+    },
     parkingLot (name) {
       this.parkName = name;
     },
     pageChange (obj) {
       if (obj.pageSize) {
-        debugger;
+        // debugger;
         this.mixins_pageset.pageSize = obj.pageSize;
       }
       if (obj.page) {
@@ -107,7 +123,7 @@ export default {
         this.$message.error('请选择停车场');
       } else {
         this.mixins_dataUrl = '/sc-community-web/parkingCar/findOutInInfo';
-        this.mixins_query = { parkId: this.mixins_query.parkId, parkName: this.parkName };
+        this.mixins_query = { parkId: this.mixins_query.parkId, parkName: this.parkName, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime };
         this.mixins_search();
       }
 

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

@@ -8,10 +8,9 @@
           arrow="always"
         >
           <el-carousel-item
-            v-for="item in 4"
+            v-for="item in vehiclePicture"
             :key="item"
           >
-            <h3>{{ item }}</h3>
           </el-carousel-item>
         </el-carousel>
       </div>
@@ -86,6 +85,7 @@ export default {
         //   label: '服务到期长抬进出'
         // }
       ],
+      vehiclePicture: []
     }
   },
   created () {
@@ -117,6 +117,8 @@ export default {
                     : this.params.row.passType == 8 ? '远程放行'
                       : '相机缓慢放行';
 
+    this.vehiclePicture.push(this.params.row.imgName)
+
   }
 }
 </script>

smart/src/views/onSiteVehicles/index.vue

@@ -53,7 +53,8 @@
         slot="parkingTime"
       >
         <!-- {{ shijianc( new Date(scope.row.entryTime).getTime()+ scope.row.parkingTime )  }} -->
-        {{shijianc((scope.row.parkingTime * 60000))}}
+        <!-- {{shijianc((scope.row.parkingTime * 60000))}} -->
+        {{shijianc((scope.row.parkingTime))}}
       </template>
 
       <template
@@ -188,18 +189,25 @@ export default {
       }
 
     },
-    shijianc (time) {
-      console.log(time);
-      var date = new Date(time)
-      var Y = date.getFullYear();
-      var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
-      // (Y * 365) + (M * 30)
-      // var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '天'
-      var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate())
-      var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + '小时'
-      var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + '分钟'
-      var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()) + '秒'
-      return (((Number(Y) - 1970) * 365) + ((Number(M) - 1) * 30) + Number(D)) + '天' + h + m
+    shijianc (countTime) {
+
+      // var D = parseInt((tiem)/60/24)
+      let day = parseInt(countTime / 60 / 24);
+      let hr = parseInt(countTime / 60 % 24);
+      let min = parseInt(countTime % 60);
+      return day + '天' + hr + '小时' + min + '分钟'
+      // var date = new Date(time)
+      // var Y = date.getFullYear();
+      // var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth()) : date.getMonth());
+      // // (Y * 365) + (M * 30)
+      // // var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '天'
+      // var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate())
+      // var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + '小时'
+      // var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + '分钟'
+      // // var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()) + '秒'
+      // // console.log(Y, M, D, h, m);
+      // // return (((Number(Y) - 1970) * 365) + ((Number(M) - 1) * 30) + Number(D-1)) + '天' + h + m
+      // return (((Number(Y) - 1970) * 365) + ((Number(M)) * 30) + Number(D)) + '天' + h + m
 
     },
   },

smart/src/views/rechargeRecord/index.js

@@ -56,13 +56,14 @@ export default {
                 },
                 {
                     label: '充值时段',
-                    prop: 'payTime'
+                    prop: 'endTime',
+                    slot: 'endTimes'
                 },
                 {
                     label: '收费金额',
                     prop: 'amount',
                     format(val) {
-                        return val / 100 + '元';
+                        return (Number(val) / 100).toFixed(2);
                     }
                 },
                 {

smart/src/views/rechargeRecord/index.vue

@@ -29,7 +29,7 @@
         end-placeholder="充值时间"
         @change="timeToggle"
         :editable="false"
-        v-model="parkingTime"
+        v-model="mixins_query.parkingTime"
       ></el-date-picker>
       <!--  -->
       <el-button
@@ -60,6 +60,13 @@
       @page-change="pageChange"
       @selection-change="selectionChange"
     >
+      <template
+        scope="scope"
+        slot="endTimes"
+      >
+        {{scope.row.startTime  + '-' +scope.row.endTime}}
+
+      </template>
       <template
         slot-scope="scope"
         slot="opt"
@@ -96,7 +103,7 @@ export default {
   },
   methods: {
     exportExcel () {
-      this.__exportExcel('/sc-community-web/parkingCar/getChargeInfoExcel');
+      this.__exportExcel('/sc-community-web/parkingCar/getChargeInfoExcel', { parkId: this.mixins_query.parkId, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime });
     },
     timeToggle (e) {
       console.log(e);

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

@@ -59,10 +59,10 @@ export default {
         }
       ],
       rechargeDetails: [
-        {
-          name: '收费类型',
-          label: '-'//0
-        },
+        // {
+        //   name: '收费类型',
+        //   label: '-'//0
+        // },
         {
           name: '订单状态',
           label: '成功'//1
@@ -117,27 +117,28 @@ export default {
                     : this.params.row.carType == 8 ? '员工卡' : '--';
     this.interiorCar[4].label = this.params.row.tel;
 
-    debugger
+
     // ruleName
     // this.rechargeDetails[0].label = this.params.row.ruleName;
-    this.rechargeDetails[0].label = this.params.row.carType == 0 ? '临时车'
-      : this.params.row.carType == 1 ? 'VIP车'
-        : this.params.row.carType == 2 ? '月租车'
-          : this.params.row.carType == 3 ? '充时车'
-            : this.params.row.carType == 4 ? '时租车'
-              : this.params.row.carType == 5 ? '产权车'
-                : this.params.row.carType == 6 ? '计次车'
-                  : this.params.row.carType == 7 ? '贵宾卡'
-                    : this.params.row.carType == 8 ? '员工卡' : '-';
-    this.rechargeDetails[2].label = (this.params.row.chargeNumber + '月');
-    this.rechargeDetails[3].label = (this.params.row.credit + '月') || '-';
+    // this.rechargeDetails[0].label = this.params.row.carType == 0 ? '临时车'
+    //   : this.params.row.carType == 1 ? 'VIP车'
+    //     : this.params.row.carType == 2 ? '月租车'
+    //       : this.params.row.carType == 3 ? '充时车'
+    //         : this.params.row.carType == 4 ? '时租车'
+    //           : this.params.row.carType == 5 ? '产权车'
+    //             : this.params.row.carType == 6 ? '计次车'
+    //               : this.params.row.carType == 7 ? '贵宾卡'
+    //                 : this.params.row.carType == 8 ? '员工卡' : '-';
+
+    this.rechargeDetails[1].label = (this.params.row.chargeNumber + '月');
+    this.rechargeDetails[2].label = (this.params.row.credit + '月') || '-';
     // payTime
-    this.rechargeDetails[4].label = this.params.row.payTime;
-    this.rechargeDetails[6].label = this.params.row.remark || '-';
-    this.rechargeDetails[7].label = this.params.row.orderNo;
-    this.rechargeDetails[8].label = this.params.row.payTime;
+    this.rechargeDetails[3].label = this.params.row.payTime;
+    this.rechargeDetails[5].label = this.params.row.remark || '-';
+    this.rechargeDetails[6].label = this.params.row.orderNo;
+    this.rechargeDetails[7].label = this.params.row.payTime;
     // opreatName
-    this.rechargeDetails[10].label = this.params.row.opreatName;
+    this.rechargeDetails[9].label = this.params.row.opreatName;
   }
 }
 

smart/src/views/temporaryStopCharge/index.js

@@ -57,7 +57,10 @@ export default {
                 },
                 {
                     label: '支付总额（元）',
-                    prop: 'amount'
+                    prop: 'amount',
+                    format(val) {
+                        return val.toFixed(2);
+                    }
                 },
                 {
                     label: '支付时间',

smart/src/views/vehicleInformation/index.vue

@@ -205,7 +205,7 @@ export default {
       }
     },
     exportExcel () {
-      this.__exportExcel('/sc-community-web/parkingCar/getCarInfoExcel');
+      this.__exportExcel('/sc-community-web/parkingCar/getCarInfoExcel', this.mixins_query);
     },
     details (row) {
       // 添加

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

@@ -208,8 +208,11 @@
           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">