diff --git a/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml b/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml
index 2426ffba..8b6a4b0d 100644
--- a/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml
+++ b/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml
@@ -4,5 +4,15 @@
xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters">
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 2fb2713f..1caea14f 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -3,7 +3,7 @@
-
+
@@ -16,8 +16,10 @@
-
- -->
+ -->
+
+
+
@@ -37,10 +39,10 @@
-
-
+
+
-
+
diff --git a/BPASmartClient/App.xaml b/BPASmartClient/App.xaml
index 29cb2e65..a85b3559 100644
--- a/BPASmartClient/App.xaml
+++ b/BPASmartClient/App.xaml
@@ -13,6 +13,8 @@
+
+
diff --git a/BPASmartClient/Control/ShopDeviceConfigView.xaml b/BPASmartClient/Control/ShopDeviceConfigView.xaml
index 358590c6..a242d89d 100644
--- a/BPASmartClient/Control/ShopDeviceConfigView.xaml
+++ b/BPASmartClient/Control/ShopDeviceConfigView.xaml
@@ -7,8 +7,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
- d:DesignHeight="450"
- d:DesignWidth="800"
+ d:DesignHeight="900"
+ d:DesignWidth="1200"
mc:Ignorable="d">
@@ -19,6 +19,7 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -72,193 +323,204 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ FontSize="20"
+ Foreground="#ff23caca"
+ IsEditable="False"
+ ItemsSource="{Binding ClientDevices}"
+ SelectedIndex="0"
+ Style="{StaticResource ComboBoxStyle}"
+ Text="{Binding ClientDeviceType}" />
-
+
-
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Grid.Column="5"
+ Width="170"
+ HorizontalAlignment="Left"
+ Style="{StaticResource TextBoxStyle}"
+ Text="" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Text="请选择设备模块：" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+ Text="IP地址：" />
+ Width="170"
+ HorizontalAlignment="Left"
+ Style="{StaticResource TextBoxStyle}"
+ Text="{Binding Path=Device.IP}" />
-
+ Text="端口号：" />
+ Width="170"
+ HorizontalAlignment="Left"
+ Style="{StaticResource TextBoxStyle}"
+ Text="{Binding Path=Device.PortNum}" />
-
-
-
-
-
+ HorizontalAlignment="Right"
+ Style="{StaticResource TextBlockStyle}"
+ Text="站号：" />
+
+
-
+
- -->
-
-
+
-
-
-
-
+
+
+
+
- -->
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- -->
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- -->
-
-
+
+
+
+
+
+
+
-
diff --git a/BPASmartClient/DeviceInfo.xml b/BPASmartClient/DeviceInfo.xml
index 89e636c8..48d28f7c 100644
--- a/BPASmartClient/DeviceInfo.xml
+++ b/BPASmartClient/DeviceInfo.xml
@@ -38,7 +38,7 @@
-->
-
+
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index dc110869..f68747fa 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -13,7 +13,7 @@
Height="800"
AllowsTransparency="True"
Background="{x:Null}"
- Topmost="True"
+ Topmost="False"
WindowStartupLocation="CenterScreen"
WindowStyle="None"
mc:Ignorable="d">