From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
index f1f0867..a448802 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
@@ -86,7 +86,7 @@
<a-descriptions-item label="绔彛鍙�">{{resultData.dataPort}}</a-descriptions-item>
<a-descriptions-item label="绯荤粺鐗堟湰鍙�">{{resultData.systemVersion}}</a-descriptions-item>
<a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType}}</a-descriptions-item>
- <a-descriptions-item label="绯荤粺鍨嬪彿">{{resultData.systemType}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍨嬪彿">{{resultData.equipmentModel}}</a-descriptions-item>
<a-descriptions-item label="璁惧绫诲瀷">{{resultData.deviceType}}</a-descriptions-item>
<a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower}}</a-descriptions-item>
<a-descriptions-item label="鏈夋晥杞存暟">{{resultData.validAxis}}</a-descriptions-item>
@@ -237,16 +237,13 @@
:key="item.id"
:label="item.chineseName"
>
- <a-popover v-if="item.value&&item.value.length>18">
- <template slot="content">
+ <a-tooltip @mouseenter="mouseEnterItem">
+ <template slot="title">
{{item.value}}
</template>
- {{item.value}}
- </a-popover>
+ <div class="description-item-class">{{item.value}}</div>
+ </a-tooltip>
- <template v-else>
- {{item.value}}
- </template>
</a-descriptions-item>
</a-descriptions>
@@ -1425,6 +1422,13 @@
}
})
+ },
+
+ mouseEnterItem(e){
+ console.log(e, e.target, e.target.clientWidth, e.target.scrollWidth)
+ if (e.target.clientWidth >= e.target.scrollWidth) {
+ e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢 pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
+ }
}
},
beforeDestroy(){
@@ -1560,6 +1564,10 @@
{
width: 130px;
overflow: hidden;
+ }
+
+ .description-item-class{
+ overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
--
Gitblit v1.9.3