From 091c89cd56ad6dac4a2cb6767b00693058e0fbed Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期日, 08 十月 2023 16:54:11 +0800
Subject: [PATCH] 优化贝博粮情协议-星仓补点问题

---
 igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml |   79 ++++++++++++++++++++++++++++++++-------
 1 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
index e968b49..fae18e5 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
@@ -155,7 +155,7 @@
           </Children>
         </FieldSet>
         <FieldSet>
-          <Property name="caption">绮儏妫�娴嬮厤缃�</Property>
+          <Property name="caption">绮俯妫�娴嬮厤缃�</Property>
           <Buttons/>
           <Children>
             <AutoForm layoutConstraint="padding:5">
@@ -205,39 +205,32 @@
               <AutoFormElement>
                 <Property name="name">tempMax</Property>
                 <Property name="property">tempMax</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">thSer</Property>
-                <Property name="property">thSer</Property>
-                <Property name="trigger">autoMappingDropDown2</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">thConf</Property>
-                <Property name="property">thConf</Property>
+                <Property name="label">绮俯涓婇檺</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
                 <Property name="property">startOrientation</Property>
                 <Property name="name">startOrientation</Property>
                 <Property name="editable">false</Property>
-                <Property name="trigger">autoMappingDropDown1</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
                 <Property name="property">startDirection</Property>
                 <Property name="name">startDirection</Property>
                 <Property name="editable">false</Property>
-                <Property name="trigger">autoMappingDropDown1</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
                 <Property name="property">startPoint</Property>
                 <Property name="name">startPoint</Property>
                 <Property name="editable">false</Property>
-                <Property name="trigger">autoMappingDropDown1</Property>
                 <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                  <Property name="property">startConvert</Property>
+                  <Property name="name">startConvert</Property>
+                  <Property name="editable">false</Property>
+                  <Editor/>
               </AutoFormElement>
               <AutoFormElement>
                 <Property name="property">cableCone</Property>
@@ -249,6 +242,17 @@
               <AutoFormElement>
                 <Property name="name">grainFreq</Property>
                 <Property name="property">grainFreq</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">thSer</Property>
+                <Property name="property">thSer</Property>
+                <Property name="trigger">autoMappingDropDown2</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">thConf</Property>
+                <Property name="property">thConf</Property>
                 <Editor/>
               </AutoFormElement>
               <Button>
@@ -279,6 +283,11 @@
               <Property name="labelSeparator">锛�</Property>
               <Property name="labelWidth">120</Property>
               <AutoFormElement>
+                <Property name="name">gasSer</Property>
+                <Property name="property">gasSer</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">gasStart</Property>
                 <Property name="property">gasStart</Property>
                 <Editor/>
@@ -308,6 +317,15 @@
                 <Property name="property">ph3Max</Property>
                 <Editor/>
               </AutoFormElement>
+              <Button>
+                <ClientEvent name="onClick">var depotId = view.get(&quot;#dsMain.data:#&quot;).get(&quot;depotId&quot;);&#xD;
+var path = &quot;com.ld.igds.modbus.GasModbus.d?depotId=&quot;+depotId;&#xD;
+view.get(&quot;#iframModbus&quot;).set(&quot;path&quot;,path);&#xD;
+view.get(&quot;#dialogModbus&quot;).show();</ClientEvent>
+                <Property name="caption">Modbus閰嶇疆</Property>
+                <Property name="tip">閽堝Modbus鍗忚鐨勯厤缃�</Property>
+                <Property name="iconClass">fa fa-refresh</Property>
+              </Button>
             </AutoForm>
           </Children>
         </FieldSet>
@@ -320,6 +338,11 @@
               <Property name="cols">*,*,*</Property>
               <Property name="labelSeparator">锛�</Property>
               <Property name="labelWidth">100</Property>
+              <AutoFormElement>
+                <Property name="name">pestSer</Property>
+                <Property name="property">pestSer</Property>
+                <Editor/>
+              </AutoFormElement>
               <AutoFormElement>
                 <Property name="name">pestStart</Property>
                 <Property name="property">pestStart</Property>
@@ -335,6 +358,15 @@
                 <Property name="property">pestMax</Property>
                 <Editor/>
               </AutoFormElement>
+              <Button>
+                <ClientEvent name="onClick">var depotId = view.get(&quot;#dsMain.data:#&quot;).get(&quot;depotId&quot;);&#xD;
+var path = &quot;com.ld.igds.modbus.PestModbus.d?depotId=&quot;+depotId;&#xD;
+view.get(&quot;#iframModbus&quot;).set(&quot;path&quot;,path);&#xD;
+view.get(&quot;#dialogModbus&quot;).show();</ClientEvent>
+                <Property name="caption">Modbus閰嶇疆</Property>
+                <Property name="tip">閽堝Modbus鍗忚鐨勯厤缃�</Property>
+                <Property name="iconClass">fa fa-refresh</Property>
+              </Button>
             </AutoForm>
           </Children>
         </FieldSet>
@@ -347,6 +379,11 @@
               <Property name="cols">*,*,*</Property>
               <Property name="labelSeparator">锛�</Property>
               <Property name="labelWidth">100</Property>
+              <AutoFormElement>
+                <Property name="name">verbSer</Property>
+                <Property name="property">verbSer</Property>
+                <Editor/>
+              </AutoFormElement>
               <AutoFormElement>
                 <Property name="name">esSer</Property>
                 <Property name="property">esSer</Property>
@@ -372,5 +409,17 @@
       <Property name="service">depotPR#ajaxGetAllCache</Property>
       <Property name="executingMessage">鍒濆鍖栨暟鎹�︹��</Property>
     </AjaxAction>
+    <Dialog id="dialogModbus">
+      <Property name="width">80%</Property>
+      <Property name="height">95%</Property>
+      <Property name="caption">Modbus-TCP閰嶇疆</Property>
+      <Buttons/>
+      <Children>
+        <IFrame id="iframModbus">
+          <Property name="path">com.ld.igds.modbus.GasModbus.d</Property>
+        </IFrame>
+      </Children>
+      <Tools/>
+    </Dialog>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3