冲突

duheng

2024-12-11 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs

@@ -32,8 +32,8 @@
        {
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage));
            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
            barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
            barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
@@ -483,9 +483,9 @@
            barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage");
            barBtnRepair.Name = "barBtnRepair";
            barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
            toolTipItem1.Text = "通过试算，调整管段上下游";
            superToolTip1.Items.Add(toolTipItem1);
            barBtnRepair.SuperTip = superToolTip1;
            toolTipItem2.Text = "通过试算，调整管段上下游";
            superToolTip2.Items.Add(toolTipItem2);
            barBtnRepair.SuperTip = superToolTip2;
            barBtnRepair.ItemClick += barBtnRepair_ItemClick;
            // 
            // barBtnWorkingEvaluation
@@ -541,6 +541,7 @@
            barBtnEditScheme.Id = 82;
            barBtnEditScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditScheme.ImageOptions.SvgImage");
            barBtnEditScheme.Name = "barBtnEditScheme";
            barBtnEditScheme.ItemClick += barBtnEditScheme_ItemClick;
            // 
            // barBtnDeleteScheme
            // 
@@ -548,6 +549,7 @@
            barBtnDeleteScheme.Id = 83;
            barBtnDeleteScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDeleteScheme.ImageOptions.SvgImage");
            barBtnDeleteScheme.Name = "barBtnDeleteScheme";
            barBtnDeleteScheme.ItemClick += barBtnDeleteScheme_ItemClick;
            // 
            // barBtnExportWord
            //