能源管理

energyManagement/src/components/common/doubleInput.vue

@@ -103,7 +103,7 @@ export default {
         leave(e) {
             this.clearableStaus(false);
         },
-         //验证清空按钮
+        //验证清空按钮
         clearableStaus(isstatus) {
             if (isstatus !== undefined) {
                 if (isstatus && !!this.ValueStart && !!this.ValueEnd) {
@@ -121,8 +121,8 @@ export default {
         },
         //清除回调input焦点事件
         clearValue() {
-            this.query[this.inputValueStart] = '';
-            this.query[this.inputValueEnd] = '';
+            this.query[this.inputValueStart] = null;
+            this.query[this.inputValueEnd] = null;
             this.clearables = false;
             this.$refs.startInput.focus();
         },
@@ -159,6 +159,9 @@ export default {
     position: relative;
     margin-right: 20px;
     top: 2px;
+    input {
+        color: #606266;
+    }
     &.focus {
         border-color: $mainTextColor;
     }

energyManagement/src/views/settlementAudit/electricityAudit.vue

@@ -123,7 +123,7 @@ export default {
                 arr = ['', ''];
             }
             this.mixins_query.clearingStartDate = arr[0];
-            this.mixins_query.clearingEndDate = arr[1];
+            this.mixins_query.clearingEndDate = arr[1] + 'T23:59:59';
         },
         lookPage(row) {
             this.showDialog = true;

energyManagement/src/views/settlementAudit/setPage/auditnum.vue

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

energyManagement/src/views/settlementAudit/waterAudit.vue

@@ -123,7 +123,7 @@ export default {
                 arr = ['', ''];
             }
             this.mixins_query.clearingStartDate = arr[0];
-            this.mixins_query.clearingEndDate = arr[1];
+            this.mixins_query.clearingEndDate = arr[1] +'T23:59:59';
         },
         lookPage(row) {
             this.showDialog = true;