From a7ea0bfc407687c4a9627acdbd5d0d4f924197b0 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 13 八月 2024 18:38:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Views/ShiftPlan.vw | 86 +++++++++++++++++++++
_Main/UI/MacroPlannerWebApp/Views/DemandComparison.vw | 136 ++++++++++++++++++++++++++++++++++
2 files changed, 221 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Views/DemandComparison.vw b/_Main/UI/MacroPlannerWebApp/Views/DemandComparison.vw
index 3f13663..177feb9 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/DemandComparison.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/DemandComparison.vw
@@ -2,6 +2,142 @@
{
viewcontents
{
+ forms
+ {
+ form_FormDemandComparison
+ {
+ title: 'QMacroPlanner::FormDemandComparison'
+ shown: true
+ componentID: 'QMacroPlanner::FormDemandComparison'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 17
+ columnPosition: 1
+ columnSpan: 11
+ }
+ components
+ {
+ FormDemandComparison_PanelDemandComparison294
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_PanelSelection
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_PanelSelectionChecks
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pSelectionPR
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pSelectionPP
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pSelectionBudget
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pSelectionPPA
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pSelectionIDS
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pSelectionCurve
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_PanelFilter
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_PanelOperation
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_pVersionInfomation
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_PanelDemandComparison
+ {
+ sizeRatio: 1
+ }
+ FormDemandComparison_MatrixEditor
+ {
+ gridColor: '#c4c4c4'
+ totalHeaderWidth: 200
+ attributeHeaderWidthRatio: 0.6
+ nameHeaderWidthRatio: 0.4
+ columnWidth: 100
+ horizontalGrid: true
+ verticalGrid: true
+ backendState
+ {
+ componentId: 'QMacroPlanner::FormDemandComparison.MatrixEditor'
+ state
+ {
+ cells
+ {
+ attributes
+ {
+ attribute_BaseVersion
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 0
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'BaseVersion'
+ }
+ attribute_CompareVersion
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 1
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'CompareVersion'
+ }
+ attribute_Gap
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 2
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Gap'
+ }
+ }
+ }
+ columns
+ {
+ sorting
+ {
+ criteria: "datamember:'Index'"
+ }
+ }
+ rows
+ {
+ sorting
+ {
+ criteria: "datamember:'Index'"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ userconfigurableinformation
+ {
+ }
page: ''
group: ''
index: 0
diff --git a/_Main/UI/MacroPlannerWebApp/Views/ShiftPlan.vw b/_Main/UI/MacroPlannerWebApp/Views/ShiftPlan.vw
index 7ecffee..7db21f8 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/ShiftPlan.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/ShiftPlan.vw
@@ -2,10 +2,94 @@
{
viewcontents
{
- image: 'COMPASSES'
+ forms
+ {
+ form_FormShihtPlan
+ {
+ title: 'QMacroPlanner::FormShihtPlan'
+ shown: true
+ componentID: 'QMacroPlanner::FormShihtPlan'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 17
+ columnPosition: 1
+ columnSpan: 9
+ }
+ components
+ {
+ FormShihtPlan_PanelMatrix
+ {
+ sizeRatio: 1
+ }
+ FormShihtPlan_pOperation
+ {
+ sizeRatio: 1
+ }
+ FormShihtPlan_MatrixEditorTimeCapacities
+ {
+ gridColor: '#c4c4c4'
+ totalHeaderWidth: 200
+ attributeHeaderWidthRatio: 0.6
+ nameHeaderWidthRatio: 0.4
+ columnWidth: 100
+ horizontalGrid: true
+ verticalGrid: true
+ backendState
+ {
+ componentId: 'QMacroPlanner::FormShihtPlan.MatrixEditorTimeCapacities'
+ state
+ {
+ cells
+ {
+ attributes
+ {
+ attribute_Outcome
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 0
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Outcome'
+ }
+ attribute_Remark
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 1
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Remark'
+ }
+ }
+ }
+ columns
+ {
+ sorting
+ {
+ criteria: "datamember:'StartDate'"
+ }
+ }
+ rows
+ {
+ sorting
+ {
+ criteria: "datamember:'DisplayIndex'"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ userconfigurableinformation
+ {
+ }
page: ''
group: ''
index: 0
+ image: 'COMPASSES'
description: ''
}
formatversion: 2
--
Gitblit v1.9.3