From 93e01fa050330ead95041ed11cc85e9765c19fc1 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 09 十一月 2023 12:06:52 +0800
Subject: [PATCH] 手动测试
---
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 157 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 133 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index 617451d..75ba1bf 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -16,20 +16,25 @@
</PropertyDef>
<PropertyDef name="deviceName">
<Property></Property>
- <Property name="label">鍚嶇О</Property>
+ <Property name="label">璁惧鍚嶇О</Property>
<Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="depotName">
+ <Property></Property>
+ <Property name="label">浠撳簱鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
<Property name="label">璁惧绫诲瀷</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
- </PropertyDef>
- <PropertyDef name="depotName">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceType").getResult()}</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="ip">
<Property></Property>
@@ -43,9 +48,19 @@
<Property></Property>
<Property name="label">瑙嗛RTSP</Property>
</PropertyDef>
+ <PropertyDef name="provinceProtocol">
+ <Property></Property>
+ <Property name="label">鐪佸钩鍙板崗璁�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
<PropertyDef name="pushProtocol">
<Property></Property>
- <Property name="label">绯荤粺缃戝叧閫氳鍗忚</Property>
+ <Property name="label">涓庣郴缁熼�氳鍗忚</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}</Property>
<Property name="keyProperty">code</Property>
@@ -55,7 +70,7 @@
</PropertyDef>
<PropertyDef name="syncProtocol">
<Property></Property>
- <Property name="label">缃戝叧涓庤澶囬�氳鍗忚</Property>
+ <Property name="label">涓庤澶囬�氳鍗忚</Property>
<Property name="mapping">
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
@@ -76,8 +91,36 @@
<Property name="label">HTTP鍦板潃</Property>
</PropertyDef>
<PropertyDef name="deviceSn">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧搴忓垪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="serPort">
+ <Property name="dataType">int</Property>
+ <Property name="label">TCP鏈嶅姟绔彛</Property>
+ </PropertyDef>
+ <PropertyDef name="userName">
+ <Property></Property>
+ <Property name="label">璁惧鐢ㄦ埛鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="password">
+ <Property></Property>
+ <Property name="label">璁惧瀵嗙爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotIdSys">
+ <Property></Property>
+ <Property name="label">鑷畾涔変粨搴撶紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="productId">
+ <Property></Property>
+ <Property name="label">璁惧绫诲瀷KEY</Property>
+ </PropertyDef>
+ <PropertyDef name="cableRule">
+ <Property></Property>
+ <Property name="label">甯冪嚎瑙勫垯</Property>
+ </PropertyDef>
+ <PropertyDef name="cableCir">
+ <Property></Property>
+ <Property name="label">绛掍粨灞傝鍒�</Property>
</PropertyDef>
</DataType>
</Model>
@@ -138,6 +181,17 @@
<Property name="width">90</Property>
<Property name="exClassName">toolbar-button-warn</Property>
</ToolBarButton>
+ <Separator/>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#ajaxTestGrain").set("parameter",cur).execute(function(result){
+ $alert(result);
+});
+</ClientEvent>
+ <Property name="caption">娴嬭瘯绮儏</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">toolbar-button-warn</Property>
+ </ToolBarButton>
</ToolBar>
<DataGrid id="dgMain">
<Property name="dataSet">dsMain</Property>
@@ -149,18 +203,23 @@
</DataColumn>
<DataColumn name="type">
<Property name="property">type</Property>
+ <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="depotName">
- <Property name="property">depotName</Property>
+ <DataColumn name="productId">
+ <Property name="property">productId</Property>
+ </DataColumn>
+ <DataColumn name="deviceId">
+ <Property name="property">deviceId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">550</Property>
</DataColumn>
<DataColumn name="syncProtocol">
<Property name="property">syncProtocol</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="pushProtocol">
<Property name="property">pushProtocol</Property>
- </DataColumn>
- <DataColumn name="remark">
- <Property name="property">remark</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
<Dialog id="dialogMain">
@@ -170,8 +229,7 @@
<Property name="closeable">false</Property>
<Buttons>
<Button>
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-view.get("#updateSave").execute(function(){
+ <ClientEvent name="onClick">view.get("#updateSave").execute(function(){
self.get("parent").hide();
});</ClientEvent>
<Property name="caption">淇濆瓨淇敼</Property>
@@ -192,13 +250,18 @@
<AutoForm>
<Property name="dataSet">dsMain</Property>
<Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
+ <Property name="labelWidth">125</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelPosition">left</Property>
- <AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">deviceId</Property>
<Property name="property">deviceId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deviceSn</Property>
+ <Property name="property">deviceSn</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -212,8 +275,23 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">productId</Property>
+ <Property name="property">productId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgId</Property>
+ <Property name="property">orgId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotIdSys</Property>
+ <Property name="property">depotIdSys</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -227,6 +305,21 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">userName</Property>
+ <Property name="property">userName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">password</Property>
+ <Property name="property">password</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">provinceProtocol</Property>
+ <Property name="property">provinceProtocol</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">pushProtocol</Property>
<Property name="property">pushProtocol</Property>
<Editor/>
@@ -237,8 +330,9 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">orgId</Property>
- <Property name="property">orgId</Property>
+ <Property name="name">serPort</Property>
+ <Property name="property">serPort</Property>
+ <Property name="labelWidth">150</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -257,21 +351,36 @@
<Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableRule</Property>
+ <Property name="property">cableRule</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableCir</Property>
+ <Property name="property">cableCir</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Container>
</Children>
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">gatewayDeviceService#updateSave</Property>
+ <Property name="dataResolver">gatewayDeviceService2#updateSave</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
+ <Property name="alias">data</Property>
</UpdateItem>
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="service">gatewayDeviceService#delData</Property>
<Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
</AjaxAction>
+ <AjaxAction id="ajaxTestGrain">
+ <Property name="service">gatewayDeviceService2#ajaxTestGrain2</Property>
+ <Property name="confirmMessage">纭畾瑕佹墜鍔ㄦ墽琛岀伯鎯呬箞锛�</Property>
+ </AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3