diff --git a/View/CurveView.xaml b/View/CurveView.xaml
index 4437278..cb0e158 100644
--- a/View/CurveView.xaml
+++ b/View/CurveView.xaml
@@ -15,6 +15,8 @@
+
+
-
+ Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"
+ Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+
+
diff --git a/View/DyeingPlanView.xaml b/View/DyeingPlanView.xaml
index c53ebda..66bbf19 100644
--- a/View/DyeingPlanView.xaml
+++ b/View/DyeingPlanView.xaml
@@ -15,15 +15,15 @@
-
-
-
@@ -31,59 +31,59 @@
VerticalAlignment="Top" Width="120" FontSize="25"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
("StepID"))//步骤用时计算
{
case "001":
TT = MSTT;
- TC = (Double)dat.Rows[i][7];
+ TC = dat.Rows[i].Field("Parameter2");
if (TC > 9.9 || TC < 0.1) TC = 9.9;//计算限制
- MSTT = (Double)dat.Rows[i][6];
+ MSTT = dat.Rows[i].Field("Parameter1");
TT = Math.Abs(MSTT - TT) / TC * 60;
TIMET = Convert.ToDateTime(TIMET).AddSeconds(TT).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "007":
@@ -458,15 +456,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "013":
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]* (Double)dat.Rows[i][9]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter3") * dat.Rows[i].Field("Parameter4")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "015":
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "017":
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "020":
@@ -478,11 +476,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "031":
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][6]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter1")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "065":
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][8]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "091":
@@ -495,7 +493,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
case "093":
- TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][6]).ToString("HH:mm:ss");
+ TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field("Parameter1")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break;
default:
diff --git a/View/MachinesView.xaml b/View/MachinesView.xaml
index fcec75e..9864720 100644
--- a/View/MachinesView.xaml
+++ b/View/MachinesView.xaml
@@ -16,6 +16,8 @@
+
+
@@ -77,11 +79,11 @@
-
+ Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"
+ Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+
@@ -103,8 +105,7 @@