From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
index fb27e33..e3506f2 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
@@ -225,6 +225,7 @@
<a-descriptions
title="杩愯鏁版嵁"
+ v-show="mdcDriveTypeParamConfigList != null"
v-if="driverType != 'PLC'"
:column="4"
>
@@ -237,17 +238,18 @@
</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"
@@ -1378,7 +1380,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,7 +1392,11 @@
})
// _this.initDeviceType(_this.resultData.deviceType)
} else {
- _this.$message.warn(res.message)
+ // _this.$message.warn(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
--
Gitblit v1.9.3