From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期六, 12 十月 2024 13:59:15 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/NozzleManageMainPage.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/NozzleManageMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/NozzleManageMainPage.cs similarity index 93% rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/NozzleManageMainPanel.cs rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/NozzleManageMainPage.cs index 476cb65..ad71bed 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/NozzleManageMainPanel.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/NozzleManageMainPage.cs @@ -1,8 +1,8 @@ 锘縩amespace HStation.WinFrmUI.Assets { - public partial class NozzleManageMainPanel : DocumentPage + public partial class NozzleManageMainPage : DocumentPage { - public NozzleManageMainPanel() + public NozzleManageMainPage() { InitializeComponent(); this.PageTitle.Caption = "鍠峰ご绠$悊"; @@ -13,14 +13,14 @@ this.nozzleTreeListCtrl1.ReloadEvent += NozzleTreeListCtrl1_ReloadEvent; } - private BLL.NozzleMain _bll = null; + private BLL.AssetsNozzleMain _bll = null; private List<NozzleViewModel> _allBindingList = new List<NozzleViewModel>(); //鍒濆鍖栨暟鎹� public override void InitialDataSource() { - _bll = new BLL.NozzleMain(); + _bll = new BLL.AssetsNozzleMain(); this.nozzleTreeListCtrl1.SetBindingData(); this.nozzleViewModelBindingSource.DataSource = _allBindingList; this.nozzleViewModelBindingSource.ResetBindings(false); @@ -69,7 +69,7 @@ //娣诲姞绠¢亾 private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - var dlg = new AddNozzleMainDlg(); + var dlg = new AddAssetsNozzleMainDlg(); var series = this.nozzleTreeListCtrl1.GetCurrentSeries(); if (series == null) { @@ -101,7 +101,7 @@ MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!"); return; } - var dlg = new EditNozzleMainDlg(); + var dlg = new EditAssetsNozzleMainDlg(); var Nozzle = await _bll.GetByID(vm.ID); if (Nozzle == null) return; -- Gitblit v1.9.3