From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 150 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 102 insertions(+), 48 deletions(-)
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
index 1fb7fdf..9f57859 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
@@ -141,6 +141,10 @@
<Property></Property>
<Property name="label">rtsp鍦板潃</Property>
</PropertyDef>
+ <PropertyDef name="phoneAddr">
+ <Property></Property>
+ <Property name="label">鎵嬫満鍦板潃</Property>
+ </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞璇存槑</Property>
@@ -197,65 +201,105 @@
</Property>
</Property>
</PropertyDef>
- <PropertyDef name="azwzlx">
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="spjklx">
<Property/>
- <Property name="label">瀹夎浣嶇疆</Property>
+ <Property name="label">鐩戞帶绫诲瀷</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
<Property name="valueProperty">value</Property>
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key">01</Property>
- <Property name="value">绮簱澶ч棬</Property>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氫粨鍐�</Property>
</Entity>
<Entity>
- <Property name="key">02</Property>
- <Property name="value">鎵︽牱鏈�</Property>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氫笟鍔＄被</Property>
</Entity>
<Entity>
- <Property name="key">03</Property>
- <Property name="value">鍖栭獙瀹�</Property>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬畨闃茬被</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="spdwlx">
+ <Property/>
+ <Property name="label">鐐逛綅绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氬嚭鍏ュ彛</Property>
</Entity>
<Entity>
- <Property name="key">04</Property>
- <Property name="value">缁撶畻瀹�</Property>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭墻鏍锋満</Property>
</Entity>
<Entity>
- <Property name="key">05</Property>
- <Property name="value">鍦扮鎴�</Property>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬寲楠屽</Property>
</Entity>
<Entity>
- <Property name="key">06</Property>
- <Property name="value">搴撳尯涓诲共閬�</Property>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氱粨绠楀</Property>
</Entity>
<Entity>
- <Property name="key">07</Property>
- <Property name="value">浠撻棿鐩戞帶</Property>
+ <Property name="key">5</Property>
+ <Property name="value">5锛氬湴纾呭</Property>
</Entity>
<Entity>
- <Property name="key">08</Property>
- <Property name="value">浠撳唴</Property>
+ <Property name="key">6</Property>
+ <Property name="value">6锛氬簱鍖轰富骞查亾</Property>
</Entity>
<Entity>
- <Property name="key">09</Property>
- <Property name="value">鑽搧搴�</Property>
+ <Property name="key">7</Property>
+ <Property name="value">7锛氫粨闂寸洃鎺�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">8</Property>
+ <Property name="value">8锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氳嵂鍝佹埧鍐呭</Property>
</Entity>
<Entity>
<Property name="key">10</Property>
- <Property name="value">鍣ㄦ潗搴�</Property>
+ <Property name="value">10锛氬櫒鏉愬鍐呭</Property>
</Entity>
<Entity>
<Property name="key">11</Property>
- <Property name="value">鍒堕珮鐐�</Property>
+ <Property name="value">11锛氬埗楂樼偣</Property>
</Entity>
<Entity>
<Property name="key">12</Property>
- <Property name="value">鍛ㄧ晫</Property>
+ <Property name="value">12锛氭补搴撶綈鍖�</Property>
</Entity>
<Entity>
- <Property name="key">99</Property>
- <Property name="value">鍏朵粬</Property>
+ <Property name="key">13</Property>
+ <Property name="value">13锛氭敹鍙戞补璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14锛氭车鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15锛氭补搴撲富瑕佽緭閫佺閬�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16锛氬懆鐣�</Property>
</Entity>
</Collection>
</Property>
@@ -523,7 +567,7 @@
</DataGrid>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:5">
- <Property name="width">800</Property>
+ <Property name="width">75%</Property>
<Property name="caption">鐩戞帶璁惧淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
@@ -556,7 +600,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -591,8 +635,13 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">azwzlx</Property>
- <Property name="property">azwzlx</Property>
+ <Property name="name">spjklx</Property>
+ <Property name="property">spjklx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spdwlx</Property>
+ <Property name="property">spdwlx</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -604,10 +653,26 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">screenShow</Property>
+ <Property name="property">screenShow</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">snapTag</Property>
<Property name="property">snapTag</Property>
@@ -630,22 +695,6 @@
<Property name="color">blue</Property>
</Property>
</Label>
- <AutoFormElement>
- <Property name="name">screenShow</Property>
- <Property name="property">screenShow</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">榛樿灞曠ず</Property>
- <Property name="value">Y</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">閫夋嫨灞曠ず</Property>
- <Property name="value">N</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -678,7 +727,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -712,7 +761,7 @@
<Property name="property">portInC</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">mediaAddr</Property>
<Property name="property">mediaAddr</Property>
<Property name="trigger">triggerMedia</Property>
@@ -723,6 +772,11 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">phoneAddr</Property>
+ <Property name="property">phoneAddr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
--
Gitblit v1.9.3