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/comprehensive/yearComprehensive/index.vue | 36 ++++++------------------------------
1 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
index 494e37a..83b06c9 100644
--- a/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/yearComprehensive/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">
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
@@ -69,7 +69,7 @@
</template>
</el-table-column>
<el-table-column v-for="index in 12" :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>
@@ -127,6 +127,8 @@
energyList.value = response.data
if (response.data && response.data.length !== 0) {
selectChange(response.data[0])
+ } else {
+ lineChartData.value = {}
}
})
}
@@ -143,7 +145,7 @@
let title = ""
response.data.forEach((item) => {
expectedData.push(numFilter(item.value))
- actualData.push(item.timeCode.slice(item.timeCode.length - 2, item.timeCode.length) + "鏃�")
+ actualData.push(item.timeCode.slice(item.timeCode.length - 2, item.timeCode.length) + "鏈�")
title = item.indexName + "(" + (item.unitId || "") + ")"
})
@@ -152,32 +154,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