NXX
2 years ago
2 changed files with 9 additions and 7 deletions
Unified View
Diff Options
+ 5
- 5
BPASmartClient/DeviceInfo.xml
View File
| @@ -26,12 +26,12 @@ | |||||
| </Peripherals> | </Peripherals> | ||||
| </Device>--> | </Device>--> | ||||
| <Device Name="MorkT" Module="BPASmartClient.MorkT.Control_MorkT" DeviceId="29"> | |||||
| <!--<Device Name="MorkT" Module="BPASmartClient.MorkT.Control_MorkT" DeviceId="29"> | |||||
| <Peripherals> | <Peripherals> | ||||
| <Peripheral Module="BPASmartClient.DRCoffee.CoffeeMachine"> | <Peripheral Module="BPASmartClient.DRCoffee.CoffeeMachine"> | ||||
| <Parameters> | <Parameters> | ||||
| <PortName>COM4</PortName> | <PortName>COM4</PortName> | ||||
| <BaudRate>115200</BaudRate> | |||||
| <BaudRate>115200</BaudRate>--> | |||||
| <!--<IpAddress>192.168.6.1</IpAddress> | <!--<IpAddress>192.168.6.1</IpAddress> | ||||
| <Port>502</Port> | <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>--> | <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> | <BaudRate>9600</BaudRate> | ||||
| </Parameters> | </Parameters> | ||||
| </Peripheral> | </Peripheral> | ||||
| <!--<Peripheral Module="BPASmartClient.Lebai.LebaiRobot"> | |||||
| <!<Peripheral Module="BPASmartClient.Lebai.LebaiRobot"> | |||||
| <Parameters> | <Parameters> | ||||
| <IpAddress>192.168.2.100</IpAddress> | <IpAddress>192.168.2.100</IpAddress> | ||||
| <HandSensor>1</HandSensor> | <HandSensor>1</HandSensor> | ||||
| <OutputSingalValue>0</OutputSingalValue> | <OutputSingalValue>0</OutputSingalValue> | ||||
| </Parameters> | </Parameters> | ||||
| </Peripheral>--> | </Peripheral>--> | ||||
| </Peripherals> | |||||
| </Device>--> | |||||
| <!--</Peripherals> | |||||
| </Device>-->--> | |||||
| <!--<Device Name="MorkF" Module="BPASmartClient.MorkF.Control_MorkF" DeviceId="2"> | <!--<Device Name="MorkF" Module="BPASmartClient.MorkF.Control_MorkF" DeviceId="2"> | ||||
+ 4
- 2
BPASmartClient/MainWindow.xaml
View File
| @@ -267,7 +267,7 @@ | |||||
| Foreground="#feffff"> | Foreground="#feffff"> | ||||
| 日志监控界面 | 日志监控界面 | ||||
| </TextBlock> | </TextBlock> | ||||
| <StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> | ||||
| <Button | <Button | ||||
| Name="login" Margin="5,0,5,0" | Name="login" Margin="5,0,5,0" | ||||
| @@ -278,7 +278,7 @@ | |||||
| Click="Button_Login" | Click="Button_Login" | ||||
| Content="登录" | Content="登录" | ||||
| Cursor="Hand"/> | Cursor="Hand"/> | ||||
| <Button | |||||
| <Button | |||||
| Name="logout" | Name="logout" | ||||
| Grid.Row="0" | Grid.Row="0" | ||||
| Width="45" | Width="45" | ||||
| @@ -288,6 +288,8 @@ | |||||
| Command="{Binding LogoutCommand}" | Command="{Binding LogoutCommand}" | ||||
| Content="注销" | Content="注销" | ||||
| Cursor="Hand" /> | Cursor="Hand" /> | ||||
| </StackPanel> | |||||
| </Grid> | </Grid> | ||||
| <!--#region 底部窗体栏--> | <!--#region 底部窗体栏--> | ||||