diff --git a/InSituLaboratory/App.xaml.cs b/InSituLaboratory/App.xaml.cs index 6aee956..e32c4b0 100644 --- a/InSituLaboratory/App.xaml.cs +++ b/InSituLaboratory/App.xaml.cs @@ -57,6 +57,7 @@ namespace InSituLaboratory containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); @@ -73,6 +74,7 @@ namespace InSituLaboratory containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); } } diff --git a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs new file mode 100644 index 0000000..182a470 --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs @@ -0,0 +1,29 @@ +using InSituLaboratory.Models; +using Prism.Services.Dialogs; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Dialogs +{ + public class ModifySequentialViewModel : DialogViewModelBase + { + public ModifySequentialViewModel() + { + + } + + public override void OnDialogOpened(IDialogParameters parameters) + { + + } + + public override void DoSave() + { + + } + + } +} diff --git a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs new file mode 100644 index 0000000..cc2b445 --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs @@ -0,0 +1,68 @@ +using InSituLaboratory.Entities; +using InSituLaboratory.Models; +using Prism.Regions; +using Prism.Services.Dialogs; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; + +namespace InSituLaboratory.ViewModels.Pages +{ + public class SequentialDistributionViewModel : ViewModelBase + { + + IDialogService _dialogService; + public SequentialDistributionViewModel(IRegionManager regionManager, IDialogService dialogService) : base(regionManager) + { + this.PageTitle = "时序下发"; + _dialogService = dialogService; + + Refresh(); + } + + /// + /// 编辑或者新增 + /// + /// + public override void DoModify(object model) + { + DialogParameters ps = new DialogParameters(); + ps.Add("model", model); + _dialogService.ShowDialog("ModifySequentialView", ps, result => + { + // 判断子窗口的返回状态,如果OK,刷新当前页面,否则不管 + if (result.Result == ButtonResult.OK) + { + this.Refresh(); + } + }); + } + + /// + /// 删除 + /// + /// + public override void DoDelete(object model) + { + try + { + if (MessageBox.Show("是否确定删除此项?", "提示", MessageBoxButton.YesNo) == + MessageBoxResult.Yes) + { + // 物理删除 + + MessageBox.Show("删除完成!", "提示"); + + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "提示"); + } + + } + } +} diff --git a/InSituLaboratory/Views/Pages/DashboardView.xaml b/InSituLaboratory/Views/Pages/DashboardView.xaml index 7147d40..edb0063 100644 --- a/InSituLaboratory/Views/Pages/DashboardView.xaml +++ b/InSituLaboratory/Views/Pages/DashboardView.xaml @@ -6,7 +6,154 @@ xmlns:local="clr-namespace:InSituLaboratory.Views.Pages" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml b/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml new file mode 100644 index 0000000..df70220 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml.cs b/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml.cs new file mode 100644 index 0000000..8a4af60 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Dialogs +{ + /// + /// ModifySequentialView.xaml 的交互逻辑 + /// + public partial class ModifySequentialView : UserControl + { + public ModifySequentialView() + { + InitializeComponent(); + } + } +} diff --git a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml new file mode 100644 index 0000000..c0b3674 --- /dev/null +++ b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +