diff --git a/BPASmart.MenuLoad/BPASmart.MenuLoad.csproj b/BPASmart.MenuLoad/BPASmart.MenuLoad.csproj index 15c0fe6e..5ce28106 100644 --- a/BPASmart.MenuLoad/BPASmart.MenuLoad.csproj +++ b/BPASmart.MenuLoad/BPASmart.MenuLoad.csproj @@ -19,6 +19,7 @@ + diff --git a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj index 6c7bc60f..4fd8fe4e 100644 --- a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj +++ b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj @@ -47,6 +47,8 @@ + + @@ -70,6 +72,8 @@ + + @@ -211,6 +215,12 @@ Always + + Always + + + Always + Always @@ -289,6 +299,12 @@ Always + + Always + + + Always + Always diff --git a/BPASmartClient.SCADAControl/Images/Tab_NoWZBJ.png b/BPASmartClient.SCADAControl/Images/Tab_NoWZBJ.png new file mode 100644 index 00000000..2f572964 Binary files /dev/null and b/BPASmartClient.SCADAControl/Images/Tab_NoWZBJ.png differ diff --git a/BPASmartClient.SCADAControl/Images/Tab_SelectWZBJ.png b/BPASmartClient.SCADAControl/Images/Tab_SelectWZBJ.png new file mode 100644 index 00000000..53f6112d Binary files /dev/null and b/BPASmartClient.SCADAControl/Images/Tab_SelectWZBJ.png differ diff --git a/BPASmartClient.SCADAControl/Images/组 7.png b/BPASmartClient.SCADAControl/Images/组 7.png new file mode 100644 index 00000000..47cf27eb Binary files /dev/null and b/BPASmartClient.SCADAControl/Images/组 7.png differ diff --git a/BPASmartClient.SCADAControl/Images/组 8.png b/BPASmartClient.SCADAControl/Images/组 8.png new file mode 100644 index 00000000..c58a30eb Binary files /dev/null and b/BPASmartClient.SCADAControl/Images/组 8.png differ diff --git a/BPASmartClient.SCADAControl/Themes/Generic.xaml b/BPASmartClient.SCADAControl/Themes/Generic.xaml index 305b450b..109260c8 100644 --- a/BPASmartClient.SCADAControl/Themes/Generic.xaml +++ b/BPASmartClient.SCADAControl/Themes/Generic.xaml @@ -2047,6 +2047,64 @@ + +