diff --git a/MainWindow.xaml b/MainWindow.xaml
index 318a0fc..e4b1941 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -73,7 +73,7 @@
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 7084b7d..02fa06d 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -82,6 +82,10 @@ namespace SunlightCentralizedControlManagement_SCCM_
{
Picture.Content = new View.Whole();
}
+ private void ListViewItem_Monitor(object sender, MouseButtonEventArgs e)
+ {
+ Picture.Content = new View.MonitorView();
+ }
private void Buttonhelp_Click(object sender, RoutedEventArgs e)
{
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index bc6932b..d798a25 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -60,6 +60,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 continue 的本地化字符串。
+ ///
+ public static string _continue {
+ get {
+ return ResourceManager.GetString("continue", resourceCulture);
+ }
+ }
+
///
/// 查找类似 lock 的本地化字符串。
///
@@ -1815,15 +1824,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
- ///
- /// 查找类似 Rate 的本地化字符串。
- ///
- public static string Rate1 {
- get {
- return ResourceManager.GetString("Rate1", resourceCulture);
- }
- }
-
///
/// 查找类似 Ready 的本地化字符串。
///
@@ -1915,20 +1915,20 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
///
- /// 查找类似 RunningTime 的本地化字符串。
+ /// 查找类似 Resume 的本地化字符串。
///
- public static string RunningTime {
+ public static string Resume {
get {
- return ResourceManager.GetString("RunningTime", resourceCulture);
+ return ResourceManager.GetString("Resume", resourceCulture);
}
}
///
/// 查找类似 RunningTime 的本地化字符串。
///
- public static string RunningTime1 {
+ public static string RunningTime {
get {
- return ResourceManager.GetString("RunningTime1", resourceCulture);
+ return ResourceManager.GetString("RunningTime", resourceCulture);
}
}
@@ -2040,6 +2040,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 stop 的本地化字符串。
+ ///
+ public static string Stop {
+ get {
+ return ResourceManager.GetString("Stop", resourceCulture);
+ }
+ }
+
///
/// 查找类似 StopProcess 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index d59e532..c5273ea 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -444,9 +444,6 @@
Running Time
-
- Running Time
-
Add The Medicine
@@ -624,9 +621,6 @@
Rate
-
- Rate
-
Tank
@@ -870,15 +864,14 @@
USER
-
-
-
+
+ Monitor
-
-
+
+ Machine
-
-
+
+ MachineGroup
Conveyor
@@ -886,13 +879,13 @@
Planning
-
- Monitor
+
+ Continue
-
- Machine
+
+ Resume
-
- MachineGroup
+
+ Stop
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 702ca84..faeb3ed 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -444,9 +444,6 @@
RunningTime
-
- RunningTime
-
AddTheMedicine
@@ -624,9 +621,6 @@
Rate
-
- Rate
-
Tank
@@ -885,4 +879,13 @@
ProductionPlanning
+
+ continue
+
+
+ Resume
+
+
+ stop
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index c32accd..3a8f2a5 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -444,9 +444,6 @@
运转
-
- 运转
-
加药
@@ -624,9 +621,6 @@
速率
-
- 速率
-
缸
@@ -870,9 +864,6 @@
用户
-
- 生产计划
-
监控
@@ -885,4 +876,16 @@
输送中心
+
+ 生产计划
+
+
+ 继续
+
+
+ 恢复
+
+
+ 结束
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 2776c58..ce7a270 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -444,9 +444,6 @@
運轉
-
- 運轉
-
加藥
@@ -624,9 +621,6 @@
速率
-
- 速率
-
缸
@@ -852,12 +846,12 @@
退出
-
- 全域
-
幫助
+
+ 全域
+
工藝
@@ -879,10 +873,10 @@
機器羣組
-
- 生產計劃
-
輸送中心
+
+ 生產計劃
+
\ No newline at end of file
diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj
index 1fe3bd2..2617b9b 100644
--- a/SunlightCentralizedControlManagement_SCCM_.csproj
+++ b/SunlightCentralizedControlManagement_SCCM_.csproj
@@ -103,6 +103,9 @@
info.xaml
+
+ MonitorView.xaml
+
RoilingTextBlock.xaml
@@ -138,6 +141,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml
new file mode 100644
index 0000000..d75a4ae
--- /dev/null
+++ b/View/MonitorView.xaml
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs
new file mode 100644
index 0000000..cc9c637
--- /dev/null
+++ b/View/MonitorView.xaml.cs
@@ -0,0 +1,50 @@
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+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 SunlightCentralizedControlManagement_SCCM_.View
+{
+ ///
+ /// MonitorView.xaml 的交互逻辑
+ ///
+ public partial class MonitorView : UserControl
+ {
+ public MonitorView()
+ {
+ InitializeComponent();
+ Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
+ }
+
+ private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
+
+ private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
+
+ private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
+
+ private void ListViewItem_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+ {
+
+ }
+ }
+}