diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index a441d99..a241214 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -413,6 +413,12 @@
+
+
+
+
+
+
diff --git a/Lmage/FlatColorIconsCancel.png b/Lmage/FlatColorIconsCancel.png
new file mode 100644
index 0000000..02ff9d8
Binary files /dev/null and b/Lmage/FlatColorIconsCancel.png differ
diff --git a/Lmage/Hand.png b/Lmage/Hand.png
new file mode 100644
index 0000000..22e70b6
Binary files /dev/null and b/Lmage/Hand.png differ
diff --git a/Lmage/IconParkLock.png b/Lmage/IconParkLock.png
new file mode 100644
index 0000000..54c5369
Binary files /dev/null and b/Lmage/IconParkLock.png differ
diff --git a/Lmage/IconParkPauseOne.png b/Lmage/IconParkPauseOne.png
new file mode 100644
index 0000000..0c73ec7
Binary files /dev/null and b/Lmage/IconParkPauseOne.png differ
diff --git a/Lmage/IconParkPlay.png b/Lmage/IconParkPlay.png
new file mode 100644
index 0000000..f309edc
Binary files /dev/null and b/Lmage/IconParkPlay.png differ
diff --git a/Lmage/IconParkStopwatch.png b/Lmage/IconParkStopwatch.png
new file mode 100644
index 0000000..0841b12
Binary files /dev/null and b/Lmage/IconParkStopwatch.png differ
diff --git a/Lmage/Manual.png b/Lmage/Manual.png
new file mode 100644
index 0000000..2dced26
Binary files /dev/null and b/Lmage/Manual.png differ
diff --git a/MainWindow.xaml b/MainWindow.xaml
index b832df8..26a1be7 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -58,52 +58,90 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
@@ -117,17 +155,37 @@
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index 851c7e1..7d8c173 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -135,6 +135,12 @@ namespace DyeingComputer.ViewModel
OnPropertyChanged("Status_Str_coloer");
}
}
+ public int wORK_run; //显示状态
+ public int WORK_run //通知UI控件参数改变
+ {
+ get { return wORK_run; }
+ set { wORK_run = value; OnPropertyChanged("WORK_run"); }
+ }
public string work_Temp; //显示温度
public string Work_Temp //通知UI控件参数改变
{
@@ -790,7 +796,6 @@ namespace DyeingComputer.ViewModel
break;//PH温度控制
case "093":
STEP_TIME = Convert.ToInt16(P1);
- WORK_RUN = 2;
SETP_runtime = true;
STEP_finish = false;
break;//PH检测
@@ -826,6 +831,7 @@ namespace DyeingComputer.ViewModel
private int TANK1_REDYE,TANK1_STEP, TANK2_REDYE, TANK2_STEP, TANK3_REDYE, TANK3_STEP;
void STEP_RUN()
{
+ WORK_run = WORK_RUN;
if (WORK_RUN == 2)
{
if (SETP_runtime && (!STEP_finish))//