From 24e65b1e9c6aa65f7784ff5b4cb3a47d6d73af89 Mon Sep 17 00:00:00 2001
From: letsgocoding <sdxt_0802@163.com>
Date: 星期三, 12 三月 2025 17:39:14 +0800
Subject: [PATCH] !108 !107 网关标识 Merge pull request !108 from letsgocoding/develop1.0
---
zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue | 33 ++++-----------------------------
1 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
index c63c0fe..cc43f28 100644
--- a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
@@ -33,7 +33,7 @@
</el-form>
</div>
- <div class="table-bg-style">
+ <div class="table-bg-style" style="padding-bottom: 12px">
<div class="table-box">
<el-table :data="energyList" v-loading="loading" border max-height="380px">
<el-table-column fixed prop="indexName" label="鎸囨爣鍚嶇О" width="210px">
@@ -69,10 +69,9 @@
</template>
</el-table-column>
<el-table-column v-for="index in 31" :key="index" :label="index + '鏃�'" align="center" min-width="100">
- <template #default="scope">{{ numFilter(scope.row[`value${index - 1}`]) }}</template>
+ <template #default="scope">{{ numFilter(scope.row[`value${index}`]) }}</template>
</el-table-column>
</el-table>
-
<div>
<line-chart ref="LineChartRef" :chartData="lineChartData" />
</div>
@@ -127,6 +126,8 @@
energyList.value = response.data.tabledata
if (energyList.value && energyList.value.length !== 0) {
selectChange(energyList.value[0])
+ } else {
+ lineChartData.value = {}
}
})
}
@@ -149,32 +150,6 @@
console.log(expectedData)
lineChartData.value = {
- // xData: [
- // "0鏃�",
- // "1鏃�",
- // "2鏃�",
- // "3鏃�",
- // "4鏃�",
- // "5鏃�",
- // "6鏃�",
- // "7鏃�",
- // "8鏃�",
- // "9鏃�",
- // "10鏃�",
- // "11鏃�",
- // "12鏃�",
- // "13鏃�",
- // "14鏃�",
- // "15鏃�",
- // "16鏃�",
- // "17鏃�",
- // "18鏃�",
- // "19鏃�",
- // "20鏃�",
- // "21鏃�",
- // "22鏃�",
- // "23鏃�",
- // ],
xData: actualData,
yData: expectedData,
title,
--
Gitblit v1.9.3