From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/views/energyanalysis/equipment/equipment.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/zhitan-vue/src/views/energyanalysis/equipment/equipment.vue b/zhitan-vue/src/views/energyanalysis/equipment/equipment.vue
index c0c200e..7f1d585 100644
--- a/zhitan-vue/src/views/energyanalysis/equipment/equipment.vue
+++ b/zhitan-vue/src/views/energyanalysis/equipment/equipment.vue
@@ -115,9 +115,10 @@
</template>
<script setup name="equipment">
-import { listRegion, listDepartment } from "@/api/energyAnalysis/energyAnalysis"
+import { listDepartment } from "@/api/energyAnalysis/energyAnalysis"
import { listEnergyTypeList } from "@/api/modelConfiguration/energyType"
import * as echarts from "echarts"
+import request from "@/utils/request"
const { proxy } = getCurrentInstance()
const { period } = proxy.useDict("period")
import { useRoute } from "vue-router"
@@ -183,12 +184,16 @@
// }
const myChart1 = echarts.init(document.getElementById("Chart1"))
// const myChart2 = echarts.init(document.getElementById("Chart2"));
- listRegion(
- proxy.addDateRange({
+
+ // 淇敼涓虹洿鎺ヨ皟鐢╟onsumptionanalysis/getByArea鎺ュ彛
+ request({
+ url: "/consumptionanalysis/getByArea",
+ method: "get",
+ params: proxy.addDateRange({
...queryParams.value,
...query.value,
})
- ).then((res) => {
+ }).then((res) => {
if (!!res.code && res.code == 200) {
loading.value = false
let xdata = []
@@ -551,7 +556,7 @@
// 鑳借�楀姣斿垎鏋�-璁惧鑳借�楀垎鏋�-瀵煎嚭
function handleExport() {
proxy.download(
- "consumptionanalysis/energyExport",
+ "consumptionanalysis/getByArea/export",
{
...queryParams.value,
...query.value,
--
Gitblit v1.9.3