参数配置修改

BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml

@@ -4,5 +4,15 @@
     xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters">
     <!--  文本框的字体颜色  -->
     <SolidColorBrush x:Key="TextBlockForeground" Color="#9934F7F7" />
-    <!--<con:StringToIconConverter x:Key="StringToIconConverter"/>-->
+
+    <!--  表格头边框颜色  -->
+    <SolidColorBrush x:Key="TitleBorderColor" Color="#FF2AB2E7" />
+
+    <!--  表格头字体颜色  -->
+    <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
+
+    <!--  数据表边框颜色  -->
+    <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
+
+
 </ResourceDictionary>

BPASmartClient/App.config

@@ -3,7 +3,7 @@
   <appSettings>
     <!--通用配置-->
     <!--1:且时且多冰淇淋咖啡机，2:且时且多煮面机,3：海科煮面机测试店铺-->
-    <add key="ClientId" value="46"/>
+    <add key="ClientId" value="43"/>
     <!--<add key="ApolloUri" value="http://10.2.1.21:28080"/>
     <add key="OrderServiceUri" value="http://10.2.1.26:21527/order/"/>
     <add key="StockServiceUri" value="http://10.2.1.26:21527/stock/"/>-->
@@ -16,8 +16,10 @@
     <add key="OrderServiceUri" value="https://bpa.black-pa.com:21527/order/"/>
     <add key="StockServiceUri" value="https://bpa.black-pa.com:21527/stock/"/>
     <add key="DataVServiceUri" value="https://bpa.black-pa.com:21527/datav"/>
-    <add key="WebServiceUri" value="https://bpa.black-pa.com:21527"/>
-    <add key="BroadcastPubTopic" value="/broadcast/grgpECHSL7q/Transit_Test_SetDevice"/>-->
+    <add key="WebServiceUri" value="https://bpa.black-pa.com:21527"/>-->
+
+
+    <add key="BroadcastPubTopic" value="/broadcast/grgpECHSL7q/Transit_Test_SetDevice"/>
     <add key="AppId" value="order"/>
     <add key ="Namespaces" value="TEST1.Config"/>
     <add key="IsEnableTest" value="false"/>
@@ -37,10 +39,10 @@
     <add key="OrderServiceUri" value="https://witt.black-pa.com/order/"/>
     <add key="StockServiceUri" value="https://witt.black-pa.com/stock/"/>
     <add key="DataVServiceUri" value="https://witt.black-pa.com/datav"/>
-	<add key="WebServiceUri" value="https://witt.black-pa.com"/>
-	<add key="BroadcastPubTopic" value="/broadcast/grgpECHSL7q/Transit_SetDevice"/>
+    <add key="WebServiceUri" value="https://witt.black-pa.com"/>
+    <add key="BroadcastPubTopic" value="/broadcast/grgpECHSL7q/Transit_SetDevice"/>
 
-	<!--阿里云上报启动方式:API 或者 LOCAL-->
+    <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->
     <!--LOCAL:直接使用下方本地“设备连接信息”-->
     <add key="StartupMode" value="API"/>

BPASmartClient/App.xaml

@@ -13,6 +13,8 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/GlobalStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecComboBox.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecIcoButtonStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecToggleButton.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/BeveledRadioButtonStyle.xaml" />
                 <!--<ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml"/>
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml"/>-->
 

BPASmartClient/DeviceInfo.xml

@@ -38,7 +38,7 @@
     </Peripherals>
   </Device>-->
 
-  <Device Name="Morks" Module="BPASmartClient.MorkS.Control" DeviceId="28">
+  <Device Name="Morks" Module="BPASmartClient.MorkS.Control" DeviceId="26">
     <Peripherals>
       <Peripheral Module="BPASmartClient.PLC.MorksMachine">
         <Parameters>

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">