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 | 166 ++++++++++++++++++++++++++++---------------------------
1 files changed, 85 insertions(+), 81 deletions(-)
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
index 4e68f1a..8f038ea 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -9,7 +9,6 @@
cancelText="鍏抽棴"
wrap-class-name="full-modal"
centered
- :closable="false"
:footer="null"
>
<div
@@ -82,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.SystemType}}</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
@@ -230,13 +229,21 @@
v-show="mdcDriveTypeParamConfigList != null"
v-if="driverType != 'PLC'"
:column="4"
+ class="operationData"
>
<a-descriptions-item
v-for="(item,id) in mdcDriveTypeParamConfigList "
:key="item.id"
:label="item.chineseName"
- >{{item.value}}
+ >
+ <a-tooltip @mouseenter="mouseEnterItem">
+ <template slot="title">
+ {{item.value|formatDescriptionsItem}}
+ </template>
+ <div class="description-item-class">{{item.value|formatDescriptionsItem}}</div>
+ </a-tooltip>
+
</a-descriptions-item>
</a-descriptions>
@@ -254,16 +261,17 @@
<!-->{{item.value}}</a-descriptions-item>-->
<!--</a-descriptions>-->
- <a-descriptions
- title="鐗堟湰淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="NC鐗堟湰">{{resultData.nCVersion}}</a-descriptions-item>
- <a-descriptions-item label="TNC鐗堟湰">{{resultData.tNCVersion}}</a-descriptions-item>
- <a-descriptions-item label="OPT鐗堟湰">{{resultData.oPTVersion}}</a-descriptions-item>
- <a-descriptions-item label="PLC鐗堟湰">{{resultData.pLCVersion}}</a-descriptions-item>
- </a-descriptions>
+ <!--<a-descriptions-->
+ <!--title="鐗堟湰淇℃伅 for lsv2"-->
+ <!--v-if="driverType == 'LSV2'"-->
+ <!--:column="4"-->
+ <!--class="lsv2Data"-->
+ <!-->-->
+ <!--<a-descriptions-item label="NC鐗堟湰">{{resultData.ncversion}}</a-descriptions-item>-->
+ <!--<a-descriptions-item label="TNC鐗堟湰">{{resultData.tncversion}}</a-descriptions-item>-->
+ <!--<a-descriptions-item label="OPT鐗堟湰">{{resultData.optversion}}</a-descriptions-item>-->
+ <!--<a-descriptions-item label="PLC鐗堟湰">{{resultData.plcversion}}</a-descriptions-item>-->
+ <!--</a-descriptions>-->
</td>
</tr>
@@ -287,10 +295,11 @@
postAction
} from '@/api/manage'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+ import Template1 from '../../../../jeecg/JVxeDemo/layout-demo/Template1'
export default {
name: 'EqumentDetaiModal',
- components: {},
+ components: { Template1 },
props: {},
data() {
return {
@@ -322,6 +331,11 @@
},
watch: {},
+ filters:{
+ formatDescriptionsItem(value){
+ return value?value:'鏃�'
+ }
+ },
methods: {
drawLine() {
let _this = this
@@ -471,7 +485,7 @@
show: false
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -526,7 +540,10 @@
},
pointer: {
show: true,
- width: 3
+ width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -724,7 +741,7 @@
show: false
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -779,7 +796,10 @@
},
pointer: {
show: true,
- width: 3
+ width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -874,7 +894,7 @@
type: 'gauge',
radius: '80%',
min: 0, //鏈�灏忓埢搴�
- max: 300, //鏈�澶у埢搴�
+ max: 100, //鏈�澶у埢搴�
splitNumber: 10, //鍒诲害鏁伴噺
startAngle: 225,
endAngle: -45,
@@ -977,7 +997,7 @@
show: false
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -1001,12 +1021,12 @@
radius: '52.5%',
z: 3,
startAngle: 225,
- max: 300,
+ max: 100,
endAngle: -45,
axisLine: {
lineStyle: {
color: [
- [_this.spindleload / 300, '#31F3FF'], // 鍔ㄦ��
+ [_this.spindleload / 100, '#31F3FF'], // 鍔ㄦ��
[1, '#185363']
],
width: 4
@@ -1032,7 +1052,10 @@
},
pointer: {
show: true,
- width: 3
+ width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -1230,7 +1253,7 @@
show: false
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -1285,7 +1308,10 @@
},
pointer: {
show: true,
- width: 3
+ width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -1399,6 +1425,10 @@
closeModal() {
this.handleCancel()
+ },
+
+ mouseEnterItem(e){
+ if (e.target.clientWidth >= e.target.scrollWidth) e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢 pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
}
},
beforeDestroy() {
@@ -1419,7 +1449,7 @@
padding-bottom: 0;
margin: 0;
background-color: #4a4a48 !important;
- opacity: 0.5;
+ opacity: 0.9;
}
/deep/ .ant-modal-content {
display: flex;
@@ -1440,7 +1470,7 @@
/*background: -ms-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
/*background: linear-gradient(to right, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
background-color: #312c2c;
- opacity: 0.7;
+ opacity: 1;
}
/deep/ .ant-modal-close {
@@ -1467,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;
@@ -1477,62 +1507,36 @@
/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;
+ /deep/ .ant-descriptions-item-label{
+ width: 6.7vw;
+ text-align: right;
+ margin-right: 10px;
}
- fieldset legend {
- display: inline;
- width: 88px;
+ /deep/ .operationData .ant-descriptions-item-content,
+ .lsv2Data .ant-descriptions-item-content
+ {
+ width: 130px;
+ vertical-align: bottom;
}
- 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;
+ .description-item-class{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
</style>
--
Gitblit v1.9.3