diff --git a/ConvertMoels/StateToColorConvert.cs b/ConvertMoels/StateToColorConvert.cs
index 2ef7267..08683c8 100644
--- a/ConvertMoels/StateToColorConvert.cs
+++ b/ConvertMoels/StateToColorConvert.cs
@@ -21,10 +21,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
{
string i = value.ToString();
- if (i == "101") return "Gray";
- else if (i == "201") return "green";
+ if (i == "201") return "green";
else if (i == "202") return "yellow";
- else return "Red";
+ else if (i == "309") return "Red";
+ else return "block";
}
}
diff --git a/ConvertMoels/StatenConvert.cs b/ConvertMoels/StatenConvert.cs
index 98299f4..41e63e9 100644
--- a/ConvertMoels/StatenConvert.cs
+++ b/ConvertMoels/StatenConvert.cs
@@ -38,7 +38,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
else if (i == "801") Staten = Properties.Resources.Implementation;//连接成功
else if (i == "801") Staten = Properties.Resources.Online;//在线
else if (i == "899") Staten = Properties.Resources.CloseTheConnection;//关闭连接
- else Staten = "null";
+ else Staten = "";
return Staten;
}
diff --git a/View/DyelotView.xaml b/View/DyelotView.xaml
index 9777e8b..8135164 100644
--- a/View/DyelotView.xaml
+++ b/View/DyelotView.xaml
@@ -5,8 +5,14 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"
xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
+ xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
+ xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel"
mc:Ignorable="d" Loaded="UserControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
+
+
+
+
-
+
+
+
+
+