From f9de63b6b72c97c4dfabe2a7b5aee3b8a4f11f0a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 07 十一月 2023 23:57:09 +0800
Subject: [PATCH] 增加地磅按钮
---
src/main/java/com/fzzy/gateway/view/GatewayConf.view.xml | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 96 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..94c6caa 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">
@@ -78,12 +82,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>
@@ -99,14 +119,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("#dsMain").flushAsync();
-</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("#dgMain").getCurrentItem();
@@ -136,6 +148,19 @@
<Property name="width">90</Property>
<Property name="exClassName">toolbar-button-warn</Property>
</ToolBarButton>
+ <Separator/>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dialogGrain").show();</ClientEvent>
+ <Property name="caption">绮儏鎺ㄩ�佹祴璇�</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">toolbar-button-push</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dialogWeight").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>
@@ -154,6 +179,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 +194,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 +245,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 +278,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 +337,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("#dsQuery.data");
+view.get("#ajaxTestGrain").set("parameter",data.toJSON()).execute(function(result){
+ self.get("parent").hide();
+ $alert(result);
+});</ClientEvent>
+ <Property name="caption">纭畾鎵ц</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("parent").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