diff --git a/BPASmartClient.Academy/App.xaml b/BPASmartClient.Academy/App.xaml index 24fba18b..dd312782 100644 --- a/BPASmartClient.Academy/App.xaml +++ b/BPASmartClient.Academy/App.xaml @@ -18,7 +18,8 @@ - + + @@ -35,8 +36,8 @@ - + diff --git a/BPASmartClient.Academy/App.xaml.cs b/BPASmartClient.Academy/App.xaml.cs index 35838208..21f997d1 100644 --- a/BPASmartClient.Academy/App.xaml.cs +++ b/BPASmartClient.Academy/App.xaml.cs @@ -167,7 +167,7 @@ namespace BPASmartClient.Academy ObservableCollection DeviceMonitor = new ObservableCollection(); DeviceMonitor.Add(new SubMenumodel() { - SubMenuName = "设备状态", + SubMenuName = "设备控制", SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.观察员, Permission.技术员 }, AssemblyName = "BPASmartClient.Academy", ToggleWindowPath = "View.DeviceMotionView" diff --git a/BPASmartClient.Academy/View/DeviceMotionView.xaml b/BPASmartClient.Academy/View/DeviceMotionView.xaml index 491bbada..28557161 100644 --- a/BPASmartClient.Academy/View/DeviceMotionView.xaml +++ b/BPASmartClient.Academy/View/DeviceMotionView.xaml @@ -6,7 +6,96 @@ xmlns:local="clr-namespace:BPASmartClient.Academy.View" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BPASmartClient.CustomResource/RecDictionarys/BeveledRadioButtonStyle.xaml b/BPASmartClient.CustomResource/RecDictionarys/BeveledRadioButtonStyle.xaml index 79257775..f7abcf54 100644 --- a/BPASmartClient.CustomResource/RecDictionarys/BeveledRadioButtonStyle.xaml +++ b/BPASmartClient.CustomResource/RecDictionarys/BeveledRadioButtonStyle.xaml @@ -45,6 +45,51 @@ + + + +