From 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml | 378 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 378 insertions(+), 0 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
new file mode 100644
index 0000000..2576894
--- /dev/null
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbus.view.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.DeviceModbus</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">ID</Property>
+ </PropertyDef>
+ <PropertyDef name="deviceCode">
+ <Property></Property>
+ <Property name="label">浠撳簱缂栫爜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="open">
+ <Property></Property>
+ <Property name="label">寮�鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="openFun">
+ <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="close">
+ <Property></Property>
+ <Property name="label">鍏冲湴鍧�</Property>
+ </PropertyDef>
+ <PropertyDef name="closeFun">
+ <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="stop">
+ <Property></Property>
+ <Property name="label">鍋滃湴鍧�</Property>
+ </PropertyDef>
+ <PropertyDef name="stopFun">
+ <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="openEnd">
+ <Property></Property>
+ <Property name="label">寮�鍒颁綅</Property>
+ </PropertyDef>
+ <PropertyDef name="openEndFun">
+ <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="closeEnd">
+ <Property></Property>
+ <Property name="label">鍏冲埌浣�</Property>
+ </PropertyDef>
+ <PropertyDef name="closeEndFun">
+ <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="openError">
+ <Property></Property>
+ <Property name="label">寮�鏁呴殰</Property>
+ </PropertyDef>
+ <PropertyDef name="openErrorFun">
+ <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="closeError">
+ <Property></Property>
+ <Property name="label">鍏虫晠闅�</Property>
+ </PropertyDef>
+ <PropertyDef name="closeErrorFun">
+ <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>
+ <Reference name="listGas">
+ <Property name="dataType">[dtGas]</Property>
+ <Property name="dataProvider">gasModbusPR#listGasModBus</Property>
+ <Property name="parameter">$${this.deviceCode}</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtGas">
+ <Property name="creationType">com.ld.igds.models.GasModbus</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">ID</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="passcode">
+ <Property name="dataType">int</Property>
+ <Property name="label">閫氶亾</Property>
+ </PropertyDef>
+ <PropertyDef name="co2">
+ <Property></Property>
+ <Property name="label">浜屾哀鍖栫⒊</Property>
+ </PropertyDef>
+ <PropertyDef name="co2Fun">
+ <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 name="label">姘ф皵</Property>
+ </PropertyDef>
+ <PropertyDef name="o2Fun">
+ <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 name="label">纾峰寲姘�</Property>
+ </PropertyDef>
+ <PropertyDef name="ph3Fun">
+ <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>
+ <View layout="padding:5;regionPadding:5">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
+ <Property name="dataType">dtMain</Property>
+ <Property name="dataProvider">gasModbusPR#getGasData</Property>
+ <Property name="parameter">${request.getParameter('depotId')}</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data").get("listGas");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板閫氶亾</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#uaAction").execute(); </ClientEvent>
+ <Property name="caption">淇濆瓨鏁版嵁</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-normal</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGrid1").getCurrentItem();;
+if(!data){
+ return;
+}
+view.get("#ajaxDel").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ }
+}); </ClientEvent>
+ <Property name="caption">鍒犻櫎閫氶亾</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deviceCode</Property>
+ <Property name="property">deviceCode</Property>
+ <Property name="label">浠撳簱缂栫爜</Property>
+ <Property name="labelWidth">100</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">open</Property>
+ <Property name="property">open</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">openFun</Property>
+ <Property name="property">openFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">close</Property>
+ <Property name="property">close</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">closeFun</Property>
+ <Property name="property">closeFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">stop</Property>
+ <Property name="property">stop</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">stopFun</Property>
+ <Property name="property">stopFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">openEnd</Property>
+ <Property name="property">openEnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">openEndFun</Property>
+ <Property name="property">openEndFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">closeEnd</Property>
+ <Property name="property">closeEnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">closeEndFun</Property>
+ <Property name="property">closeEndFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">openError</Property>
+ <Property name="property">openError</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">openErrorFun</Property>
+ <Property name="property">openErrorFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">closeError</Property>
+ <Property name="property">closeError</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">closeErrorFun</Property>
+ <Property name="property">closeErrorFun</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ <ToolBar>
+ <ToolBarLabel>
+ <Property name="text">妫�娴嬮�氶亾閰嶇疆</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </ToolBarLabel>
+ </ToolBar>
+ <DataGrid id="dataGrid1" layoutConstraint="center padding:5px">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.listGas</Property>
+ <RowNumColumn/>
+ <DataColumn>
+ <Property name="property">passcode</Property>
+ <Property name="name">passcode</Property>
+ <Editor/>
+ </DataColumn>
+ <ColumnGroup>
+ <Property name="caption">CO2</Property>
+ <DataColumn>
+ <Property name="property">co2</Property>
+ <Property name="caption">鍦板潃</Property>
+ <Property name="name">co2</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">co2Fun</Property>
+ <Property name="caption">鍔熻兘</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
+ <Property name="name">co2Fun</Property>
+ </DataColumn>
+ </ColumnGroup>
+ <ColumnGroup>
+ <Property name="caption">O2</Property>
+ <DataColumn>
+ <Property name="property">o2</Property>
+ <Property name="caption">鍦板潃</Property>
+ <Property name="name">o2</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">o2Fun</Property>
+ <Property name="caption">鍔熻兘</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
+ <Property name="name">o2Fun</Property>
+ </DataColumn>
+ </ColumnGroup>
+ <ColumnGroup>
+ <Property name="caption">PH3</Property>
+ <DataColumn>
+ <Property name="property">ph3</Property>
+ <Property name="caption">鍦板潃</Property>
+ <Property name="name">ph3</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">ph3Fun</Property>
+ <Property name="caption">鍔熻兘</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
+ <Property name="name">ph3Fun</Property>
+ </DataColumn>
+ </ColumnGroup>
+ </DataGrid>
+ </Container>
+ <UpdateAction id="uaAction">
+ <Property name="dataResolver">gasModbusPR#updateData</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="service">gasModbusPR#delData</Property>
+ <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
--
Gitblit v1.9.3