From 4917fb959e2befec07a693e72d7010c09494ec7c Mon Sep 17 00:00:00 2001 From: ningshuxia <ningshuxia0927@outlook.com> Date: 星期四, 03 四月 2025 15:38:34 +0800 Subject: [PATCH] 1.新增二输水流量压力偏差曲线 --- 02-desktop/Desktop/IStation.Desktop.Ch2/Func/FuncCreater.cs | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/02-desktop/Desktop/IStation.Desktop.Ch2/Func/FuncCreater.cs b/02-desktop/Desktop/IStation.Desktop.Ch2/Func/FuncCreater.cs index b139b4b..1429192 100644 --- a/02-desktop/Desktop/IStation.Desktop.Ch2/Func/FuncCreater.cs +++ b/02-desktop/Desktop/IStation.Desktop.Ch2/Func/FuncCreater.cs @@ -1,5 +1,4 @@ -锘縰sing IStation.WinFrmUI.Monitor; -using IStation.WinFrmUI.Properties; +锘縰sing IStation.WinFrmUI.Properties; using System.Collections.Generic; @@ -20,7 +19,7 @@ var monitorPoint = new FuncElement("鐩戞祴鐐�", dll, "IStation.WinFrmUI.Basic.MonitorPointMgrPage", modular, Resources.MonitorPoint); var equipmentMonitorMapping = new FuncElement("娴嬬偣鍏宠仈", dll, "IStation.WinFrmUI.Basic.EquipmentMonitorMappingMgrPage", modular, Resources.Mapping); return new List<FuncElement>() { station, equipment, pumpCurveMgr, monitorPoint, equipmentMonitorMapping }; - } + } public static List<FuncElement> CurveAnaly() { var modular = WinFrmUI.eModular.Analy; @@ -32,7 +31,7 @@ var parallelCurvePage = new FuncElement("鏇茬嚎骞惰仈", dataDLL, $"{nameSpace}.ParallelCurvePage", modular, Resources.Parallel); return new List<FuncElement>() { multiSpeedCurvePage, compareCurvePage, parallelCurvePage }; } - + public static List<FuncElement> Monitor() { var modular = WinFrmUI.eModular.Monitor; @@ -41,8 +40,9 @@ var dataSources = new FuncElement("鏁版嵁鏉ユ簮", dll, $"{nameSpace}.MonitorDataSourcesMgrPage", modular, Resources.MonitorDataSources); var dataScreening = new FuncElement("鏁版嵁绛涙煡", dll, $"{nameSpace}.DataScreeningPage", modular, Resources.DataScreening); - var dataCompare = new FuncElement("鏁版嵁姣旇緝", dll, $"{nameSpace}.DataComparePage", modular, Resources.DataCompare); - return new List<FuncElement>() { dataSources, dataScreening, dataCompare }; + var dataCompare = new FuncElement("鏁版嵁姣旇緝", dll, $"{nameSpace}.DataComparePage", modular, Resources.DataCompare); + var curveAnalyzePacketEasyMgrPage = new FuncElement("鏇茬嚎鍒嗘瀽(绠�鏄�)", dll, $"{nameSpace}.CurveAnalyzePacketEasyMgrPage", modular, Resources.DataCompare); + return new List<FuncElement>() { dataSources, dataScreening, dataCompare, curveAnalyzePacketEasyMgrPage }; } public static List<FuncElement> WorkingConditionAnalysis() @@ -57,18 +57,20 @@ var modelCorrection = new FuncElement("妯″瀷淇", dll, $"{nameSpace}.ModelCorrectionPage", modular, Resources.HydraulicModel); var modelCorrectionCombine = new FuncElement("妯″瀷淇缁勫悎", dll, $"{nameSpace}.ModelCorrectionCombinePage", modular, Resources.HydraulicModel); var modelCorrectionCompare = new FuncElement("妯″瀷淇瀵规瘮", dll, $"{nameSpace}.ModelCorrectionComparePage", modular, Resources.HydraulicModel); + var scheduleCalcPage = new FuncElement("璋冨害鍒嗘瀽", dll, $"{nameSpace}.ScheduleCalcPage", modular, Resources.WorkPumpCurve); var operationalAnalysis = new FuncElement("杩愯瑙嗗浘", dll, $"{nameSpace}.OperationalViewPage", modular, Resources.OperationalAnalysis); + var stationRelationship = new FuncElement("娉电珯鍏崇郴", dll, $"{nameSpace}.StationRelationshipPage", modular, Resources.OperationalAnalysis); - + //var scadaVerify = new FuncElement("宸ュ喌楠岃瘉", dll, $"{nameSpace}.ScadaVerifyPage", modular, Resources.CurveAnalyze); //var scadaValueVerify = new FuncElement("Scada楠岃瘉", dll, $"{nameSpace}.ScadaValueVerifyPage", modular, Resources.CurveAnalyze); //var scadaStatisticsPage = new FuncElement("Scada缁熻", dll, $"{nameSpace}.ScadaStatisticsPage", modular, Resources.CurveAnalyze); //var scadaAvgDiffVerify = new FuncElement("宸ュ喌鍧囧樊楠岃瘉", dll, $"{nameSpace}.ScadaDiffPage", modular, Resources.CurveAnalyze); - return new List<FuncElement>() { dataIntegration, dataVerification, dataCorrection, modelCorrection, modelCorrectionCombine, modelCorrectionCompare, operationalAnalysis }; + return new List<FuncElement>() { dataIntegration, dataVerification, dataCorrection, modelCorrection, modelCorrectionCombine, modelCorrectionCompare, scheduleCalcPage, operationalAnalysis, stationRelationship }; //return new List<FuncElement>() { dataIntegration, dataVerification, dataCorrection, modelCorrection, modelCorrectionCombine, operationalAnalysis, scadaVerify, scadaAvgDiffVerify, scadaValueVerify, scadaStatisticsPage }; } - + public static List<FuncElement> GetFuncElements() { var basic = new FuncElement("鍩虹鏁版嵁", Basic(), Resources.Menu); -- Gitblit v1.9.3