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/WorkshopSignage/EquipmentDetailModal.vue | 103 +++++++++++++++++----------------------------------
1 files changed, 34 insertions(+), 69 deletions(-)
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
index 022e82c..8f038ea 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -81,18 +81,18 @@
title="鍩虹淇℃伅"
:column="4"
>
- <a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentID}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName}}</a-descriptions-item>
- <a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIP}}</a-descriptions-item>
- <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.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>
- <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.maxAxis}}</a-descriptions-item>
- <a-descriptions-item label="澶囨敞">{{resultData.remark}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentID|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIP|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="绔彛鍙�">{{resultData.dataPort|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="绯荤粺鐗堟湰鍙�">{{resultData.systemVersion|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍨嬪彿">{{resultData.equipmentModel|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧绫诲瀷">{{resultData.deviceType|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="鏈夋晥杞存暟">{{resultData.validAxis|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.maxAxis|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="澶囨敞">{{resultData.remark|formatDescriptionsItem}}</a-descriptions-item>
</a-descriptions>
<!-- <a-descriptions
@@ -237,16 +237,13 @@
:key="item.id"
:label="item.chineseName"
>
- <a-popover v-if="item.value&&item.value.length>18">
- <template slot="content">
- {{item.value}}
+ <a-tooltip @mouseenter="mouseEnterItem">
+ <template slot="title">
+ {{item.value|formatDescriptionsItem}}
</template>
- {{item.value}}
- </a-popover>
+ <div class="description-item-class">{{item.value|formatDescriptionsItem}}</div>
+ </a-tooltip>
- <template v-else>
- {{item.value}}
- </template>
</a-descriptions-item>
</a-descriptions>
@@ -334,6 +331,11 @@
},
watch: {},
+ filters:{
+ formatDescriptionsItem(value){
+ return value?value:'鏃�'
+ }
+ },
methods: {
drawLine() {
let _this = this
@@ -1423,6 +1425,10 @@
closeModal() {
this.handleCancel()
+ },
+
+ mouseEnterItem(e){
+ if (e.target.clientWidth >= e.target.scrollWidth) e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢 pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
}
},
beforeDestroy() {
@@ -1491,9 +1497,9 @@
margin-bottom: 0;
}
- /deep/ .ant-descriptions-view {
- padding: 0 20px;
- }
+ /*/deep/ .ant-descriptions-view {*/
+ /*padding: 0 20px;*/
+ /*}*/
/deep/ .ant-descriptions-view .ant-descriptions-row .ant-descriptions-item {
padding-bottom: 5px;
@@ -1501,63 +1507,18 @@
/deep/ .ant-descriptions-item-colon {
color: #fff;
- width: 5.1vw;
+ /*width: 5.1vw;*/
}
/deep/ .ant-descriptions-item-content {
color: #fff;
border: 1px solid #4bcfc8;
padding: 0 10px;
- width: auto;
min-width: 130px;
- /*max-width: 300px;*/
- height: 25px;
}
.mdcEquipMon {
color: #fff;
- }
-
- fieldset {
- border: 1px solid #16738d;
- padding: 17px;
- margin: 14px;
- }
-
- fieldset legend {
- display: inline;
- width: 88px;
- }
-
- table tr td {
- text-align: left;
- color: #fff;
- }
-
- table tr td input {
- border: 1px solid #a6eff9;
- }
-
- .ant-btn {
- padding: 0 10px;
- margin-left: 3px;
- color: #fff !important;
- background-color: #1191b0;
- border: none;
- }
-
- .ant-form-item-control {
- line-height: 0px;
- }
-
- /** 涓昏〃鍗曡闂磋窛 */
- .ant-form .ant-form-item {
- margin-bottom: 10px;
- }
-
- /** Tab椤甸潰琛岄棿璺� */
- .ant-tabs-content .ant-form-item {
- margin-bottom: 0px;
}
/deep/ .ant-descriptions-item-label{
@@ -1570,6 +1531,10 @@
.lsv2Data .ant-descriptions-item-content
{
width: 130px;
+ vertical-align: bottom;
+ }
+
+ .description-item-class{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
--
Gitblit v1.9.3