From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
index 4bff26c..7335346 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023</Property>
+ <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api1023</Property>
<PropertyDef name="xzbm">
<Property></Property>
<Property name="label">鐔忚捀缂栫爜</Property>
@@ -156,7 +156,7 @@
</PropertyDef>
</DataType>
<DataType name="dtPeople">
- <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023People</Property>
+ <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api1023People</Property>
<PropertyDef name="xm">
<Property></Property>
<Property name="label">濮撳悕</Property>
@@ -183,7 +183,7 @@
</PropertyDef>
</DataType>
<DataType name="dtWay">
- <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023Way</Property>
+ <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api1023Way</Property>
<PropertyDef name="xznd">
<Property></Property>
<Property name="label">璁惧畾鐔忚捀娴撳害(ml/m3)</Property>
@@ -205,7 +205,7 @@
</PropertyDef>
</DataType>
<DataType name="dtDtl">
- <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023Dtl</Property>
+ <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api1023Dtl</Property>
<PropertyDef name="cfdm">
<Property></Property>
<Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
@@ -213,14 +213,29 @@
<PropertyDef name="lspzdm">
<Property></Property>
<Property name="label">绮鍝佺浠ｇ爜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSPZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="lsxzdm">
<Property></Property>
<Property name="label">绮鎬ц川浠ｇ爜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSXZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="lsdjdm">
<Property></Property>
<Property name="label">绮绛夌骇浠ｇ爜</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSDJ")}</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="lssl">
<Property name="dataType">Double</Property>
@@ -267,6 +282,11 @@
<PropertyDef name="cldjpd">
<Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CLDJPD")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="ldtj">
<Property name="dataType">Double</Property>
@@ -306,7 +326,7 @@
<Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="cfmc">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧鍚嶇О</Property>
</PropertyDef>
</DataType>
@@ -340,7 +360,7 @@
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
<Property name="dataProvider">gDApi1023PR#listData</Property>
- <Property name="pageSize">15</Property>
+ <Property name="pageSize">20</Property>
</DataSet>
<DataSet id="dsQuery">
<ClientEvent name="onReady">self.insert();</ClientEvent>
@@ -532,6 +552,13 @@
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot>
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
<Dialog id="dialogMain" layout="regionPadding:5">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
@@ -935,6 +962,7 @@
<Property name="property">cfdm</Property>
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
+ <Property name="width">260</Property>
</DataColumn>
<DataColumn name="lspzdm">
<Property name="property">lspzdm</Property>
@@ -946,23 +974,8 @@
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="lssl">
- <Property name="property">lssl</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="cldjpd">
<Property name="property">cldjpd</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="lddwyyl">
- <Property name="property">lddwyyl</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="kjdwyyl">
- <Property name="property">kjdwyyl</Property>
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
</DataColumn>
@@ -1171,7 +1184,7 @@
<Property name="items">鏄�,鍚�</Property>
</ListDropDown>
<ListDropDown id="listDropZG">
- <Property name="items">鍒濅腑,涓骇,楂樼骇</Property>
+ <Property name="items">鍒濈骇,涓骇,楂樼骇</Property>
</ListDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3