HStation/XHS.V1.0.git

			@@ -400,7 +400,7 @@
			pumpCustomLabel.Id = pump.Code;
			pumpCustomLabel.Data = new List<CustomLabelItem>()
			{
			new CustomLabelItem(){ Name="运行状态",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
			new CustomLabelItem(){ Name="状态",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
			new CustomLabelItem(){ Name="转速",Value=speed?.ToString(),Unit="r/min"},
			new CustomLabelItem(){ Name="流量",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m³/h"},
			new CustomLabelItem(){ Name="进口压力",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},

			@@ -269,9 +269,9 @@
			// pageGroupModel
			//
			pageGroupModel.ItemLinks.Add(barBtnShowHide);
			pageGroupModel.ItemLinks.Add(barBtnSearch);
			pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
			pageGroupModel.ItemLinks.Add(barBtnSetList);
			pageGroupModel.ItemLinks.Add(barBtnSearch);
			pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
			pageGroupModel.Name = "pageGroupModel";
			pageGroupModel.Text = "模型";
			@@ -285,8 +285,8 @@
			//
			// ribbonPageGroup3
			//
			ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
			ribbonPageGroup3.ItemLinks.Add(barBtnSave);
			ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
			ribbonPageGroup3.Name = "ribbonPageGroup3";
			ribbonPageGroup3.Text = "更多...";
			//

			@@ -594,21 +594,59 @@
			{
			return;
			}
			_checkResult = _hydroInfo.Check();
			if (!_checkResult.Succeed)
			{
			this.controlContainerBottom.Controls.Clear();
			var checkResultCtrl = GetCheckResultCtrl();
			checkResultCtrl.SetBindingData(_checkResult);
			this.controlContainerBottom.Controls.Add(checkResultCtrl);
			TipFormHelper.ShowWarn("校验失败，请检查后重试");
			return;
			}

			var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
			_calcuResult = netWork.Calcu();
			if (_calcuResult.Succeed)
			{
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
			this.controlContainerBottom.Controls.Clear();
			var parterListCtrl = GetParterListCtrl();
			var calcuResultList = new List<IHydroCalcuResult>();
			_calcuResult.NodeList?.ForEach(x =>
			{
			calcuResultList.Add(new HydroCalcuNodeResult()
			{
			Code = x.Id,
			CalcuPress = x.Press,
			CalcuHead = x.Head,
			CalcuDemand = x.Demand,
			});
			});
			_calcuResult.LinkList?.ForEach(x =>
			{
			calcuResultList.Add(new HydroCalcuLinkResult()
			{
			Code = x.Id,
			CalcuFlow = x.Flow,
			CalcuVelocity = x.Velocity,
			CalcuHeadLoss = x.Headloss
			});
			});
			parterListCtrl.SetBindingData(_hydroInfo, calcuResultList);
			parterListCtrl.SetCalcuView();
			this.controlContainerBottom.Controls.Add(parterListCtrl);
			this.docPnlBottom.Text = "计算结果";
			ShowProperty();
			TipFormHelper.ShowSucceed("计算成功！");
			await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
			TipFormHelper.ShowSucceed("计算成功！");
			}
			else
			{
			_calcuCtrl.SetBindingData(_calcuResult.FailedList);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "水力计算失败原因";
			this.docPnlBottom.Text = "计算失败原因";
			this.docPnlBottom.Height = 350;
			TipFormHelper.ShowError("计算失败");
			}

			};
			@@ -630,7 +668,7 @@
			calcuCtrl.SetBindingData(_hydroInfo);
			this.controlContainerBottom.Controls.Add(calcuCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "水力计算前提条件";
			this.docPnlBottom.Text = "计算前提条件";
			this.docPnlBottom.Height = 350;
			}

	WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史