From c89dd113d8573a10a9e666785b8be5d4c3ef511d Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期一, 24 二月 2025 15:05:27 +0800
Subject: [PATCH] Merge branch 'develop1.0' into develop_alioo

---
 zhitan-vue/src/views/poweranalysis/perPassu/index.vue |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
index 8780f40..a639577 100644
--- a/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
+++ b/zhitan-vue/src/views/poweranalysis/perPassu/index.vue
@@ -46,11 +46,11 @@
                 鐜瘮
               </el-button>
             </el-form-item> -->
-            <el-form-item>
+            <!-- <el-form-item>
               <el-button type="primary" icon="Download" @click="handleExport">
                 瀵煎嚭
               </el-button>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
         </div>
         <div style="
@@ -86,7 +86,7 @@
                   '(' +
                   queryParams.muid +
                   ')'
-                  " align="center" key="compareValue" prop="compareValue" :show-overflow-tooltip="true" />
+                  " align="center" key="contrastValues" prop="contrastValues" :show-overflow-tooltip="true" />
                 <el-table-column :label="(queryParams.analysisType == 'YOY' ? '鍚�' : '鐜�') + '姣�(%)'
                   " align="center" key="ratio" prop="ratio" :show-overflow-tooltip="true" width="200" />
               </el-table>
@@ -104,6 +104,7 @@
 import {
   listRegion,
   listDepartment,
+  queryLoopCompareList,
 } from "@/api/energyAnalysis/energyAnalysis";
 import { listEnergyTypeList } from "@/api/modelConfiguration/energyType";
 import * as echarts from "echarts";
@@ -127,6 +128,7 @@
     timeType: null,
     dataTime: null,
     analysisType: "MOM",
+    timeCode: null,
     energyType: null,
   },
   query: {
@@ -149,7 +151,13 @@
 }
 function handleTimeType(e) {
   queryParams.value.timeType = e;
-  queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD");
+  if(e=='MONTH'){
+    queryParams.value.timeCode = proxy.dayjs(new Date()).format("YYYY-MM");
+  }else if(e=='YEAR'){
+    queryParams.value.timeCode = proxy.dayjs(new Date()).format("YYYY");
+  }else{
+    queryParams.value.timeCode = proxy.dayjs(new Date()).format("YYYY-MM-DD");
+  }
 }
 function handleEnergyType(item) {
   queryParams.value.enername = item.enername;
@@ -172,7 +180,7 @@
   // }
   const myChart1 = echarts.init(document.getElementById("Chart1"));
   // const myChart2 = echarts.init(document.getElementById("Chart2"));
-  listRegion(
+  queryLoopCompareList(
     proxy.addDateRange({
       ...queryParams.value,
       ...query.value,
@@ -184,11 +192,11 @@
       let yvalue = [];
       let ycompareValue = [];
       let yqoq = [];
-      if (!!res.data.chartDataList) {
-        res.data.chartDataList.map((item) => {
+      if (!!res.data) {
+        res.data.map((item) => {
           xdata.push(
             proxy
-              .dayjs(item.xdata)
+              .dayjs(item.currentTime)
               .format(
                 queryParams.value.timeType == "YEAR"
                   ? "MM鏈�"
@@ -197,9 +205,9 @@
                     : "HH鏃�"
               )
           );
-          yvalue.push(!!item.yvalue ? item.yvalue : 0);
-          ycompareValue.push(!!item.ycompareValue ? item.ycompareValue : 0);
-          yqoq.push(!!item.yqoq ? item.yqoq : 0);
+          yvalue.push(!!item.currentValue ? item.currentValue : 0);
+          ycompareValue.push(!!item.contrastValues ? item.contrastValues : 0);
+          yqoq.push(!!item.ratio ? item.ratio : 0);
         });
       }
       setTimeout(() => {
@@ -399,7 +407,7 @@
           ],
         });
       }, 100);
-      departmentList.value = !!res.data.dataList ? res.data.dataList : [];
+      departmentList.value = !!res.data ? res.data : [];
       window.addEventListener(
         "resize",
         () => {
@@ -566,7 +574,7 @@
   queryParams.value.energyType = energyTypeList.value[0].enersno;
   queryParams.value.enername = energyTypeList.value[0].enername;
   queryParams.value.muid = energyTypeList.value[0].muid;
-  queryParams.value.analysisType = "YOY";
+  queryParams.value.analysisType = "MOM";
   handleQuery();
 }
 // 鑳借�楀姣斿垎鏋�-瀵煎嚭

--
Gitblit v1.9.3