888

smart/src/views/onSiteVehicles/index.vue

@@ -52,7 +52,8 @@
         scope="scope"
         slot="parkingTime"
       >
-        {{ shijianc( new Date(scope.row.entryTime).getTime()+ scope.row.parkingTime )  }}
+        <!-- {{ shijianc( new Date(scope.row.entryTime).getTime()+ scope.row.parkingTime )  }} -->
+        {{shijianc(scope.row.parkingTime * 60000)}}
       </template>
 
       <template
@@ -189,13 +190,13 @@ export default {
     },
     shijianc (time) {
       var date = new Date(time)
-      var Y = date.getFullYear() + '-'
-      var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
-      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 Y + M + D + h + m + s
+      // var Y = date.getFullYear() + '-'
+      // var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+      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 D + h + m + s
 
     },
   },

smart/src/views/temporaryStopCharge/index.vue

@@ -64,7 +64,11 @@
         scope="scope"
         slot="stopTimes"
       >
-        {{ shijianc(new Date(scope.row.carInTime).getTime() + scope.row.stopTime )  }}
+
+        <!-- {{ shijianc( new Date(scope.row.carInTime).getTime() +  scope.row.stopTime )  }} -->
+        {{ shijianc( new Date(scope.row.carInTime).getTime() +  (scope.row.stopTime*60000) )  }}
+        <!-- + scope.row.stopTime -->
+        <!-- new Date(scope.row.carInTime).getTime() -->
       </template>
       <template
         scope="scope"