From ae3ed96916c730608ab0b8b905942ed45fe1bbe2 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Mon, 30 Dec 2024 11:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E8=A7=88=E5=9B=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/home/home.vue           | 3 ---
 ui/dasadmin/src/views/backend/home/windMatrixpage.vue | 9 +++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue
index aa845e02..1308e4a3 100644
--- a/ui/dasadmin/src/views/backend/home/home.vue
+++ b/ui/dasadmin/src/views/backend/home/home.vue
@@ -10,9 +10,6 @@
                             <div class="cardBtn">
                                 <el-radio-group v-model="overviewSlotData" @change="changeUpdate">
                                     <el-radio v-for="item in belongprojectList" :value="item.value">{{ item.name }}</el-radio>
-<!--                                    <el-radio value="">全部</el-radio>
-                                    <el-radio value="一期">一期</el-radio>
-                                    <el-radio value="二期">二期</el-radio>-->
                                 </el-radio-group>
                             </div>
                             <div class="headerRight">
diff --git a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
index 86e4690d..a85782df 100644
--- a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
+++ b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue
@@ -71,10 +71,15 @@
                             <el-tooltip
                                 v-if="item.attributeMap.firsttriggeredcode"
                                 :content="item.attributeMap.firsttriggeredcode">
-                                <span :style="item.attributeMap.locked == 1 ? 'max-width:120px;' : 'max-width:150px;'">
+                                <span class="rightTip"  :style="item.attributeMap.locked == 1 ? 'width:120px;' : 'width:150px;'">
                                  {{ item.attributeMap.firsttriggeredcode }}
                             </span>
                             </el-tooltip>
+                            <span class="rightTip"
+                                v-if="!item.attributeMap.firsttriggeredcode"
+                                :style="item.attributeMap.locked == 1 ? 'width:120px;' : 'width:150px;'">
+                                 {{ item.attributeMap.firsttriggeredcode }}
+                            </span>
 <!--                        <el-tag class="tag-panel is-danger">已锁定</el-tag>-->
                             <el-tag v-if="item.attributeMap.locked === 1" class="tag-panel is-danger">已锁定</el-tag>
                         </div>
@@ -607,7 +612,7 @@ const getSafeImagePath = (item, type) => {
                 display: flex;
                 justify-content: space-between;
                 height: 24px;
-                span{
+                .rightTip{
                     display: inline-block;
                     white-space: nowrap;
                     overflow: hidden;