From 0215fce538f4f07069bf16cd2bfe505a907bcbd5 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 12 九月 2023 10:06:51 +0800
Subject: [PATCH] 优化邦海智能粮情V2版
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 140 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 124 insertions(+), 16 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index 1da57df..3359796 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -135,6 +135,46 @@
<PropertyDef name="remark">
<Property name="label">澶囨敞淇℃伅</Property>
</PropertyDef>
+ <PropertyDef name="storeDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="unit">
+ <Property></Property>
+ <Property name="label">妫�楠屽崟浣�</Property>
+ </PropertyDef>
+ <PropertyDef name="zblb">
+ <Property></Property>
+ <Property name="label">鎸囨爣绫诲埆</Property>
+ </PropertyDef>
+ <PropertyDef name="qfrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">绛惧彂鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bgcjsj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="shrxm">
+ <Property></Property>
+ <Property name="label">瀹℃牳浜哄鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="qydbh">
+ <Property></Property>
+ <Property name="label">鎵︽牱鍗曠紪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="jdrxm">
+ <Property></Property>
+ <Property name="label">鐩戠潱浜哄鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="ypbh">
+ <Property></Property>
+ <Property name="label">鏍峰搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
<Reference name="checkItems">
<Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
<Property name="dataType">[dtCheckItems]</Property>
@@ -211,10 +251,10 @@
<Property name="label">鍖栭獙缁撴灉</Property>
</PropertyDef>
<PropertyDef name="operaSymbolValue">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="operaSymbol">
- <Property/>
+ <Property></Property>
<Property name="label">杩愮畻绗﹀彿</Property>
</PropertyDef>
<PropertyDef name="ruleNum">
@@ -258,7 +298,7 @@
<Property name="label">鎵ｄ环</Property>
</PropertyDef>
<PropertyDef name="result">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠岀粨鏋�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}</Property>
@@ -396,6 +436,13 @@
<Property name="dataType">String</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtMetrics">
+ <PropertyDef name="code"/>
+ <PropertyDef name="name"/>
+ </DataType>
+ <DataType name="dtResult">
+ <PropertyDef name="name"/>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -436,6 +483,38 @@
<Property name="dataType">[dataTypeUser]</Property>
<Property name="pageSize">100</Property>
<Property name="dataProvider">bdf2.userMaintain#loadUsers</Property>
+ </DataSet>
+ <DataSet id="dsMetrics">
+ <ClientEvent name="onCreate">var data = [ {
+ name : "1:璐ㄩ噺鎸囨爣妫�楠�"
+}, {
+ name : "2:鍌ㄥ瓨鍝佽川妫�楠�"
+}, {
+ name : "3:椋熷搧瀹夊叏妫�楠�"
+}]
+self.setData(data);
+</ClientEvent>
+ <Property name="dataType">[dtMetrics]</Property>
+ </DataSet>
+ <DataSet id="dsResult">
+ <ClientEvent name="onCreate">var data = [ {
+ name : "杈炬爣"
+}, {
+ name : "涓嶈揪鏍�"
+}, {
+ name : "瀹滃瓨"
+},{
+ name : "杞诲害涓嶅疁瀛�"
+},{
+ name : "閲嶅害涓嶅疁瀛�"
+}, {
+ name : "鍚堟牸"
+}, {
+ name : "涓嶅悎鏍�"
+}]
+self.setData(data);
+</ClientEvent>
+ <Property name="dataType">[dtResult]</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -556,11 +635,6 @@
<Property name="name">foodVariety</Property>
</DataColumn>
<DataColumn>
- <Property name="property">foodType</Property>
- <Property name="align">center</Property>
- <Property name="name">foodType</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">foodLevel</Property>
<Property name="align">center</Property>
<Property name="name">foodLevel</Property>
@@ -600,6 +674,18 @@
</DataPilot>
</Container>
<Dialog id="dialogMain">
+ <ClientEvent name="beforeShow">var data = view.get("#dsMain.data:#")
+var metricsBefore = data.get("zblb")
+if(metricsBefore){
+ var list = metricsBefore.split("#");
+ var metrics ="" ;
+ list.forEach(item=>{
+ if(item == 1)metrics+="1:璐ㄩ噺鎸囨爣妫�楠�#";
+ if(item == 2)metrics+="2:鍌ㄥ瓨鍝佽川妫�楠�#";
+ if(item == 3)metrics+="3:椋熷搧瀹夊叏妫�楠�#"; 
+ });
+ data.set("zblb", metrics.substring(0,metrics.length-1));
+}</ClientEvent>
<Property name="visible">false</Property>
<Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
<Property name="width">80%</Property>
@@ -673,8 +759,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -689,8 +775,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
+ <Property name="name">unit</Property>
+ <Property name="property">unit</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -704,9 +790,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="name">shrxm</Property>
+ <Property name="property">shrxm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -736,10 +821,33 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">zblb</Property>
+ <Property name="property">zblb</Property>
+ <Editor>
+ <TagEditor>
+ <Property name="textSeperator">#</Property>
+ <Property name="availableTagsDataSet">dsMetrics</Property>
+ <Property name="availableTagsDataPath">.name</Property>
+ </TagEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:1">
<Property name="name">result</Property>
<Property name="property">result</Property>
- <Editor/>
+ <Editor>
+ <TagEditor>
+ <Property name="availableTagsDataPath">.name</Property>
+ <Property name="availableTagsDataSet">dsResult</Property>
+ <Property name="textSeperator">#</Property>
+ </TagEditor>
+ </Editor>
</AutoFormElement>
+ <Label layoutConstraint="colSpan:2">
+ <Property name="text">璇存槑锛氬椤规寚鏍囨椂鎸夌収1:璐ㄩ噺鎸囨爣妫�楠�(杈炬爣,涓嶈揪鏍�)銆�2:鍌ㄥ瓨鍝佽川妫�楠�(瀹滃瓨,涓嶅疁瀛�)銆�3:椋熷搧瀹夊叏妫�楠�(鍚堟牸,涓嶅悎鏍�)杩欎釜椤哄簭濉啓妫�楠岀粨璁�</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
<AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
--
Gitblit v1.9.3