From ae084b7ab31c38588928afb770cec1320c8c27f0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 07 十二月 2023 12:26:24 +0800
Subject: [PATCH] 提交粮情协协议-控制柜-3

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |   58 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 38 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 d56a8b3..6d1e9a8 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -48,9 +48,9 @@
         <Property></Property>
         <Property name="label">瑙嗛RTSP</Property>
       </PropertyDef>
-      <PropertyDef name="provinceProtocol">
+      <PropertyDef name="pushProtocol">
         <Property></Property>
-        <Property name="label">鐪佸钩鍙板崗璁�</Property>
+        <Property name="label">涓婅鍗忚</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerPushProtocol&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
@@ -58,19 +58,9 @@
         </Property>
         <Property name="required">true</Property>
       </PropertyDef>
-      <PropertyDef name="pushProtocol">
-        <Property></Property>
-        <Property name="label">涓庣郴缁熼�氳鍗忚</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerGatewayProtocol&quot;).getResult()}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
-        <Property name="required">true</Property>
-      </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>
@@ -121,6 +111,18 @@
       <PropertyDef name="cableCir">
         <Property></Property>
         <Property name="label">绛掍粨灞傝鍒�</Property>
+      </PropertyDef>
+      <PropertyDef name="position">
+        <Property></Property>
+        <Property name="label">浣嶇疆</Property>
+      </PropertyDef>
+      <PropertyDef name="status">
+        <Property/>
+        <Property name="label">鍦ㄧ嚎鐘舵��</Property>
+      </PropertyDef>
+      <PropertyDef name="onlineTime">
+        <Property name="dataType">DateTime</Property>
+        <Property name="label">鏈�鍚庝笂绾挎椂闂�</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam" parent="Map">
@@ -245,6 +247,18 @@
         <Property name="iconClass">fa fa-wrench</Property>
         <Property name="exClassName">toolbar-button-push</Property>
       </ToolBarButton>
+      <Separator/>
+      <ToolBarButton>
+        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;initLpr&quot;&#xD;
+}&#xD;
+initLpr(param);</ClientEvent>
+        <Property name="caption">杞︾墝璇嗗埆鍒濆鍖�</Property>
+        <Property name="iconClass">fa fa-wrench</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+      </ToolBarButton>
     </ToolBar>
     <DataGrid id="dgMain">
       <Property name="dataSet">dsMain</Property>
@@ -269,8 +283,12 @@
         <Property name="property">syncProtocol</Property>
         <Property name="align">center</Property>
       </DataColumn>
-      <DataColumn name="pushProtocol">
-        <Property name="property">pushProtocol</Property>
+      <DataColumn name="status">
+        <Property name="property">status</Property>
+        <Property name="align">center</Property>
+      </DataColumn>
+      <DataColumn name="onlineTime">
+        <Property name="property">onlineTime</Property>
         <Property name="align">center</Property>
       </DataColumn>
     </DataGrid>
@@ -367,11 +385,6 @@
               <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/>
@@ -397,6 +410,11 @@
               <Property name="property">httpUrl</Property>
               <Editor/>
             </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">position</Property>
+              <Property name="property">position</Property>
+              <Editor/>
+            </AutoFormElement>
             <AutoFormElement layoutConstraint="colSpan:3">
               <Property name="name">remark</Property>
               <Property name="property">remark</Property>

--
Gitblit v1.9.3