From 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d Mon Sep 17 00:00:00 2001 From: vince <757871790@qq.com> Date: 星期三, 08 十一月 2023 17:49:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway --- src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 82 +++++++++++++++++++++++++++++++---------- 1 files changed, 62 insertions(+), 20 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 5be2641..9db29e6 100644 --- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml +++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml @@ -16,8 +16,16 @@ </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> @@ -27,10 +35,6 @@ <Property name="valueProperty">name</Property> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceType").getResult()}</Property> </Property> - </PropertyDef> - <PropertyDef name="depotId"> - <Property></Property> - <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property> </PropertyDef> <PropertyDef name="ip"> <Property></Property> @@ -45,7 +49,7 @@ <Property name="label">瑙嗛RTSP</Property> </PropertyDef> <PropertyDef name="provinceProtocol"> - <Property/> + <Property></Property> <Property name="label">鐪佸钩鍙板崗璁�</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property> @@ -56,7 +60,7 @@ </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> @@ -66,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> @@ -95,16 +99,28 @@ <Property name="label">TCP鏈嶅姟绔彛</Property> </PropertyDef> <PropertyDef name="userName"> - <Property/> + <Property></Property> <Property name="label">璁惧鐢ㄦ埛鍚�</Property> </PropertyDef> <PropertyDef name="password"> - <Property/> + <Property></Property> <Property name="label">璁惧瀵嗙爜</Property> </PropertyDef> - <PropertyDef name="depotName"> + <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 name="label">鎵�灞炰粨搴�</Property> + <Property name="label">甯冪嚎瑙勫垯</Property> + </PropertyDef> + <PropertyDef name="cableCir"> + <Property/> + <Property name="label">绛掍粨灞傝鍒�</Property> </PropertyDef> </DataType> </Model> @@ -176,15 +192,23 @@ </DataColumn> <DataColumn name="type"> <Property name="property">type</Property> + <Property name="align">center</Property> + </DataColumn> + <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"> @@ -194,8 +218,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> @@ -241,6 +264,11 @@ <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/> @@ -248,6 +276,11 @@ <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> @@ -278,13 +311,11 @@ <AutoFormElement> <Property name="name">pushProtocol</Property> <Property name="property">pushProtocol</Property> - <Property name="labelWidth">150</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">syncProtocol</Property> <Property name="property">syncProtocol</Property> - <Property name="labelWidth">150</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -309,16 +340,27 @@ <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"> -- Gitblit v1.9.3