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/dailyComprehensive/index.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
index 8ef4282..618d690 100644
--- a/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/dailyComprehensive/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"
@@ -131,6 +131,8 @@
energyList.value = response.data
if (response.data && response.data.length !== 0) {
selectChange(response.data[0])
+ } else {
+ lineChartData.value = {}
}
})
}
--
Gitblit v1.9.3