提交记录修改UI/Views/DataPage.xaml+7 −5看文件
修改UI/Views/SettingPage.xaml+2 −2看文件
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 | xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
| 5 | 5 | xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
| 6 | 6 | xmlns:local="clr-namespace:UI.Views" |
| 7 | 删除: xmlns:Charts="clr-namespace:UI.Controls.Charts" xmlns:Tabbar="clr-namespace:UI.Controls.Tabbar" xmlns:DatePickerBar="clr-namespace:UI.Controls.DatePickerBar" x:Class="UI.Views.DataPage" | |
| 7 | 新增: xmlns:Charts="clr-namespace:UI.Controls.Charts" xmlns:Tabbar="clr-namespace:UI.Controls.Tabbar" xmlns:DatePickerBar="clr-namespace:UI.Controls.DatePickerBar" xmlns:select="clr-namespace:UI.Controls.Select" x:Class="UI.Views.DataPage" | |
| 8 | 8 | mc:Ignorable="d" |
| 9 | 9 | d:DesignHeight="450" d:DesignWidth="800" |
| 10 | 10 | Title="IndexPage"> |
| @@ -46,7 +46,8 @@ | ||
| 46 | 46 | <RowDefinition Height="*"/> |
| 47 | 47 | |
| 48 | 48 | </Grid.RowDefinitions> |
| 49 | 删除: <DatePickerBar:DatePickerBar SelectedDate="{Binding DayDate,Mode=TwoWay}" ShowType="Day"/> | |
| 49 | 新增: <select:DateSelect Date="{Binding DayDate,Mode=TwoWay}"/> | |
| 50 | 新增: <!--<DatePickerBar:DatePickerBar SelectedDate="{Binding DayDate,Mode=TwoWay}" ShowType="Day"/>--> | |
| 50 | 51 | |
| 51 | 52 | <Charts:Charts Grid.Row="1" ItemMenu="{Binding AppContextMenu}" Data="{Binding Data}" ChartsType="HorizontalA" Margin="0,20,0,0" ClickCommand="{Binding ToDetailCommand}"/> |
| 52 | 53 | </Grid> |
| @@ -58,8 +59,8 @@ | ||
| 58 | 59 | <RowDefinition Height="*"/> |
| 59 | 60 | |
| 60 | 61 | </Grid.RowDefinitions> |
| 61 | 删除: <DatePickerBar:DatePickerBar SelectedDate="{Binding MonthDate,Mode=TwoWay}" ShowType="Month"/> | |
| 62 | 删除: | |
| 62 | 新增: <!--<DatePickerBar:DatePickerBar SelectedDate="{Binding MonthDate,Mode=TwoWay}" ShowType="Month"/>--> | |
| 63 | 新增: <select:DateSelect Date="{Binding MonthDate,Mode=TwoWay}" SelectType="Month"/> | |
| 63 | 64 | <Charts:Charts Grid.Row="1" ItemMenu="{Binding AppContextMenu}" Data="{Binding MonthData}" ChartsType="HorizontalA" Margin="0,20,0,0" ClickCommand="{Binding ToDetailCommand}"/> |
| 64 | 65 | </Grid> |
| 65 | 66 | </TabItem> |
| @@ -70,7 +71,8 @@ | ||
| 70 | 71 | <RowDefinition Height="*"/> |
| 71 | 72 | |
| 72 | 73 | </Grid.RowDefinitions> |
| 73 | 删除: <DatePickerBar:DatePickerBar SelectedDate="{Binding YearDate,Mode=TwoWay}" ShowType="Year"/> | |
| 74 | 新增: <!--<DatePickerBar:DatePickerBar SelectedDate="{Binding YearDate,Mode=TwoWay}" ShowType="Year"/>--> | |
| 75 | 新增: <select:DateSelect Date="{Binding YearDate,Mode=TwoWay}" SelectType="Year"/> | |
| 74 | 76 | |
| 75 | 77 | <Charts:Charts Grid.Row="1" ItemMenu="{Binding AppContextMenu}" Data="{Binding YearData}" ChartsType="HorizontalA" Margin="0,20,0,0" ClickCommand="{Binding ToDetailCommand}"/> |
| 76 | 78 | </Grid> |
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | |
| 48 | 48 | <StackPanel Margin="0,10,0,0"> |
| 49 | 49 | <TextBlock Text="删除数据" Foreground="#f54f4e" FontSize="14"/> |
| 50 | 删除: <Border Background="White" Padding="20" CornerRadius="6" Margin="0,15,0,0"> | |
| 50 | 新增: <Border Background="White" Padding="20" CornerRadius="6" Margin="0,10,0,0" BorderBrush="#ededed" BorderThickness="1"> | |
| 51 | 51 | <StackPanel Orientation="Horizontal" Margin="0,10,0,0"> |
| 52 | 52 | <TextBlock Text="从" VerticalAlignment="Center"/> |
| 53 | 53 | <select:DateSelect Date="{Binding DelDataStartMonthDate,Mode=TwoWay}" Margin="10,0" SelectType="Month"/> |
| @@ -57,7 +57,7 @@ | ||
| 57 | 57 | </StackPanel> |
| 58 | 58 | </Border> |
| 59 | 59 | <TextBlock Text="导出数据" FontSize="14" Margin="0,15,0,0"/> |
| 60 | 删除: <Border Background="White" Padding="20" CornerRadius="6" Margin="0,15,0,0"> | |
| 60 | 新增: <Border Background="White" Padding="20" CornerRadius="6" Margin="0,10,0,0" BorderBrush="#ededed" BorderThickness="1"> | |
| 61 | 61 | <StackPanel> |
| 62 | 62 | <TextBlock Text="导出为xlsx和csv格式,需要注意:没有设置分类的应用数据不会导出。" Foreground="#989CA1" FontSize="12"/> |
| 63 | 63 | <StackPanel Orientation="Horizontal" Margin="0,10,0,0"> |

