From 66062ab0b78df03e4312b9566aab2f0ed62148f8 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期六, 12 十月 2024 10:57:31 +0800 Subject: [PATCH] update --- src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue index 524ca0e..470045d 100644 --- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue +++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue @@ -80,9 +80,9 @@ title="鍩虹淇℃伅" :column="4" > - <a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentID}}</a-descriptions-item> + <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="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> @@ -235,7 +235,7 @@ <a-descriptions-item v-for="(item,id) in mdcDriveTypeParamConfigList " :key="item.id" - :label="item.chineseName" + :label="item.key" > <a-tooltip @mouseenter="mouseEnterItem"> <template slot="title"> @@ -1376,13 +1376,13 @@ // _this.drawLine() getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => { if (res.success) { - _this.resultData = res.result - _this.driverType = res.result.deviceType + _this.resultData = res.result.equipment + _this.driverType = res.result.equipment.deviceType _this.spindlebeilv = res.result.spindlebeilv _this.feedbeilv = res.result.feedbeilv _this.spindleload = res.result.spindleload _this.rapidfeed = res.result.rapidfeed; - _this.mdcDriveTypeParamConfigList = res.result.mdcDriveTypeParamConfigList; + _this.mdcDriveTypeParamConfigList = res.result.runData; _this.xyzAliasesList = res.result.xyzAliasesList; this.$nextTick(() => { _this.drawLine() -- Gitblit v1.9.3