From d3553d8dd6fc00634ac32228e5b8e4d0624eda11 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 11:10:51 +0800
Subject: [PATCH] 调整Modbus配置-解决轴流风机与轴流窗不在同一个分机配置的问题
---
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
index 1c4353f..bba19cc 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
@@ -104,6 +104,15 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="serId">
+ <Property/>
+ <Property name="label">鎵�灞炲垎鏈�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="padding:5;regionPadding:5">
@@ -170,12 +179,15 @@
<DataColumn name="deviceCode">
<Property name="property">deviceCode</Property>
</DataColumn>
+ <DataColumn name="serId">
+ <Property name="property">serId</Property>
+ </DataColumn>
<ColumnGroup>
<Property name="caption">寮�鎿嶄綔</Property>
<DataColumn name="open">
<Property name="property">open</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="openFun">
<Property name="property">openFun</Property>
@@ -189,7 +201,7 @@
<DataColumn name="close">
<Property name="property">close</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="closeFun">
<Property name="property">closeFun</Property>
@@ -203,7 +215,7 @@
<DataColumn name="stop">
<Property name="property">stop</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="stopFun">
<Property name="property">stopFun</Property>
@@ -217,7 +229,7 @@
<DataColumn name="openEnd">
<Property name="property">openEnd</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="openEndFun">
<Property name="property">openEndFun</Property>
@@ -231,7 +243,7 @@
<DataColumn name="closeEnd">
<Property name="property">closeEnd</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="closeEndFun">
<Property name="property">closeEndFun</Property>
@@ -245,7 +257,7 @@
<DataColumn name="openError">
<Property name="property">openError</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="openErrorFun">
<Property name="property">openErrorFun</Property>
@@ -259,7 +271,7 @@
<DataColumn name="closeError">
<Property name="property">closeError</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="closeErrorFun">
<Property name="property">closeErrorFun</Property>
--
Gitblit v1.9.3