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 | 126 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 37 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
index fb27e33..a448802 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
@@ -84,14 +84,15 @@
<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.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>
- <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.MaxAxis}}</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>
<!-- <a-descriptions
@@ -225,40 +226,52 @@
<a-descriptions
title="杩愯鏁版嵁"
+ 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-descriptions-item>
+ >
+ <a-tooltip @mouseenter="mouseEnterItem">
+ <template slot="title">
+ {{item.value}}
+ </template>
+ <div class="description-item-class">{{item.value}}</div>
+ </a-tooltip>
+
+ </a-descriptions-item>
</a-descriptions>
- <a-descriptions
- title="鍧愭爣淇℃伅"
- v-if="driverType != 'PLC'"
- :column="4"
- >
- <a-descriptions-item
- v-for="(item,id) in xyzAliasesList "
- :key="item.id"
- :label="item.title"
- >{{item.value}}</a-descriptions-item>
- </a-descriptions>
+ <!--<a-descriptions-->
+ <!--title="鍧愭爣淇℃伅"-->
+ <!--v-show="xyzAliasesList != null"-->
+ <!--v-if="driverType != 'PLC'"-->
+ <!--:column="4"-->
+ <!-->-->
+ <!--<a-descriptions-item-->
+ <!--v-for="(item,id) in xyzAliasesList "-->
+ <!--:key="item.id"-->
+ <!--:label="item.title"-->
+ <!-->{{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>
@@ -288,7 +301,6 @@
props: {},
data() {
return {
-
mdcDriveTypeParamConfigList: [],
xyzAliasesList: [],
title: '',
@@ -462,7 +474,7 @@
show: false,
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -518,6 +530,9 @@
pointer: {
show: true,
width: 3,
+ itemStyle:{
+ color:'#fff',
+ }
},
data: [{
name: '',
@@ -715,7 +730,7 @@
show: false,
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -771,6 +786,9 @@
pointer: {
show: true,
width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -865,7 +883,7 @@
type: 'gauge',
radius: '80%',
min: 0, //鏈�灏忓埢搴�
- max: 300, //鏈�澶у埢搴�
+ max: 100, //鏈�澶у埢搴�
splitNumber: 10, //鍒诲害鏁伴噺
startAngle: 225,
endAngle: -45,
@@ -968,7 +986,7 @@
show: false,
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -992,12 +1010,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
@@ -1024,6 +1042,9 @@
pointer: {
show: true,
width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -1221,7 +1242,7 @@
show: false,
},
axisTick: {
- show: true,
+ show: false,
length: 20,
splitNumber: 1,
lineStyle: {
@@ -1277,6 +1298,9 @@
pointer: {
show: true,
width: 3,
+ itemStyle:{
+ color:'#fff'
+ }
},
data: [{
name: '',
@@ -1378,7 +1402,6 @@
getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
if (res.success) {
_this.resultData = res.result
- console.log(_this.resultData)
_this.driverType = res.result.deviceType
_this.spindlebeilv = res.result.spindlebeilv
_this.feedbeilv = res.result.feedbeilv
@@ -1391,10 +1414,21 @@
})
// _this.initDeviceType(_this.resultData.deviceType)
} else {
- _this.$message.warn(res.message)
+ // _this.$message.warn(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
+ },
+
+ 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(){
@@ -1434,7 +1468,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: 0.9;
}
/deep/ .ant-modal-close {
color: #1191b0;
@@ -1519,4 +1553,22 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+ /deep/ .ant-descriptions-item-label{
+ width: 6.7vw;
+ text-align: right;
+ margin-right: 10px;
+ }
+
+ /deep/ .operationData .ant-descriptions-item-content
+ {
+ width: 130px;
+ overflow: hidden;
+ }
+
+ .description-item-class{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
</style>
--
Gitblit v1.9.3