能耗问题修复

src/views/energyManagement/components/electricityQuota.vue

@@ -48,6 +48,7 @@ export default {
       data:[],
       isShowImport:false,
       selectionList: [],
+      query:{},
       option: {
         height: "auto",
         calcHeight: 32,
@@ -78,12 +79,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",
@@ -160,6 +161,7 @@ export default {
             prop: "date",
             type:'date',
             search: true,
+            searchRange: true,
             sortable: true,
             filter: true,
             span: 24,
@@ -324,11 +326,17 @@ export default {
     },
     onLoad() {
       this.loading = true;
+      let param = {
+        ...this.query,
+        startDate:this.query.date && this.query.date.length != 0 && this.query.date[0],
+        endDate:this.query.date && this.query.date.length != 0 && this.query.date[1]
+      }
+      if(param.date) delete param.date
       pageList({
         current:this.page.currentPage,
         size:this.page.pageSize,
         type:2,
-        ...this.query
+        ...param
       }).then(res =>{
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;

src/views/energyManagement/components/electricityTarget.vue

@@ -79,12 +79,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",

src/views/energyManagement/components/waterQuota.vue

@@ -63,12 +63,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",
@@ -152,6 +152,7 @@ export default {
             filter: true,
             span: 24,
             type: 'date',
+            searchRange: true,
             format: "YYYY-MM-DD",
             valueFormat: "YYYY-MM-DD",
             rules: [
@@ -370,11 +371,17 @@ export default {
     },
   onLoad() {
       this.loading = true;
+      let param = {
+        ...this.query,
+        startDate:this.query.date && this.query.date.length != 0 && this.query.date[0],
+        endDate:this.query.date && this.query.date.length != 0 && this.query.date[1]
+      }
+      if(param.date) delete param.date
       pageList({ 
         type: 1, 
         current:this.page.currentPage, 
         size:this.page.pageSize,
-        ...this.query
+        ...param
       }).then(res => {
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;

src/views/energyManagement/components/waterTarget.vue

@@ -85,12 +85,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",
@@ -209,8 +209,11 @@ export default {
     },
 
     
-    closeDialog(){
+    closeDialog(val){
       this.isShowImport = false
+      if(val){
+        this.onLoad()
+      }
     },
     handleImport() {
       this.isShowImport = true

src/views/energyManagement/electricityManagement.vue

@@ -183,7 +183,7 @@ export default {
         delBtnIcon: ' ',
         addBtn: false,
         labelWidth: 120,
-        // searchLabelWidth: 120,
+        searchLabelWidth: "auto",
         menu: true,
         menuWidth: 100,
         dialogWidth: 600,

src/views/energyManagement/energyMonitoring.vue

@@ -102,7 +102,7 @@ export default {
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
-        searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",

src/views/energyManagement/peakFlatValley.vue

@@ -71,6 +71,7 @@ export default {
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
+        searchLabelWidth:"auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",

src/views/energyManagement/waterManagement.vue

@@ -47,7 +47,7 @@ export default {
         delBtnIcon: " ",
         addBtn: false,
         labelWidth: 120,
-        // searchLabelWidth: 80,
+        searchLabelWidth: "auto",
         menu: false,
         menuWidth: 200,
         dialogWidth: 600,