From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs
index bd537dd..f6aabcc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs
@@ -23,6 +23,11 @@
/// 瀹圭Н鏇茬嚎
/// </summary>
public string VolCurve { get; set; }
+
+ /// <summary>
+ /// 鍨嬪彿ID
+ /// </summary>
+ public long MainID { get; set; }
}
public class CurvieInfo
@@ -89,7 +94,7 @@
{
foreach (var item in list)
{
- _allPhartList.Add(new PhartViewModel { ID = item.ID, VolCurve = item.VolCurve });
+ _allPhartList.Add(new PhartViewModel { ID = item.ID, VolCurve = item.VolCurve, MainID = item.MainID,OtherName="榛樿鏇茬嚎",Importance=1 });
}
}
}
@@ -134,7 +139,7 @@
var vmo = await _bll_ex.Value.GetByID(vm.ID);
if (vmo != null)
{
- _pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
+ _pumpMatchingViewModel.MatchingCurveDbId = vm.MainID.ToString();
var pt_list = Yw.JsonHelper.Json2Object<List<HydroCurvePointViewModel>>(vm.VolCurve);
_pumpMatchingViewModel.MatchingVolCurve = pt_list;
}
--
Gitblit v1.9.3