From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 121 ++++++++++------------------------------
1 files changed, 30 insertions(+), 91 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 2535004..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>
@@ -192,70 +196,6 @@
<Entity>
<Property name="code">Y</Property>
<Property name="name">鑷姩鎶撴媿</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="azwzlx">
- <Property></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>
- </Entity>
- <Entity>
- <Property name="key">02</Property>
- <Property name="value">鎵︽牱鏈�</Property>
- </Entity>
- <Entity>
- <Property name="key">03</Property>
- <Property name="value">鍖栭獙瀹�</Property>
- </Entity>
- <Entity>
- <Property name="key">04</Property>
- <Property name="value">缁撶畻瀹�</Property>
- </Entity>
- <Entity>
- <Property name="key">05</Property>
- <Property name="value">鍦扮鎴�</Property>
- </Entity>
- <Entity>
- <Property name="key">06</Property>
- <Property name="value">搴撳尯涓诲共閬�</Property>
- </Entity>
- <Entity>
- <Property name="key">07</Property>
- <Property name="value">浠撻棿鐩戞帶</Property>
- </Entity>
- <Entity>
- <Property name="key">08</Property>
- <Property name="value">浠撳唴</Property>
- </Entity>
- <Entity>
- <Property name="key">09</Property>
- <Property name="value">鑽搧搴�</Property>
- </Entity>
- <Entity>
- <Property name="key">10</Property>
- <Property name="value">鍣ㄦ潗搴�</Property>
- </Entity>
- <Entity>
- <Property name="key">11</Property>
- <Property name="value">鍒堕珮鐐�</Property>
- </Entity>
- <Entity>
- <Property name="key">12</Property>
- <Property name="value">鍛ㄧ晫</Property>
- </Entity>
- <Entity>
- <Property name="key">99</Property>
- <Property name="value">鍏朵粬</Property>
</Entity>
</Collection>
</Property>
@@ -627,11 +567,10 @@
</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>
- <Property name="height">100%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -661,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>
@@ -696,11 +635,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">azwzlx</Property>
- <Property name="property">azwzlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">spjklx</Property>
<Property name="property">spjklx</Property>
<Editor/>
@@ -719,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>
@@ -745,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>
@@ -793,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>
@@ -827,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>
@@ -838,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