From b2c5f439fd7e17deb532f4a77def2c5de71ceaf8 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 07 十一月 2023 23:37:42 +0800
Subject: [PATCH] 测试

---
 src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml |   80 +++++++++++++++++++++++++++++++++------
 1 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
index 131ebaa..fb93759 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
@@ -24,11 +24,11 @@
         <Property name="label">缃戝叧ID</Property>
       </PropertyDef>
       <PropertyDef name="gatewayUsername">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧鐢ㄦ埛鍚�</Property>
       </PropertyDef>
       <PropertyDef name="gatewayPassword">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧瀵嗙爜</Property>
       </PropertyDef>
       <PropertyDef name="gatewayIp">
@@ -86,12 +86,28 @@
         <Property name="label">绮簱绯荤粺涓簱鍖虹紪鐮�</Property>
       </PropertyDef>
     </DataType>
+    <DataType name="dtParam" parent="Map">
+      <PropertyDef name="start">
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="end">
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="dayTime">
+        <Property name="dataType">Date</Property>
+        <Property name="label">閫夋嫨鏃堕棿</Property>
+      </PropertyDef>
+    </DataType>
   </Model>
   <View layout="regionPadding:10">
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
       <Property name="dataType">[dtMain]</Property>
       <Property name="dataProvider">gatewayConfService#listAll</Property>
+    </DataSet>
+    <DataSet id="dsQuery">
+      <ClientEvent name="onReady">self.insert({});</ClientEvent>
+      <Property name="dataType">dtParam</Property>
     </DataSet>
     <ToolBar>
       <ToolBarLabel>
@@ -107,14 +123,6 @@
         <Property name="iconClass">fa fa-plus</Property>
         <Property name="width">90</Property>
         <Property name="exClassName">toolbar-button</Property>
-      </ToolBarButton>
-      <ToolBarButton>
-        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
-</ClientEvent>
-        <Property name="caption">鍒锋柊</Property>
-        <Property name="iconClass">fa fa-search</Property>
-        <Property name="width">100</Property>
-        <Property name="exClassName">toolbar-button-push</Property>
       </ToolBarButton>
       <ToolBarButton>
         <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -144,6 +152,13 @@
         <Property name="width">90</Property>
         <Property name="exClassName">toolbar-button-warn</Property>
       </ToolBarButton>
+      <Separator/>
+      <ToolBarButton>
+        <ClientEvent name="onClick">view.get(&quot;#dialogGrain&quot;).show();</ClientEvent>
+        <Property name="caption">绮儏鎺ㄩ�佹祴璇�</Property>
+        <Property name="iconClass">fa fa-search</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+      </ToolBarButton>
     </ToolBar>
     <DataGrid id="dgMain">
       <Property name="dataSet">dsMain</Property>
@@ -162,6 +177,13 @@
         <Property name="name">grade</Property>
         <Property name="width">200</Property>
       </DataColumn>
+      <DataColumn name="gatewayId">
+        <Property name="property">gatewayId</Property>
+        <Property name="width">300</Property>
+      </DataColumn>
+      <DataColumn name="gatewayUsername">
+        <Property name="property">gatewayUsername</Property>
+      </DataColumn>
       <DataColumn name="userName">
         <Property name="property">userName</Property>
       </DataColumn>
@@ -170,9 +192,6 @@
       </DataColumn>
       <DataColumn name="exeTag">
         <Property name="property">exeTag</Property>
-      </DataColumn>
-      <DataColumn name="deptId">
-        <Property name="property">deptId</Property>
       </DataColumn>
     </DataGrid>
     <Dialog id="dialogMain">
@@ -321,5 +340,40 @@
       <Property name="service">gatewayConfService#pushData</Property>
       <Property name="confirmMessage">纭畾瑕佷笂鎶ヤ箞锛�</Property>
     </AjaxAction>
+    <Dialog id="dialogGrain">
+      <Property name="width">400</Property>
+      <Property name="height">300</Property>
+      <Property name="caption">閫夋嫨鏉′欢</Property>
+      <Buttons>
+        <Button>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
+view.get(&quot;#ajaxTestGrain&quot;).set(&quot;parameter&quot;,data.toJSON()).execute(function(result){&#xD;
+	self.get(&quot;parent&quot;).hide();&#xD;
+	$alert(result);&#xD;
+});</ClientEvent>
+          <Property name="caption">纭畾鎵ц</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;parent&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷鎵ц</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsQuery</Property>
+          <Property name="cols">*</Property>
+          <AutoFormElement>
+            <Property name="name">dayTime</Property>
+            <Property name="property">dayTime</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <AjaxAction id="ajaxTestGrain">
+      <Property name="service">gatewayDeviceService#ajaxTestGrain</Property>
+      <Property name="executingMessage">鍦ㄥ姫鍔涙墽琛屼腑鈥︹��</Property>
+    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3