From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0

---
 zhitan-vue/src/views/processEnergy/year/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zhitan-vue/src/views/processEnergy/year/index.vue b/zhitan-vue/src/views/processEnergy/year/index.vue
index 93564e0..3f66205 100644
--- a/zhitan-vue/src/views/processEnergy/year/index.vue
+++ b/zhitan-vue/src/views/processEnergy/year/index.vue
@@ -64,7 +64,7 @@
                     {{ scope.row.indexName.substr(0, 9) + "..." }}
                   </span>
                 </el-tooltip>
-                <span v-else>{{ scope.row.indexName }}</span>
+                <span v-else>{{ scope.row.indexName || "--" }}</span>
               </div>
             </template>
           </el-table-column>

--
Gitblit v1.9.3