From 73f74cbf665a431b0db474be129a03c655e2338a Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 25 八月 2023 13:30:03 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，添加GasModus的配置
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 129 +++++++++++++++++++++++++++++++++++--------
1 files changed, 105 insertions(+), 24 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 92bad24..dd23a2f 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -185,6 +185,22 @@

}
});
+}
+
+//鍒犻櫎闄勪欢
+delFile = function(){
+ var entity = view.get("#dgFiles").getCurrentItem();
+ view.get("#ajaxDelFile").set("parameter",{
+ fileName:entity.get("fileName"),
+ createTime:entity.get("createTime")
+ }).execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ entity.remove();
+ $alert("鍒犻櫎鎴愬姛锛�");
+ }
+ });
}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
@@ -609,14 +625,41 @@
</AutoFormElement>
</AutoForm>
<DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
- <ClientEvent name="onCellValueEdit">var data = view.get("#dsMain.data:#")
-if(data){
- var plateNum = data.get("plateNum");
- self.set("parameter",{
- plateNum:plateNum
- })
-}
-</ClientEvent>
+ <ClientEvent name="onCellValueEdit">var data = arg.entity
+if (data) {
+ //濉啓鐨勬暟鎹��;
+ var newValue = data.get("value");
+ //鏍囧噯鍊�;
+ var limit = data.get("upperLimit");
+ //杩愮畻绗�;
+ var symbol = data.get("operaSymbol");
+ if (symbol && limit && newValue) {
+ if (">=" == symbol) {
+ if (newValue < limit) {
+ data.set("result", "0");
+ }
+ else {
+ data.set("result", "1");
+ }
+ }
+ if ("<=" == symbol) {
+ if (newValue > limit) {
+ data.set("result", "0");
+ }
+ else {
+ data.set("result", "1");
+ }
+ }
+ if ("==" == symbol) {
+ if (newValue != limit) {
+ data.set("result", "0");
+ }
+ else {
+ data.set("result", "1");
+ }
+ }
+ }
+}</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="dataPath">#.checkItems</Property>
<Property name="highlightCurrentRow">false</Property>
@@ -683,7 +726,7 @@
<FieldSet layout="regionPadding:5" layoutConstraint="top padding:10">
<Buttons>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">view.PROGRESS = "EMPTY_WEIGHT";
+ <ClientEvent name="onClick">view.PROGRESS = "WEIGHT_EMPTY";
</ClientEvent>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-cloud-upload</Property>
@@ -691,7 +734,7 @@
<Property name="caption">绌鸿溅绉�</Property>
</Button>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">view.PROGRESS = "FULL_WEIGHT";
+ <ClientEvent name="onClick">view.PROGRESS = "WEIGHT_FULL";
</ClientEvent>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-cloud-upload</Property>
@@ -699,7 +742,7 @@
<Property name="caption">婊¤溅绉�</Property>
</Button>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">view.PROGRESS = "HAND";</ClientEvent>
+ <ClientEvent name="onClick">view.PROGRESS = "HANDLE";</ClientEvent>
<Property name="caption">鍊间粨</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-cloud-upload</Property>
@@ -719,6 +762,16 @@
</DataColumn>
<DataColumn name="fileName">
<Property name="property">fileName</Property>
+ </DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='delFile()'>鍒犻櫎</a>";
+</ClientEvent>
+ <Property name="property">fileId</Property>
+ <Property name="name">fileId</Property>
+ <Property name="align">center</Property>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="width">80</Property>
</DataColumn>
</DataGrid>
</Children>
@@ -809,7 +862,7 @@
<CustomDropDown id="ddNotice">
<Property name="minHeight">400</Property>
<Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
- <Property name="minWidth">500</Property>
+ <Property name="minWidth">1000</Property>
<Property name="autoOpen">true</Property>
<Container layout="regionPadding:5">
<DataSet id="dsNotice">
@@ -849,24 +902,44 @@
}</ClientEvent>
<Property name="dataSet">dsNotice</Property>
<Property name="readOnly">true</Property>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
<Property name="align">center</Property>
<Property name="name">customerName</Property>
+ <Property name="width">240</Property>
</DataColumn>
- <DataColumn name="name">
- <Property name="property">name</Property>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">300</Property>
</DataColumn>
</DataGrid>
</Container>
</CustomDropDown>
<UploadAction id="uploadImg">
<ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
-
var plateNum = data.get("plateNum");
+var bizTag = "EMPTY";
self.set("parameter",{
- plateNum:plateNum,
- bizTag:"EMPTY_WEIGHT"
+ bizTag: bizTag
})</ClientEvent>
<ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
var mainData = view.get("#dsMain.data");
@@ -876,8 +949,9 @@
<ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
if(data){
var plateNum = data.get("plateNum");
+ var bizTag = "EMPTY";
self.set("parameter",{
- plateNum:plateNum
+ bizTag:bizTag
})
}</ClientEvent>
<Property name="maxFileSize">20MB</Property>
@@ -890,9 +964,9 @@
<ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")

var plateNum = data.get("plateNum");
+var bizTag = "FULL";
self.set("parameter",{
- plateNum:plateNum,
- bizTag:"FULL_WEIGHT"
+ bizTag: bizTag
})</ClientEvent>
<ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
var mainData = view.get("#dsMain.data");
@@ -902,8 +976,9 @@
<ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
if(data){
var plateNum = data.get("plateNum");
+ var bizTag = "FULL";
self.set("parameter",{
- plateNum:plateNum
+ bizTag:bizTag
})
}</ClientEvent>
<Property name="maxFileSize">20MB</Property>
@@ -916,9 +991,9 @@
<ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")

var plateNum = data.get("plateNum");
+var bizTag = "HANDLE";
self.set("parameter",{
- plateNum:plateNum,
- bizTag:"HAND"
+ bizTag: bizTag
})</ClientEvent>
<ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
var mainData = view.get("#dsMain.data");
@@ -928,8 +1003,9 @@
<ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
if(data){
var plateNum = data.get("plateNum");
+ var bizTag = "HANDLE";
self.set("parameter",{
- plateNum:plateNum
+ bizTag:bizTag
})
}</ClientEvent>
<Property name="maxFileSize">20MB</Property>
@@ -938,5 +1014,10 @@
<Property name="fileResolver">inoutDataPR#uploadImage</Property>
<Filters/>
</UploadAction>
+ <AjaxAction id="ajaxDelFile">
+ <Property name="service">inoutDataPR#delImage</Property>
+ <Property name="async">true</Property>
+ <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
+ </AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3