From 902506299d0cfef195cdbd8322fdd1d175792102 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 19:27:26 +0800
Subject: [PATCH] 四川网关-提交测试

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 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..fc41c88 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(&quot;apiTriggerService#triggerGatewayDeviceType&quot;).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(&quot;apiTriggerService#triggerPushProtocol&quot;).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(&quot;apiTriggerService#triggerGatewayProtocol&quot;).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,16 @@
         <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 name="label">鎵�灞炰粨搴�</Property>
+        <Property name="label">搴撳尯绯荤粺浠撳簱缂栫爜</Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -176,15 +180,20 @@
       </DataColumn>
       <DataColumn name="type">
         <Property name="property">type</Property>
+        <Property name="align">center</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">
@@ -278,13 +287,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>
@@ -303,6 +310,11 @@
               <Property name="property">httpUrl</Property>
               <Editor/>
             </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">depotIdSys</Property>
+              <Property name="property">depotIdSys</Property>
+              <Editor/>
+            </AutoFormElement>
             <AutoFormElement layoutConstraint="colSpan:3">
               <Property name="name">remark</Property>
               <Property name="property">remark</Property>

--
Gitblit v1.9.3