Shannon_mu 3 years ago
parent
commit
787dd32a86

+ 4 - 1
energyManagement/src/views/meterReadingManagement/index.vue

@@ -128,7 +128,10 @@ export default {
         getTypeDate(dateNum) {
         getTypeDate(dateNum) {
             if (!dateNum) return '-';
             if (!dateNum) return '-';
             let da = new Date(Number(dateNum));
             let da = new Date(Number(dateNum));
-            return [da.getFullYear(), da.getMonth() + 1, da.getDate()].join('-');
+            return (
+                [da.getFullYear(), da.getMonth() + 1, da.getDate()].join('-') +
+                [(da.getHours(), da.getMinutes(), da.getSeconds())].join(':')
+            );
         },
         },
         initDate(type) {
         initDate(type) {
             this.mixins_query.date = this.$moment().format(type);
             this.mixins_query.date = this.$moment().format(type);

+ 3 - 3
energyManagement/src/views/settlementAudit/setPage/auditnum.vue

@@ -8,8 +8,8 @@
             </el-select>
             </el-select>
             <zz-doubleInput
             <zz-doubleInput
                 middle="至"
                 middle="至"
-                inputValueStart="currentReading"
-                inputValueEnd="lastReading"
+                inputValueStart="lastReading"
+                inputValueEnd="currentReading"
                 :startPlaceholder="params.type == 1 ? '用水量起度' : '用电量起度'"
                 :startPlaceholder="params.type == 1 ? '用水量起度' : '用电量起度'"
                 :endPlaceholder="params.type == 1 ? '用水量止度' : '用电量止度'"
                 :endPlaceholder="params.type == 1 ? '用水量止度' : '用电量止度'"
                 :query="mixins_query"
                 :query="mixins_query"
@@ -205,7 +205,7 @@ export default {
         this.mixins_dataUrl = '/sc-energy/measurementRecord/page';
         this.mixins_dataUrl = '/sc-energy/measurementRecord/page';
         this.mixins_query = {
         this.mixins_query = {
             planId: this.params.id,
             planId: this.params.id,
-            lastReading:null,
+            lastReading: null,
             currentReading: null,
             currentReading: null,
             status: ''
             status: ''
         };
         };