From e0b138b3e057de6f57021e6c8963868f5c5acc5a Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期二, 22 四月 2025 11:07:06 +0800
Subject: [PATCH] 大改
---
TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPage性能测试/FeatTestViewMainPage_基本信息.cs | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git "a/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPage\346\200\247\350\203\275\346\265\213\350\257\225/FeatTestViewMainPage_\345\237\272\346\234\254\344\277\241\346\201\257.cs" "b/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPage\346\200\247\350\203\275\346\265\213\350\257\225/FeatTestViewMainPage_\345\237\272\346\234\254\344\277\241\346\201\257.cs"
index ab7b9a4..7ab1fcc 100644
--- "a/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPage\346\200\247\350\203\275\346\265\213\350\257\225/FeatTestViewMainPage_\345\237\272\346\234\254\344\277\241\346\201\257.cs"
+++ "b/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPage\346\200\247\350\203\275\346\265\213\350\257\225/FeatTestViewMainPage_\345\237\272\346\234\254\344\277\241\346\201\257.cs"
@@ -26,7 +26,11 @@
this._partInfoCtrl.OnEditMore += () =>
{
- EditPumpMore();
+ EditPumpMoreInfo();
+ };
+ this._partInfoCtrl.OnChangePump += () =>
+ {
+ ChangePumpEntity();
};
this._partInfoCtrl.OnGetMaxEtaPt += () =>
{
@@ -61,7 +65,7 @@
if (eleInfo == null)
return;
};
- this._partInfoCtrl.OnChangePumpInfo += (rateParas) =>
+ this._partInfoCtrl.OnChangeRatedParas += (rateParas) =>
{
if (rateParas != this._ratedParas.ToJson())
{
@@ -82,18 +86,13 @@
this.tabPagePartInfo.Controls.Add(this._partInfoCtrl);
}
- if (this._currentPump == null)
- {
- this._partInfoCtrl.Enabled = false;
- }
- else
- {
- this._partInfoCtrl.SetBindingData(
+
+ this._partInfoCtrl.SetBindingData(
this._currentPump,
this._currentMotor,
this._currentPart,
this._featTestItem.ElectricInfo);
- }
+
}
//PumpTestBimfaceViewCtrl _model3dCtrl = null;
@@ -197,9 +196,12 @@
private void bbi浜у搧鍙傛暟_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- EditPumpMore();
+ EditPumpMoreInfo();
}
- private void EditPumpMore()
+ /// <summary>
+ ///
+ /// </summary>
+ private void EditPumpMoreInfo()
{
if (_currentPump == null)
return;
@@ -208,12 +210,21 @@
TProduct.WinFrmUI.Data4Factory.EditProductPumpDlg
dlg = new Data4Factory.EditProductPumpDlg();
dlg.Shown += delegate { WaitFrmHelper.HideWaitForm(); };
- dlg.SetBindingData(this._currentPump);
- dlg.ReloadDataEvent += (pump, isChangePart, motor) =>
+ dlg.SetBindingData(this._currentPump,this._currentPart==null?0:this._currentPart.ID);
+ dlg.IsEditChangedAble( false);
+ dlg.ReloadDataEvent += (isChangePart, pump, motor,part) =>
{
- this._currentPump.Reset(pump);
+ if (part != null)
+ {
+ this._currentPart = part;
+ }
+ this._currentPump.Reset(pump);
+ this._ratedParas = TProduct.Model.RatedParas4Pump.ToModel(pump.RatedParas);
+ JudgeTestResult();
+ this._chartMainCtrl.RefreshRatedParas(this._ratedParas, this._testJudgeItems);
ShowCmdOperateInfo("鏇存柊鎴愬姛!");
XtraMessageBox.Show("鏇存柊鎴愬姛锛�");
+
if (this._partInfoCtrl != null)
{
this._partInfoCtrl.SetBindingData(
@@ -230,5 +241,12 @@
};
dlg.Show();
}
+ /// <summary>
+ ///
+ /// </summary>
+ private void ChangePumpEntity()
+ {
+
+ }
}
}
--
Gitblit v1.9.3