232

BPASmartClient.ViewModel/LogViewModel.cs

@@ -142,7 +142,7 @@ namespace BPASmartClient.ViewModel
             BookExs.Add(new BookEx(new Book() { Name = "一般日志", Tag = "Info" }) { IsChecked = true });
             BookExs.Add(new BookEx(new Book() { Name = "设备日志", Tag = "DeviceLog" }) { IsChecked = true });
             BookExs.Add(new BookEx(new Book() { Name = "错误日志", Tag = "Error" }) { IsChecked = true });
-            BookExs.Add(new BookEx(new Book() { Name = "设备告警", Tag = "DeviceAlarm" }) { IsChecked = true });
+            BookExs.Add(new BookEx(new Book() { Name = "告警日志", Tag = "DeviceAlarm" }) { IsChecked = true });
             SelectBookExs = new ObservableCollection<BookEx>();
             ItemPropertyChanged(new BookEx(new Book()) { IsChecked = true }, new PropertyChangedEventArgs("IsChecked"));
             //一般日志
@@ -334,7 +334,7 @@ namespace BPASmartClient.ViewModel
                     SelectBookExs.Clear();
                     foreach (BookEx item in bookExs)
                     {
-                        builder.Append(item.BookN.Name + ",");
+                        builder.Append(item.BookN.Name.Replace("日志","") + ",");
                         SelectBookExs.Add((BookEx)item);
                     }
                     SelectedText = builder == null ? string.Empty : builder.ToString();

BPASmartClient/Control/LogView.xaml

@@ -26,10 +26,10 @@
 
         <!--查询按钮栏-->
         <StackPanel Orientation="Horizontal" Margin="10,0,10,0">
-            <ComboBox Width="130" Text="{Binding SelectedText}"  IsEditable="True" ItemsSource="{Binding Path=BookExs}">
+            <ComboBox Width="100" Text="{Binding SelectedText}"  IsEditable="True" ItemsSource="{Binding Path=BookExs}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate DataType="{x:Type k:BookEx}">
-                        <CheckBox Width="120" IsChecked="{Binding IsChecked}"  Content="{Binding BookN.Name}" />
+                        <CheckBox Width="95" IsChecked="{Binding IsChecked}"  Content="{Binding BookN.Name}" />
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>