From faffdeae0aafda3cda625b0a3d1dedf716dca3db Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Tue, 23 Jan 2024 16:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataStatistics/carbon.vue          | 53 ++++++++++++-------
 src/views/dataStatistics/carbonIntensity.vue | 49 +++++++++--------
 src/views/dataStatistics/carbonTrend.vue     | 55 ++++++++++----------
 3 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/src/views/dataStatistics/carbon.vue b/src/views/dataStatistics/carbon.vue
index e540850..6f8a5ce 100644
--- a/src/views/dataStatistics/carbon.vue
+++ b/src/views/dataStatistics/carbon.vue
@@ -19,12 +19,26 @@
           :model="searchForm"
           label-width="120px"
           style="border: 0px solid red; margin-bottom: 8px"
-        >
+        > 
           <el-row>
+            <el-col :span="2.5">
+              <el-date-picker
+                :clearable="false"
+                class="search-picker"
+                v-model="searchForm.currentYear"
+                format="yyyy"
+                value-format="yyyy"
+                type="year"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-col>
             <el-col style="margin-left: 18px" :span="3.5">
               <el-button class="search" @click="searchHandle(0)"
                 >查询</el-button
               >
+              <el-button class="reset" @click="searchHandle(1)"
+                >重置</el-button
+              >
             </el-col>
           </el-row>
         </el-form>
@@ -81,7 +95,7 @@ export default {
       },
       // 搜索
       searchForm: {
-        name: "",
+        currentYear:null,
       },
       searchText: {
         flag: 3,
@@ -220,9 +234,9 @@ export default {
     };
   },
   mounted() {
-    if (JSON.stringify(this.$store.state.client.supplierParams) !== "{}") {
-      this.searchForm = this.$store.state.client.supplierParams;
-    }
+    // if (JSON.stringify(this.$store.state.client.supplierParams) !== "{}") {
+    //   this.searchForm = this.$store.state.client.supplierParams;
+    // }
     this.onLoad();
   },
   methods: {
@@ -236,20 +250,20 @@ export default {
       this.onLoad();
     },
     // 搜索
-    searchHandle(item, index) {
-      this.page.current = 1;
-      if (index === 1) {
-        this.searchForm = {
-          name: "",
-        };
+    searchHandle(val) {
+      if (val == 0) {
+        this.onLoad()
       } else {
-        this.searchForm = item;
+        this.searchForm = {
+          currentYear:null
+        }
+        this.onLoad()
       }
-      this.onLoad();
-      this.$store.dispatch("changeSetting", {
-        title: "supplierParams",
-        form: this.searchForm,
-      });
+      // this.onLoad();
+      // this.$store.dispatch("changeSetting", {
+      //   title: "supplierParams",
+      //   form: this.searchForm,
+      // });
     },
     // 新增
     addHandle() {
@@ -259,7 +273,7 @@ export default {
     onLoad() {
       this.loading = true;
       const { current, size } = this.page;
-      getCarborList( Object.assign({ current, size })).then((res) => {
+      getCarborList({current:this.page.current,size:this.page.size,...this.searchForm}).then((res) => {
         const {records,total} = res.data.data
         this.data = records
         this.page.total = total
@@ -407,6 +421,9 @@ export default {
   height: 46px;
   border-radius: 0;
   margin-left: 10px;
+  /deep/ .el-input__inner{
+    height: 100% !important;
+  }
 }
 .search-select {
   width: 240px !important;
diff --git a/src/views/dataStatistics/carbonIntensity.vue b/src/views/dataStatistics/carbonIntensity.vue
index 74b2e14..f32a29b 100644
--- a/src/views/dataStatistics/carbonIntensity.vue
+++ b/src/views/dataStatistics/carbonIntensity.vue
@@ -21,10 +21,20 @@
           style="border: 0px solid red; margin-bottom: 8px"
         >
           <el-row>
+            <el-col :span="2.5">
+              <el-date-picker
+                :clearable="false"
+                class="search-picker"
+                v-model="searchForm.currentMonth"
+                type="month"
+                placeholder="选择日期"
+                format="yyyy-MM"
+                value-format="yyyy-MM">
+              </el-date-picker>
+            </el-col>
             <el-col style="margin-left: 18px" :span="3.5">
-              <el-button class="search" @click="searchHandle(0)"
-                >查询</el-button
-              >
+              <el-button class="search" @click="searchHandle(0)">查询</el-button>
+              <el-button class="reset" @click="searchHandle(1)">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
@@ -81,7 +91,7 @@ export default {
       },
       // 搜索
       searchForm: {
-        name: "",
+       currentMonth: null,
       },
       searchText: {
         flag: 3,
@@ -154,9 +164,9 @@ export default {
     };
   },
   mounted() {
-    if (JSON.stringify(this.$store.state.client.supplierParams) !== "{}") {
-      this.searchForm = this.$store.state.client.supplierParams;
-    }
+    // if (JSON.stringify(this.$store.state.client.supplierParams) !== "{}") {
+    //   this.searchForm = this.$store.state.client.supplierParams;
+    // }
     this.onLoad();
   },
   methods: {
@@ -170,20 +180,15 @@ export default {
       this.onLoad();
     },
     // 搜索
-    searchHandle(item, index) {
-      this.page.current = 1;
-      if (index === 1) {
+    searchHandle(val) {
+      if(val == 0){
+        this.onLoad()
+      }else{
         this.searchForm = {
-          name: "",
-        };
-      } else {
-        this.searchForm = item;
+          currentMonth:null
+        }
+        this.onLoad()
       }
-      this.onLoad();
-      this.$store.dispatch("changeSetting", {
-        title: "supplierParams",
-        form: this.searchForm,
-      });
     },
     // 新增
     addHandle() {
@@ -192,8 +197,7 @@ export default {
 
     onLoad() {
       this.loading = true;
-      const { current, size } = this.page;
-      getIntensity( Object.assign({ current, size })).then((res) => {
+      getIntensity({current:this.page.current,size:this.page.size,...this.searchForm}).then((res) => {
         const {records,total} = res.data.data
         this.data = records
         this.page.total = total
@@ -338,6 +342,9 @@ export default {
   height: 46px;
   border-radius: 0;
   margin-left: 10px;
+  /deep/ .el-input__inner{
+    height: 100% !important;
+  }
 }
 .search-select {
   width: 240px !important;
diff --git a/src/views/dataStatistics/carbonTrend.vue b/src/views/dataStatistics/carbonTrend.vue
index 26fabd4..485a577 100644
--- a/src/views/dataStatistics/carbonTrend.vue
+++ b/src/views/dataStatistics/carbonTrend.vue
@@ -21,21 +21,22 @@
           style="border: 0px solid red; margin-bottom: 8px"
         >
           <el-row>
-            <!-- <el-col :span="2.5">
-              <el-select
-                v-model="searchForm.status"
-                class="search-select"
-                placeholder="请选择状态"
-              >
-                <el-option label="启用" :value="1"></el-option>
-                <el-option label="停用" :value="0"></el-option>
-              </el-select>
-            </el-col> -->
+            <el-col :span="2.5">
+              <el-date-picker
+                :clearable="false"
+                class="search-picker"
+                v-model="searchForm.currentMonth"
+                type="month"
+                placeholder="选择日期"
+                format="yyyy-MM"
+                value-format="yyyy-MM">
+              </el-date-picker>
+            </el-col>
             <el-col style="margin-left: 18px" :span="3.5">
               <el-button class="search" @click="searchHandle(0)"
                 >查询</el-button
               >
-              <!-- <el-button class="reset" @click="searchHandle(1)">重置</el-button> -->
+              <el-button class="reset" @click="searchHandle(1)">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
@@ -92,7 +93,7 @@ export default {
       },
       // 搜索
       searchForm: {
-        name: "",
+       currentMonth: null,
       },
       searchText: {
         flag: 3,
@@ -165,9 +166,9 @@ export default {
     };
   },
   mounted() {
-    if (JSON.stringify(this.$store.state.client.supplierParams) !== "{}") {
-      this.searchForm = this.$store.state.client.supplierParams;
-    }
+    // if (JSON.stringify(this.$store.state.client.supplierParams) !== "{}") {
+    //   this.searchForm = this.$store.state.client.supplierParams;
+    // }
     this.onLoad();
   },
   methods: {
@@ -181,20 +182,15 @@ export default {
       this.onLoad();
     },
     // 搜索
-    searchHandle(item, index) {
-      this.page.current = 1;
-      if (index === 1) {
+    searchHandle(val) {
+      if(val == 0){
+        this.onLoad()
+      }else{
         this.searchForm = {
-          name: "",
-        };
-      } else {
-        this.searchForm = item;
+          currentMonth:null
+        }
+        this.onLoad()
       }
-      this.onLoad();
-      this.$store.dispatch("changeSetting", {
-        title: "supplierParams",
-        form: this.searchForm,
-      });
     },
     // 新增
     addHandle() {
@@ -204,7 +200,7 @@ export default {
     onLoad() {
       this.loading = true;
       const { current, size } = this.page;
-      getTrendList( Object.assign({ current, size })).then((res) => {
+      getTrendList({current:this.page.current,size:this.page.size,...this.searchForm}).then((res) => {
         const {records,total} = res.data.data
         this.data = records
         this.page.total = total
@@ -354,6 +350,9 @@ export default {
   height: 46px;
   border-radius: 0;
   margin-left: 10px;
+  /deep/ .el-input__inner{
+    height: 100% !important;
+  }
 }
 .search-select {
   width: 240px !important;