From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/api/energyAnalysis/energyAnalysis.js |   62 +++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/zhitan-vue/src/api/energyAnalysis/energyAnalysis.js b/zhitan-vue/src/api/energyAnalysis/energyAnalysis.js
index 510703c..20f6551 100644
--- a/zhitan-vue/src/api/energyAnalysis/energyAnalysis.js
+++ b/zhitan-vue/src/api/energyAnalysis/energyAnalysis.js
@@ -1,54 +1,78 @@
-import request from '@/utils/request'
+import request from "@/utils/request"
 
 // 鑳借�楀姣斿垎鏋�-鍖哄煙鑳借�楀垎鏋�-鑳借�楄秼鍔�/鍖哄煙鑳借�楃粺璁″垎鏋愯〃-鍒楄〃
 // 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-鑳借�楄秼鍔�/鑳借�楃粺璁″垎鏋愯〃-鍒楄〃
 // 鑳借�楀姣斿垎鏋�-璁惧鑳借�楀垎鏋�-鑳借�楄秼鍔�/鑳借�楃粺璁″垎鏋愯〃-鍒楄〃
 export function listRegion(query) {
   return request({
-    url: '/consumptionanalysis/getByArea',
-    method: 'get',
-    params: query
+    url: "/consumptionanalysis/getByArea",
+    method: "get",
+    params: query,
   })
 }
 // 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-鑳借�楁帓鍚�-鍒楄〃
 // 鑳借�楀姣斿垎鏋�-璁惧鑳借�楀垎鏋�-鑳借�楁帓鍚�-鍒楄〃
 export function listDepartment(query) {
   return request({
-    url: '/consumptionanalysis/getByDepartment',
-    method: 'get',
-    params: query
+    url: "/consumptionanalysis/getByDepartment",
+    method: "get",
+    params: query,
   })
 }
 // 鑳借�楀姣斿垎鏋�-鑳借�楁寚鏍囪�冩牳-鑳借�楄秼鍔�/鍖哄煙鑳借�楃粺璁″垎鏋愯〃
 export function listIndicatorassessment(query) {
   return request({
-    url: '/consumptionanalysis/getPlanAndProdCount',
-    method: 'get',
-    params: query
+    url: "/consumptionanalysis/getPlanAndProdCount",
+    method: "get",
+    params: query,
   })
 }
 // 鑳借�楀姣斿垎鏋�-缁煎悎鑳借�楀垎鏋�-缁煎悎鑳借�楄秼鍔�/鍚勪粙璐ㄨ兘鑰楀崰姣�/鍖哄煙鑳借�楃粺璁″垎鏋愯〃-鍒楄〃
 export function listComprehensive(query) {
   return request({
-    url: '/consumptionanalysis/getComprehensiveEnergy',
-    method: 'get',
-    params: query
+    url: "/consumptionanalysis/getComprehensiveEnergy",
+    method: "get",
+    params: query,
   })
 }
 // 鑳借�楀姣斿垎鏋�-缁煎悎鑳借�楀垎鏋�-鑳借�楀悓姣旂幆姣�-鍒楄〃
 export function listYoY(query) {
   return request({
-    url: '/consumptionanalysis/getYOY',
-    method: 'get',
-    params: query
+    url: "/consumptionanalysis/getYOY",
+    method: "get",
+    params: query,
   })
 }
 // 鑳借�楀姣斿垎鏋�-缁煎悎鑳借�楀垎鏋�-鐢ㄨ兘鍗曞厓鑳借�楁帓鍚�-鍒楄〃
 export function listEnergyRanking(query) {
   return request({
-    url: '/consumptionanalysis/getEnergyRanking',
-    method: 'get',
-    params: query
+    url: "/consumptionanalysis/getEnergyRanking",
+    method: "get",
+    params: query,
   })
 }
 
+// statisticsAnalysis/getFlowCharts
+export function getFlowCharts(query) {
+  return request({
+    url: "/statisticsAnalysis/getFlowCharts",
+    method: "get",
+    params: query,
+  })
+}
+// 瀵规瘮鍒嗘瀽鍚屾瘮
+export function querySameCompareList(query) {
+  return request({
+    url: "/statisticsAnalysis/querySameCompareList",
+    method: "get",
+    params: query,
+  })
+}
+// 瀵规瘮鍒嗘瀽鐜瘮
+export function queryLoopCompareList(query) {
+  return request({
+    url: "/statisticsAnalysis/queryLoopCompareList",
+    method: "get",
+    params: query,
+  })
+}

--
Gitblit v1.9.3