From 97fdc4473e426084722cf922f5fe84d66366b760 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 一月 2025 20:07:42 +0800
Subject: [PATCH] update
---
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
index de34628..fd48ee3 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
@@ -1,7 +1,7 @@
<template>
<div ref="wrap">
<a-modal
- width="70%"
+ width="90%"
:visible="visible"
:getContainer="() => this.$refs.wrap"
@cancel="handleCancel"
@@ -84,11 +84,11 @@
<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.equipmentModel}}</a-descriptions-item>
- <a-descriptions-item label="璁惧绫诲瀷">{{resultData.driveType}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧绫诲瀷">{{resultData.equipmentType}}</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>
@@ -119,6 +119,23 @@
</a-descriptions-item>
+ </a-descriptions>
+
+ <a-descriptions
+ title="鍧愭爣淇℃伅"
+ v-if="xyzList != null"
+ :column="5"
+ >
+ <a-descriptions-item label="鏈哄簥鍧愭爣X">{{xyzList.xmachine}}</a-descriptions-item>
+ <a-descriptions-item label="Y">{{xyzList.ymachine}}</a-descriptions-item>
+ <a-descriptions-item label="Z">{{xyzList.zmachine}}</a-descriptions-item>
+ <a-descriptions-item label="A">{{xyzList.amachine}}</a-descriptions-item>
+ <a-descriptions-item label="B">{{xyzList.bmachine}}</a-descriptions-item>
+ <a-descriptions-item label="缁濆鍧愭爣X">{{xyzList.xabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="Y">{{xyzList.yabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="Z">{{xyzList.zabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="A">{{xyzList.aabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="B">{{xyzList.babsolute}}</a-descriptions-item>
</a-descriptions>
</td>
@@ -165,7 +182,8 @@
url: {
mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
},
- modalTimer: null
+ modalTimer: null,
+ xyzList: null
}
},
beforeDestroy() {
@@ -1229,6 +1247,8 @@
_this.spindleload = res.result.spindleload
_this.rapidfeed = res.result.rapidfeed
_this.runData = res.result.runData
+ _this.xyzList = res.result.xyzList
+
// _this.xyzAliasesList = res.result.xyzAliasesList
this.$nextTick(() => {
_this.drawLine()
--
Gitblit v1.9.3