From 5a244958ec24b95c47e377607319c7503cddd6bb Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期日, 05 十一月 2023 20:48:04 +0800
Subject: [PATCH] 优化结算录入
---
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml
index 50f26ee..2576894 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml
@@ -118,11 +118,11 @@
<DataType name="dtGas">
<Property name="creationType">com.ld.igds.models.GasModbus</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">ID</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
+ <Property></Property>
<Property name="label">鎵�灞炰粨搴�</Property>
</PropertyDef>
<PropertyDef name="passcode">
@@ -130,28 +130,43 @@
<Property name="label">閫氶亾</Property>
</PropertyDef>
<PropertyDef name="co2">
- <Property/>
+ <Property></Property>
<Property name="label">浜屾哀鍖栫⒊</Property>
</PropertyDef>
<PropertyDef name="co2Fun">
- <Property/>
+ <Property></Property>
<Property name="label">鍔熻兘鍙�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="o2">
- <Property/>
+ <Property></Property>
<Property name="label">姘ф皵</Property>
</PropertyDef>
<PropertyDef name="o2Fun">
- <Property/>
+ <Property></Property>
<Property name="label">鍔熻兘鍙�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="ph3">
- <Property/>
+ <Property></Property>
<Property name="label">纾峰寲姘�</Property>
</PropertyDef>
<PropertyDef name="ph3Fun">
- <Property/>
+ <Property></Property>
<Property name="label">鍔熻兘鍙�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
</DataType>
</Model>
@@ -199,12 +214,6 @@
<Property name="caption">鍒犻櫎閫氶亾</Property>
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <Property name="caption">鍒锋柊缂撳瓨</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="action">ajaxFlushCache</Property>
</Button>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
@@ -364,10 +373,6 @@
<AjaxAction id="ajaxDel">
<Property name="service">gasModbusPR#delData</Property>
<Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
- </AjaxAction>
- <AjaxAction id="ajaxFlushCache">
- <Property name="service">gasModbusPR#flushCache</Property>
- <Property name="successMessage">缂撳瓨鏇存柊鎴愬姛</Property>
</AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3