修改样式

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddSchViewModel.cs

@@ -424,6 +424,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         {
             //获取设备类型
             var kinds = _iBasicDeviceKindService.FindAllDeviceKind();
+            DeviceKindNameList.Clear();
             DeviceKindNameList.Add("---");
             foreach (var kind in kinds)
             {
@@ -434,6 +435,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             var configList = _optionConfigService.QueryList();
             _optionConfigs = _mapper.Map<List<OptionConfig>, List<OptionConfigDto>>(configList);
             var tests = _optionConfigs.FindAll(x => x.TypeID == 1);
+            TestKinds.Clear();
             TestKinds.Add("---");
             foreach (var test in tests)
             {
@@ -441,6 +443,9 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             }
 
             //测试项类型
+            BeforeJudgeKinds.Clear();
+            InJudgeKinds.Clear();
+            OutJudgeKinds.Clear();
             BeforeJudgeKinds.Add("---");
             InJudgeKinds.Add("---");
             OutJudgeKinds.Add("---");
@@ -453,6 +458,9 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             }
 
             //判定逻辑
+            JudgeLogicKinds.Clear();
+            InJudgeLogicKinds.Clear();
+            OutJudgeLogicKinds.Clear();
             JudgeLogicKinds.Add("---");
             InJudgeLogicKinds.Add("---");
             OutJudgeLogicKinds.Add("---");
@@ -774,9 +782,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <param name="obj"></param>
         private void ResetMethod(string obj)
         {
-            ScheduleName = string.Empty;
-            DeviceKindName = string.Empty;
-            TestName = string.Empty;
+            //清空测试项的内容
+            CleanContent();
         }
 
         public void OnNavigatedTo(NavigationContext navigationContext)

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/EditSchViewModel.cs

@@ -147,6 +147,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             var configList = _optionConfigService.QueryList();
             _optionConfigs = _mapper.Map<List<OptionConfig>, List<OptionConfigDto>>(configList);
             var tests = _optionConfigs.FindAll(x => x.TypeID == 1);
+            TestKinds.Clear();
             TestKinds.Add("---");
             foreach (var test in tests)
             {

BlankApp1/BlankApp1/ViewModels/StatisticsViewModel.cs

@@ -6,7 +6,10 @@ using LiveCharts.Wpf;
 using Microsoft.Extensions.Logging;
 using Model.Dto;
 using Model.Entities;
+using PLCTool.Events;
+using PLCTool.Models;
 using Prism.Commands;
+using Prism.Events;
 using Prism.Mvvm;
 using Prism.Services.Dialogs;
 using System;
@@ -32,11 +35,12 @@ namespace BlankApp1.ViewModels
         private readonly IBasicPlcTestSchemeDtlService _iBasicPlcTestSchemeDtlService;
         private readonly ILogger _logger;
         private readonly IMapper _mapper;
-
+        private readonly IEventAggregator _aggregator;
         private List<DeviceDtlWithResultModel> allDeviceList = new List<DeviceDtlWithResultModel>();//所有方案
         private List<DeviceDtlWithResultModel> conditionDevices = new List<DeviceDtlWithResultModel>();//符合条件的方案
         private int allSchCount = 0; //所有测试项
-        public StatisticsViewModel(IDialogService dialog, IMenuService menuService, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordDtlService iBizTestRecordDtlService, IBasicDeviceKindService iBasicDeviceKindService, IBasicProjectService iBasicProjectService, IBizTestRecordService iBizTestRecordService, IBasicPlcTestSchemeDtlService iBasicPlcTestSchemeDtlService, IBasicDeviceService iBasicDeviceService,IMapper mapper, ILogger logger)
+        private List<CrumbViewModel> breadCrumbs = new List<CrumbViewModel>();
+        public StatisticsViewModel(IDialogService dialog, IMenuService menuService, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordDtlService iBizTestRecordDtlService, IBasicDeviceKindService iBasicDeviceKindService, IBasicProjectService iBasicProjectService, IBizTestRecordService iBizTestRecordService, IBasicPlcTestSchemeDtlService iBasicPlcTestSchemeDtlService, IBasicDeviceService iBasicDeviceService,IMapper mapper, ILogger logger,IEventAggregator aggregator)
         {
             _dialog = dialog;
             _optionConfigService = optionConfigService;
@@ -51,6 +55,7 @@ namespace BlankApp1.ViewModels
             _iBasicDeviceService = iBasicDeviceService;
             _logger = logger;
             _mapper = mapper;
+            _aggregator=aggregator;
             PieSeriesCollectionDone = new SeriesCollection();
             PieSeriesCollectionFail= new SeriesCollection();
             PieSeriesCollectionEveryday = new SeriesCollection();
@@ -66,6 +71,10 @@ namespace BlankApp1.ViewModels
             GetPieSeriesPLC();
             GetPieSeriesEveryDay();
             GetPieSeriesFail();
+            //发布面包靴
+            breadCrumbs.Clear();
+            breadCrumbs.Add(new CrumbViewModel { Name = "作业简报" });
+            _aggregator.GetEvent<BreadEvent>().Publish(breadCrumbs);
         }
 
         /// <summary>

BlankApp1/BlankApp1/Views/BasicConfigView/AddSchView.xaml

@@ -45,7 +45,7 @@
                 <b:InvokeCommandAction Command="{Binding OnLoadCommand}" CommandParameter="{Binding ElementName=tt}"/>
             </b:EventTrigger>
         </b:Interaction.Triggers>
-        <ScrollViewer Template="{StaticResource MyScrollViewer}" VerticalScrollBarVisibility="Auto">
+        <ScrollViewer Template="{StaticResource MyScrollViewer}" VerticalScrollBarVisibility="Auto" Margin="0,0,10,0">
             <Grid >
 
                 <Grid.RowDefinitions>
@@ -66,7 +66,8 @@
               
                         </TextBox>
                     </StackPanel>
-                    <Button  Content="取消" Width="80"  Margin="5,0"  Command="{Binding CancelCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
+                    <Button  Content="取消" Width="80"  Margin="5,0"  Command="{Binding CancelCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" Background="#EC808D" />
+                    <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" Background="#7F7F7F" />
                     <Button  Content="提交" Width="80"  Margin="5,0"  Command="{Binding SaveAllSchCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
 
                 </DockPanel>

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -27,26 +27,22 @@
             <RowDefinition Height="40"/>
 
         </Grid.RowDefinitions>
-        <UniformGrid Grid.Row="0" Columns="4">
-            <StackPanel Orientation="Horizontal">
+        <Grid Grid.Row="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="2*"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <TextBlock Text="测试方案名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
             </StackPanel>
-            <StackPanel Orientation="Horizontal"  Grid.Row="4" HorizontalAlignment="Center">
+            <StackPanel Grid.Column="1" Orientation="Horizontal"  Grid.Row="4" HorizontalAlignment="Center">
                 <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0" TextAlignment="Right" Width="80"/>
                 <ComboBox  Height="28" Width="120" ItemsSource="{Binding DeviceKindNameList}" SelectedItem="{Binding DeviceKindName}" />
             </StackPanel>
-         
-         
 
-
-        </UniformGrid>
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="0" Orientation="Horizontal">
+            <StackPanel Grid.Column="2"  Orientation="Horizontal" >
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                     <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
@@ -56,7 +52,12 @@
                     <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
-            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+
+
+        </Grid>
+        <Grid Grid.Row="1">
+
+            <StackPanel  Orientation="Horizontal" HorizontalAlignment="Right">
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
                 <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background=" #7F7F7F"/>

BlankApp1/BlankApp1/Views/BasicConfigView/EditSchView.xaml

@@ -67,7 +67,7 @@
                         <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" >
                         </TextBox>
                     </StackPanel>
-                    <Button  Content="取消" Width="80"  Margin="5,0"  Command="{Binding CancelCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
+                <Button  Content="取消" Width="80"  Margin="5,0"  Command="{Binding CancelCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" Background="#EC808D" />
                     <Button  Content="提交" Width="80"  Margin="5,0"  Command="{Binding SaveAllSchCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
 
                 </DockPanel>
@@ -81,17 +81,17 @@
                             <TextBlock Text="▊"  TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
                             <TextBlock Text="测试项列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
                         </StackPanel>
-                    <StackPanel Orientation="Horizontal" >
+                    <DockPanel LastChildFill="False" >
              
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="测试项名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                             <TextBox  Height="28" Width="160"  Text="{Binding TestName}"/>
                         </StackPanel>
-                        <StackPanel Orientation="Horizontal" >
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
                             <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                             <ComboBox  Height="28" Width="160" ItemsSource="{Binding TestKinds}" SelectedItem="{Binding SelectTest}" />
                         </StackPanel>
-                        <Button  Content="新增测试项" Width="80"  Margin="5,0"  Command="{Binding AddItemCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" >
+                        <Button  Content="新增测试项" Width="80"  Margin="5,0"  Command="{Binding AddItemCommand}" Style="{StaticResource NormalButtonStyle}"  DockPanel.Dock="Right">
                             <Button.CommandParameter>
                                 <MultiBinding Converter="{ StaticResource ResourceKey=TwoParConverter}">
                                     <Binding Path="DeviceKindName"  ></Binding>
@@ -99,9 +99,14 @@
                                 </MultiBinding>
                             </Button.CommandParameter>
                         </Button>
-                        <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
-                        <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
-                    </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
+                            <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" Background="#7F7F7F" />
+
+                        </StackPanel>
+                       
+                      
+                    </DockPanel>
                     <DataGrid    ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2" 
 ItemsSource="{Binding SchProjectList}" IsReadOnly="True" Margin="5" Padding="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled">