MainWindow

BPASmartClient/DeviceInfo.xml

@@ -26,12 +26,12 @@
     </Peripherals>
   </Device>-->
 
-  <Device Name="MorkT" Module="BPASmartClient.MorkT.Control_MorkT" DeviceId="29">
+  <!--<Device Name="MorkT" Module="BPASmartClient.MorkT.Control_MorkT" DeviceId="29">
     <Peripherals>
       <Peripheral Module="BPASmartClient.DRCoffee.CoffeeMachine">
         <Parameters>
           <PortName>COM4</PortName>
-          <BaudRate>115200</BaudRate>
+          <BaudRate>115200</BaudRate>-->
           <!--<IpAddress>192.168.6.1</IpAddress>
           <Port>502</Port>
           <PLCReadAddress>M,M0.1,1;M,M1.0,8;M,M2.0,9;M,M8.0,4;M,M13.5,1;M,M16.0,7;</PLCReadAddress>-->
@@ -50,15 +50,15 @@
 	  		<BaudRate>9600</BaudRate>
 	  	</Parameters>
 	  </Peripheral>
-		<!--<Peripheral Module="BPASmartClient.Lebai.LebaiRobot">
+		<!<Peripheral Module="BPASmartClient.Lebai.LebaiRobot">
 			<Parameters>
 				<IpAddress>192.168.2.100</IpAddress>
 				<HandSensor>1</HandSensor>
 				<OutputSingalValue>0</OutputSingalValue>
 			</Parameters>
 		</Peripheral>-->
-    </Peripherals>
-  </Device>-->
+    <!--</Peripherals>
+  </Device>-->-->
 
 
   <!--<Device Name="MorkF" Module="BPASmartClient.MorkF.Control_MorkF" DeviceId="2">

BPASmartClient/MainWindow.xaml

@@ -267,7 +267,7 @@
                         Foreground="#feffff">
                         日志监控界面
                     </TextBlock>
-                    
+
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                         <Button
                         Name="login" Margin="5,0,5,0"
@@ -278,7 +278,7 @@
                         Click="Button_Login"
                         Content="登录"
                         Cursor="Hand"/>
-                    <Button
+                        <Button
                         Name="logout"
                         Grid.Row="0"
                         Width="45"
@@ -288,6 +288,8 @@
                         Command="{Binding LogoutCommand}"
                         Content="注销"
                         Cursor="Hand" />
+                    </StackPanel>
+                    
                 </Grid>
                 
                 <!--#region 底部窗体栏-->