From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-web/src/views/device/DeviceConfigList.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/mes-web/src/views/device/DeviceConfigList.vue b/mes-web/src/views/device/DeviceConfigList.vue
index 72a5e45..4503408 100644
--- a/mes-web/src/views/device/DeviceConfigList.vue
+++ b/mes-web/src/views/device/DeviceConfigList.vue
@@ -79,7 +79,7 @@
</el-table-column>
<el-table-column prop="plcIp" label="PLC IP" width="130" />
<el-table-column prop="plcType" label="PLC绫诲瀷" width="100" />
- <el-table-column prop="moduleName" label="妯″潡鍚嶇О" min-width="120" />
+ <el-table-column prop="moduleName" label="妯″潡鍚嶇О" min-width="60" />
<el-table-column prop="isPrimary" label="涓绘帶璁惧" width="100" align="center">
<template #default="scope">
<el-tag v-if="scope.row.isPrimary" type="success" size="small">涓绘帶</el-tag>
@@ -107,12 +107,12 @@
{{ formatDateTime(scope.row.lastHeartbeat) }}
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="200" fixed="right">
+ <el-table-column label="鎿嶄綔" width="300" fixed="right">
<template #default="scope">
<el-button type="primary" size="small" @click="editDevice(scope.row)">
缂栬緫
</el-button>
- <el-button type="warning" size="small" :loading="plcOperationLoading" @click="handleSinglePlcRequest(scope.row)">
+ <el-button type="warning" size="small" :loading="plcOperationLoading" @click.stop="handleSinglePlcRequest(scope.row, $event)">
PLC璇锋眰
</el-button>
<el-button type="success" size="small" @click="healthCheck(scope.row)">
@@ -322,9 +322,24 @@
}
}
-const handleSinglePlcRequest = (row) => executePlcOperation([row.id || row.deviceId], 'request')
-const handleSinglePlcReport = (row) => executePlcOperation([row.id || row.deviceId], 'report')
-const handleSinglePlcReset = (row) => executePlcOperation([row.id || row.deviceId], 'reset')
+const handleSinglePlcRequest = (row, event) => {
+ if (event) {
+ event.stopPropagation()
+ }
+ executePlcOperation([row.id || row.deviceId], 'request')
+}
+const handleSinglePlcReport = (row, event) => {
+ if (event) {
+ event.stopPropagation()
+ }
+ executePlcOperation([row.id || row.deviceId], 'report')
+}
+const handleSinglePlcReset = (row, event) => {
+ if (event) {
+ event.stopPropagation()
+ }
+ executePlcOperation([row.id || row.deviceId], 'reset')
+}
const batchPlcRequest = () => executePlcOperation(getSelectedDeviceIds(), 'request')
const batchPlcReport = () => executePlcOperation(getSelectedDeviceIds(), 'report')
--
Gitblit v1.8.0