diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml index 80ece1a..74a5177 100644 --- a/View/MonitorView.xaml +++ b/View/MonitorView.xaml @@ -79,7 +79,7 @@ - + - + @@ -194,9 +194,9 @@ - + - + @@ -204,15 +204,15 @@ - + - + - + @@ -220,7 +220,7 @@ - + @@ -228,16 +228,15 @@ - + - - + diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 05b1bdf..d5f4461 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -249,6 +249,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View MessageBox.Show(machine + Properties.Resources.user_unlock, "800", MessageBoxButton.OK, MessageBoxImage.Information); } }//锁定 + private void ListViewItem_Curve(object sender, MouseButtonEventArgs e) { log.Visibility = Visibility.Collapsed; @@ -626,6 +627,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View RaisePropertyChanged("TechnologicalProcess_View"); } } + public ObservableCollection TechnologicalMachine_View { get { return technologicalMachine_View; }