冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/10-analy/SimulationSingleWorkingAnalyCtrl.Designer.cs

@@ -35,9 +35,9 @@
            pageForEnergy = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            simulationSingleWorkingEnergyCtrl1 = new SimulationSingleWorkingEnergyCtrl();
            pageForLossCurve = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            hydroSingleWorkingLossCurveCtrl1 = new HydroSingleWorkingLossCurveCtrl();
            hydroSingleWorkingLossCurveCtrl1 = new HydroLossCurveCtrl();
            pageForLossStatistics = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            hydroSingleWorkingLossStatisticsCtrl1 = new HydroSingleWorkingLossStatisticsCtrl();
            hydroSingleWorkingLossStatisticsCtrl1 = new HydroLossStatisticsCtrl();
            ((ISupportInitialize)tabPane1).BeginInit();
            tabPane1.SuspendLayout();
            pageForEvaluation.SuspendLayout();
@@ -162,8 +162,8 @@
        private DevExpress.XtraBars.Navigation.TabNavigationPage pageForLossCurve;
        private HydroSingleWorkingEvaluationCtrl hydroSingleWorkingEvaluationCtrl1;
        private SimulationSingleWorkingEnergyCtrl simulationSingleWorkingEnergyCtrl1;
        private HydroSingleWorkingLossCurveCtrl hydroSingleWorkingLossCurveCtrl1;
        private HydroLossCurveCtrl hydroSingleWorkingLossCurveCtrl1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage pageForLossStatistics;
        private HydroSingleWorkingLossStatisticsCtrl hydroSingleWorkingLossStatisticsCtrl1;
        private HydroLossStatisticsCtrl hydroSingleWorkingLossStatisticsCtrl1;
    }
}