冲突缺少文件补充

duheng

2024-09-23 651d1f87d2e0e26021c20f3667e1db7b1349b478

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -18,6 +18,8 @@
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.assetsMainChoicePage1.FormRowClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
        }

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
@@ -57,7 +59,7 @@
                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
            }
            this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
            this.xhsProjectSimulationL3dCtrl1.SetBindingData(_hydroInfo);
            //this.xhsProjectSimulationL3dCtrl1.SetBindingData(_hydroInfo);
        }

        /// <summary>
@@ -163,6 +165,7 @@
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            // this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;

            this.hydroParterListCtrl1.SetBindingData(_hydroInfo);
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -299,7 +302,7 @@
                Name = x.Name,
                DbID = x.DbId,
                DbLocked = x.DbLocked,
                //ChartDbID=_hydroInfo.Curves?.Find(t=>t.Code==x.CurveQH)?.DbId,这里不是long CurveDbId
                ChartDbID = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.DbId,
                ModelType = x.ModelType,
                RatedP = x.RatedP,
                RatedH = x.RatedH,
@@ -311,10 +314,10 @@
                ID = x.ID,
                Name = x.Name,
                Code = x.Code,
                //  Dbid=x.DbId,这里是string DbId
                Dbid = x.DbId,
                DbLocked = x.DbLocked,
                ModelType = x.ModelType,
                //   Caliber = x.Caliber,
                //  Caliber = x.Caliber,
                Material = x.Material
            }).ToList();
            input.ThreeLinkMatchingModels = _hydroInfo.Threelinks?.Select(x => new ThreeLinkMatchingViewModel()
@@ -322,10 +325,10 @@
                ID = x.ID,
                Name = x.Name,
                Code = x.Code,
                // Dbid=x.DbId,这里是string DbId
                DbId = x.DbId,
                DbLocked = x.DbLocked,
                ModelType = x.ModelType,
                //   Caliber = x.Caliber,
                //Caliber = x.Caliber,
                Material = x.Material
            }).ToList();
            input.FourLinkMatchingModels = _hydroInfo.Fourlinks?.Select(x => new FourLinkMatchingViewModel()
@@ -333,10 +336,10 @@
                ID = x.ID,
                Name = x.Name,
                Code = x.Code,
                // Dbid=x.DbId,这里是string DbId
                Dbid = x.DbId,
                DbLocked = x.DbLocked,
                ModelType = x.ModelType,
                //     Caliber = x.Caliber,
                //   Caliber = x.Caliber,
                Material = x.Material
            }).ToList();
            input.PipeLineMatchingModels = _hydroInfo.Pipes?.Select(x => new PipeLineMatchingViewModel()
@@ -344,10 +347,10 @@
                ID = x.ID,
                Name = x.Name,
                Code = x.Code,
                // Dbid=x.DbId,这里是string DbId
                DbId = x.DbId,
                DbLocked = x.DbLocked,
                ModelType = x.ModelType,
                //Caliber = x.Diameter,//这里是数值
                Caliber = x.Diameter,//这里是数值
                Material = x.Material
            }).ToList();

@@ -356,22 +359,25 @@
                ID = x.ID,
                Name = x.Name,
                Code = x.Code,
                // Dbid=x.DbId,这里是string DbId
                DbId = x.DbId,
                DbLocked = x.DbLocked,
                ModelType = x.ModelType,
                Caliber = x.Diameter.ToString(),//这里是数值
                Caliber = x.Diameter,//这里是数值
                Material = x.Material//怎么没有阀门类型
            }).ToList();

            //既然入参和出参已经保持一致了，就不能叫做InputViewModel了，有歧义
            //这里可以先是窗体，调试好，后面改成控件
            var dlg = new AssetsAutoMatchingMainDlg();
            dlg.SetBindingData(input);
            dlg.RelaodEvent += (rhs) =>
            {
                return false;
            };
            dlg.ShowDialog();
            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.hydroParterListCtrl1.SetBindingData(_hydroInfo);
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
            this.docPnlMatchingList.Height = 350;
            this.assetsMainChoicePage1.SetBindingData(input);
            this.assetsMainChoicePage1.RelaodEvent += (rhs) =>
                 {
                     return false;
                 };
        }

        private void BtnPerformChart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -402,7 +408,6 @@
            ShowProperty();
        }


        //未匹配列表点击事件
        private async void xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
        {
@@ -420,6 +425,5 @@
            _parter = null;
            ShowProperty();
        }

    }
}