提交记录修改Core/Servicers/Instances/Data.cs+4 −4看文件
修改UI/Views/SettingPage.xaml+1 −1看文件
| @@ -604,6 +604,7 @@ namespace Core.Servicers.Instances | ||
| 604 | 604 | using (var db = _database.GetReaderContext()) |
| 605 | 605 | { |
| 606 | 606 | var day = db.DailyLog.Where(m => m.Date >= start.Date && m.Date <= end.Date) |
| 607 | 新增: .ToList() | |
| 607 | 608 | .Select(m => new |
| 608 | 609 | { |
| 609 | 610 | 日期 = m.Date, |
| @@ -611,10 +612,10 @@ namespace Core.Servicers.Instances | ||
| 611 | 612 | 描述 = m.AppModel != null ? m.AppModel.Description : "未知", |
| 612 | 613 | 时长 = m.Time, |
| 613 | 614 | 分类 = m.AppModel != null && m.AppModel.Category != null ? m.AppModel.Category.Name : "未知" |
| 614 | 删除: }) | |
| 615 | 删除: .ToList(); | |
| 615 | 新增: }); | |
| 616 | 616 | |
| 617 | 617 | var hours = db.HoursLog.Where(m => m.DataTime >= start && m.DataTime <= end) |
| 618 | 新增: .ToList() | |
| 618 | 619 | .Select(m => new |
| 619 | 620 | { |
| 620 | 621 | 时段 = m.DataTime, |
| @@ -622,8 +623,7 @@ namespace Core.Servicers.Instances | ||
| 622 | 623 | 描述 = m.AppModel != null ? m.AppModel.Description : "未知", |
| 623 | 624 | 时长 = m.Time, |
| 624 | 625 | 分类 = m.AppModel != null && m.AppModel.Category != null ? m.AppModel.Category.Name : "未知" |
| 625 | 删除: }) | |
| 626 | 删除: .ToList(); | |
| 626 | 新增: }); | |
| 627 | 627 | var mapper = new Mapper(); |
| 628 | 628 | mapper.Put(day, "每日"); |
| 629 | 629 | mapper.Put(hours, "时段"); |
| @@ -60,7 +60,7 @@ | ||
| 60 | 60 | <TextBlock Text="导出数据" FontSize="14" Margin="0,15,0,0"/> |
| 61 | 61 | <Border Background="{DynamicResource SettingPanelBgBrush}" Padding="20" CornerRadius="6" Margin="0,10,0,0" BorderBrush="{DynamicResource SettingPanelBorderBrush}" BorderThickness="1"> |
| 62 | 62 | <StackPanel> |
| 63 | 删除: <TextBlock Text="导出为xlsx和csv格式,需要注意:没有设置分类的应用数据不会被导出。" Foreground="#989CA1" FontSize="12"/> | |
| 63 | 新增: <TextBlock Text="导出为xlsx和csv格式。" Foreground="#989CA1" FontSize="12"/> | |
| 64 | 64 | <StackPanel Orientation="Horizontal" Margin="0,10,0,0"> |
| 65 | 65 | <TextBlock Text="从" VerticalAlignment="Center"/> |
| 66 | 66 | <select:DateSelect Date="{Binding ExportDataStartMonthDate,Mode=TwoWay}" Margin="10,0" SelectType="Month"/> |

