From a9098372191b3c51995d41ee28404d1b71244d98 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 12 十二月 2023 18:41:04 +0800
Subject: [PATCH] 提交网关心跳和设备状态2

---
 src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml |  100 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 74 insertions(+), 26 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 9c6076c..4f26326 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml
@@ -15,32 +15,36 @@
         <Property name="label">搴撳尯浠ｇ爜</Property>
         <Property name="required">true</Property>
       </PropertyDef>
-      <PropertyDef name="appId">
-        <Property/>
-        <Property name="label">appId</Property>
-      </PropertyDef>
       <PropertyDef name="gatewayId">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧ID</Property>
       </PropertyDef>
+      <PropertyDef name="gatewayUsername">
+        <Property></Property>
+        <Property name="label">缃戝叧鐢ㄦ埛鍚�</Property>
+      </PropertyDef>
+      <PropertyDef name="gatewayPassword">
+        <Property></Property>
+        <Property name="label">缃戝叧瀵嗙爜</Property>
+      </PropertyDef>
       <PropertyDef name="gatewayIp">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧IP</Property>
       </PropertyDef>
       <PropertyDef name="gatewayMac">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧Mac</Property>
       </PropertyDef>
       <PropertyDef name="gatewayCPU">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧CPU</Property>
       </PropertyDef>
       <PropertyDef name="gatewayMem">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧鍐呭瓨</Property>
       </PropertyDef>
       <PropertyDef name="gatewayHardDisk">
-        <Property/>
+        <Property></Property>
         <Property name="label">缃戝叧纭洏</Property>
       </PropertyDef>
       <PropertyDef name="userName">
@@ -101,14 +105,6 @@
         <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;
 if(cur){&#xD;
 	view.get(&quot;#dialogMain&quot;).show();&#xD;
@@ -136,6 +132,13 @@
         <Property name="width">90</Property>
         <Property name="exClassName">toolbar-button-warn</Property>
       </ToolBarButton>
+      <Separator/>
+      <ToolBarButton>
+        <Property name="caption">缃戝叧鍒濆鍖�</Property>
+        <Property name="iconClass">fa fa-search</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+        <Property name="action">ajaxInit</Property>
+      </ToolBarButton>
     </ToolBar>
     <DataGrid id="dgMain">
       <Property name="dataSet">dsMain</Property>
@@ -154,6 +157,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>
@@ -162,9 +172,6 @@
       </DataColumn>
       <DataColumn name="exeTag">
         <Property name="property">exeTag</Property>
-      </DataColumn>
-      <DataColumn name="deptId">
-        <Property name="property">deptId</Property>
       </DataColumn>
     </DataGrid>
     <Dialog id="dialogMain">
@@ -216,6 +223,17 @@
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
+              <Property name="name">gatewayUsername</Property>
+              <Property name="property">gatewayUsername</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">gatewayPassword</Property>
+              <Property name="property">gatewayPassword</Property>
+              <Property name="editorType">PasswordEditor</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
               <Property name="name">gatewayIp</Property>
               <Property name="property">gatewayIp</Property>
               <Editor/>
@@ -238,11 +256,6 @@
             <AutoFormElement>
               <Property name="name">gatewayHardDisk</Property>
               <Property name="property">gatewayHardDisk</Property>
-              <Editor/>
-            </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">appId</Property>
-              <Property name="property">appId</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -302,5 +315,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;#dialogGrain&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="ajaxInit">
+      <Property name="service">apiInitService#init</Property>
+      <Property name="executingMessage">鍦ㄥ姫鍔涙墽琛屼腑鈥︹��</Property>
+    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3