From eda538f5144066f4f0af8da045f69031e6de47f6 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期五, 18 四月 2025 11:28:29 +0800
Subject: [PATCH] Merge pull request #66 from zhitan-cloud/develop1.0

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

diff --git a/zhitan-vue/src/views/processEnergy/year/index.vue b/zhitan-vue/src/views/processEnergy/year/index.vue
index b43a3b2..3f66205 100644
--- a/zhitan-vue/src/views/processEnergy/year/index.vue
+++ b/zhitan-vue/src/views/processEnergy/year/index.vue
@@ -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"
@@ -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