From c1e84751e36ec694dcc58e968ff6e2b2e43569fb Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 23 Feb 2024 17:22:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80(?=
 =?UTF-8?q?=E6=B2=99=E6=B9=96)BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/fourEngin/sourse/leftTop.vue | 126 ++++++++++--------
 .../fourEngin/sourse/rightTop.vue             |   7 +-
 2 files changed, 77 insertions(+), 56 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
index 8a4f6f45..14376599 100644
--- a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
@@ -4,12 +4,29 @@
       <div class="person">
         <div class="typeName">材料类别</div>
         <div>
-          <el-select v-model="typeId" placeholder="请选择" @change="checkTypes" style="background: transparent; width: 120px">
-            <el-option v-for="item in typesList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+          <el-select
+            v-model="typeId"
+            placeholder="请选择"
+            @change="checkTypes"
+            style="background: transparent; width: 120px"
+          >
+            <el-option
+              v-for="item in typesList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
           </el-select>
         </div>
         <div style="margin-left: 20px" class="curs">
-          <el-date-picker v-model="checkDate" type="month" value-format="yyyy-MM" placeholder="选择月" @change="timeChange">
+          <el-date-picker
+            v-model="checkDate"
+            type="month"
+            value-format="yyyy-MM"
+            placeholder="选择月"
+            @change="timeChange"
+          >
           </el-date-picker>
         </div>
       </div>
@@ -36,84 +53,87 @@
 </template>
 
 <script>
-import bus from '@/util/eventBus.js'
-import Card from '../components/Card.vue'
+import bus from "@/util/eventBus.js";
+import Card from "../components/Card.vue";
 import {
   getMaterialTypeApi, //查询类别
-  getDetailsStatisticsApi //查询年月
-} from '@/assets/js/api/zhongjianFourth.js'
+  getDetailsStatisticsApi, //查询年月
+} from "@/assets/js/api/zhongjianFourth.js";
+import moment from "moment";
 export default {
   components: { Card },
   data() {
     return {
       messageList: {},
-      sn: '',
+      sn: "",
       typesList: [],
       dateList: [],
-      typeValue: '',
-      checkDate: '',
-      typeId: ''
-    }
+      typeValue: "",
+      checkDate: "",
+      typeId: "",
+    };
   },
   mounted() {
-    bus.$on('selectRightTypeId', typeId => {
-      this.typeId = typeId
-      this.getData()
-    })
-    bus.$on('timeYear', yearTime => {
-      this.checkDate = yearTime
-      this.getData()
-    })
-    this.getList()
+    bus.$on("selectRightTypeId", (typeId) => {
+      this.typeId = typeId;
+      this.getData();
+    });
+    bus.$on("timeYear", (yearTime) => {
+      this.checkDate = yearTime;
+      this.getData();
+    });
+    this.getList();
   },
   methods: {
     //时间切换
     timeChange(val) {
-      bus.$emit('timeMoth', val)
-      this.getData()
+      bus.$emit("timeMoth", val);
+      this.getData();
     },
     //类型切换
     checkTypes(val) {
-      bus.$emit('selectLeftTypeId', val)
-      this.getData()
+      bus.$emit("selectLeftTypeId", val);
+      this.getData();
     },
 
     //查询材料类别
     getList() {
-      this.sn = this.$store.state.projectSn
-      getMaterialTypeApi({ projectSn: this.sn }).then(res => {
-        this.typesList = res.result
+      this.sn = this.$store.state.projectSn;
+      getMaterialTypeApi({ projectSn: this.sn }).then((res) => {
+        this.typesList = res.result;
         if (res.result.length >= 1) {
-          if (COMPANY == 'pssh') {
-            this.typeId = res.result[0].id
+          if (COMPANY == "pssh") {
+            this.typeId = res.result[0].id;
           } else {
-            res.result.forEach(element => {
-              if (element.name === '混凝土(m³)') {
-                this.typeId = element.id
+            res.result.forEach((element) => {
+              if (element.name === "幕墙(㎡)") {
+                this.typeId = element.id;
               }
-            })
+            });
           }
-
-          this.checkDate = '2023-01'
-          this.getData()
+          const currentDate = new Date(); // 创建一个表示当前日期的对象
+          // 设置为本年的第一天（1月1号）
+          currentDate.setMonth(0);
+          this.checkDate = moment(currentDate).format("YYYY-MM");
+          this.getData();
         }
 
-        console.log('查询材料类别', res)
-      })
+        console.log("查询材料类别", res);
+      });
     },
     //查询年月材料明细
     getData() {
       getDetailsStatisticsApi({
         date: this.checkDate,
-        typeId: this.typeId
-      }).then(res => {
-        console.log('查询年月', res)
-        this.dateList = res.result
-        this.messageList = res.result
-      })
-    }
-  }
-}
+        typeId: this.typeId,
+      }).then((res) => {
+        console.log("查询年月", res);
+        this.dateList = res.result;
+        this.messageList = res.result;
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -232,7 +252,7 @@ export default {
     }
     .blueline::after {
       position: absolute;
-      content: '';
+      content: "";
       width: 30px;
       height: 2px;
       border-radius: 10%;
@@ -283,7 +303,7 @@ export default {
   .photovoltaicOne {
     width: 180px;
     height: 130px;
-    background-image: url('../assets/images/carbon/kwh1.png');
+    background-image: url("../assets/images/carbon/kwh1.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     text-align: center;
@@ -291,7 +311,7 @@ export default {
   .photovoltaicTwo {
     width: 180px;
     height: 130px;
-    background-image: url('../assets/images/carbon/kwh2.png');
+    background-image: url("../assets/images/carbon/kwh2.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     margin-left: 100px;
@@ -301,7 +321,7 @@ export default {
     margin-top: 40px;
     width: 180px;
     height: 130px;
-    background-image: url('../assets/images/carbon/kwh4.png');
+    background-image: url("../assets/images/carbon/kwh4.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     text-align: center;
@@ -310,7 +330,7 @@ export default {
     margin-top: 40px;
     width: 180px;
     height: 130px;
-    background-image: url('../assets/images/carbon/kwh3.png');
+    background-image: url("../assets/images/carbon/kwh3.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     margin-left: 100px;
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
index 9200265c..c3f624e4 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
@@ -61,7 +61,7 @@ import {
 import {
   getMaterialTypeApi //查询类别
 } from '@/assets/js/api/zhongjianFourth.js'
-
+import moment from "moment";
 export default {
   components: {
     Card
@@ -379,12 +379,13 @@ export default {
             this.typeId = res.result[0].id
           } else {
             res.result.forEach(element => {
-              if (element.name === '混凝土(m³)') {
+              if (element.name === '幕墙(㎡)') {
                 this.typeId = element.id
               }
             })
           }
-          this.checkDate = '2023'
+          const currentDate = new Date(); // 创建一个表示当前日期的对象
+          this.checkDate = moment(currentDate).format("YYYY");
           this.getgetPassConsumeRatioList()
           this.isblock = true
         }