From a9b99add3e1baa7fc49049247b8bf071e70a6005 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 03 九月 2024 15:13:57 +0800
Subject: [PATCH] 1
---
DataLoader/MainWindow.xaml | 77 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/DataLoader/MainWindow.xaml b/DataLoader/MainWindow.xaml
index 49dfa33..01bf2ba 100644
--- a/DataLoader/MainWindow.xaml
+++ b/DataLoader/MainWindow.xaml
@@ -1,9 +1,8 @@
锘�<Window x:Class="DataLoader.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Height="700" Width="900"
- Loaded="Window_Loaded"
- Title="鏁版嵁鍏ュ簱 v1.5" WindowStartupLocation="CenterScreen">
+ Height="700" Width="900" Loaded="Window_Loaded" Closing="Window_Closing"
+ Title="鏁版嵁鍏ュ簱 v1.72" WindowStartupLocation="CenterScreen">
<Window.Resources>
<Style x:Key="btn" TargetType="Button">
<Setter Property="Background" Value="#005699"/>
@@ -23,8 +22,9 @@
<Style x:Key="tb" TargetType="TextBox">
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
+ <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Height" Value="30"/>
- <Setter Property="FontSize" Value="20"/>
+ <Setter Property="FontSize" Value="16"/>
</Style>
<!--Combox-->
@@ -127,7 +127,7 @@
<Setter Property="BorderThickness" Value="0"/>
</Style>
- <!--<Style TargetType="DatePickerTextBox">
+ <Style TargetType="DatePickerTextBox">
<Setter Property="ItemsControl.Template">
<Setter.Value>
<ControlTemplate>
@@ -135,10 +135,11 @@
</ControlTemplate>
</Setter.Value>
</Setter>
- </Style>-->
+ </Style>
</Window.Resources>
<Grid x:Name="gMain">
<Grid.RowDefinitions>
+ <RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
@@ -164,30 +165,38 @@
<Button Grid.Row="0" Grid.Column="4" Content="鐧� 褰�" Style="{StaticResource btn}" Click="Login_MouseLeftButtonDown"/>
<Label Grid.Row="1" Grid.Column="0" Content="浠ょ墝锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="1" Grid.Column="1" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbToken"/>
- <Label Grid.Row="1" Grid.Column="2" Content="鍏冩暟鎹被鍨嬶細" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <!--<TextBox Grid.Row="1" Grid.Column="3" Style="{StaticResource tb}" x:Name="tbAcqTim2e"/>-->
- <!--<ComboBox Grid.Row="1" Grid.Column="3" IsReadOnly="True" DisplayMemberPath="Name" Style="{StaticResource ComboBoxStyle}" Width="320" Height="30" HorizontalAlignment="Left" x:Name="cbMetaType"></ComboBox>-->
- <ComboBox Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left" VerticalContentAlignment="Center" Background="White" SelectedIndex="0" Width="322" Height="38" BorderThickness="0" x:Name="cbMetaType">
- <ComboBoxItem>璇烽�夋嫨</ComboBoxItem>
- <ComboBoxItem>鏁板瓧姝ｅ皠褰卞儚鍥�</ComboBoxItem>
- <ComboBoxItem>鏁板瓧楂樼▼妯″瀷</ComboBoxItem>
- <ComboBoxItem>鍗曟尝娈垫爡鏍兼暟鎹�</ComboBoxItem>
- <ComboBoxItem>澶氬厜璋辨爡鏍兼暟鎹�</ComboBoxItem>
- <ComboBoxItem>楂樺厜璋辨爡鏍兼暟鎹�</ComboBoxItem>
- <ComboBoxItem>鐭㈤噺鏁版嵁</ComboBoxItem>
- <ComboBoxItem>涓夌淮妯″瀷</ComboBoxItem>
- </ComboBox>
+ <TextBox Grid.Row="1" Grid.Column="1" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbToken"/>
+ <Label Grid.Row="1" Grid.Column="2" Content="閲囬泦鏃堕棿锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <DatePicker Grid.Row="1" Grid.Column="3" Height="35" Width="320" HorizontalAlignment="Center" VerticalContentAlignment="Center" x:Name="dpAcqTime" FontSize="13"/>
<Label Grid.Row="2" Grid.Column="0" Content="浼犳劅鍣ㄧ被鍨嬶細" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="2" Grid.Column="1" Style="{StaticResource tb}" x:Name="tbSensorType"/>
- <Label Grid.Row="2" Grid.Column="2" Content="閲囬泦鏃堕棿锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <!--<TextBox Grid.Row="2" Grid.Column="3" Style="{StaticResource tb}" x:Name="tbAcqTime"/>-->
- <DatePicker Grid.Row="2" Grid.Column="3" Height="35" Width="320" HorizontalAlignment="Center" VerticalContentAlignment="Center" x:Name="dpAcqTime" FontSize="13"/>
-
+ <!--<TextBox Grid.Row="2" Grid.Column="1" Style="{StaticResource tb}" x:Name="tbSensorType"/>-->
+ <ComboBox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" VerticalContentAlignment="Center" Cursor="Hand" Background="White" SelectedIndex="0" Width="322" Height="38" BorderThickness="0" x:Name="tbSensorType">
+ <ComboBoxItem Tag="0">璇烽�夋嫨</ComboBoxItem>
+ <ComboBoxItem Tag="1">瀚﹀ē涓�鍙�</ComboBoxItem>
+ <ComboBoxItem Tag="2">瀚﹀ē浜屽彿</ComboBoxItem>
+ <ComboBoxItem Tag="3">绉戞櫘鏁欒偛</ComboBoxItem>
+ <ComboBoxItem Tag="4">鍏嬭幈闂ㄦ眬</ComboBoxItem>
+ <ComboBoxItem Tag="5">鏈堢悆鎺㈠嫎鑰�</ComboBoxItem>
+ <ComboBoxItem Tag="6">鏈堜寒濂崇</ComboBoxItem>
+ <ComboBoxItem Tag="7">鏈堢悆鍕樻祴杞ㄩ亾鍣�</ComboBoxItem>
+ <ComboBoxItem Tag="8">鍦ｆ澂鍙�</ComboBoxItem>
+ </ComboBox>
+ <Label Grid.Row="2" Grid.Column="2" Content="鍏冩暟鎹被鍨嬶細" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <!--<ComboBox Grid.Row="1" Grid.Column="3" IsReadOnly="True" DisplayMemberPath="Name" Style="{StaticResource ComboBoxStyle}" Width="320" Height="30" HorizontalAlignment="Left" x:Name="cbMetaType"></ComboBox>-->
+ <ComboBox Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" VerticalContentAlignment="Center" Cursor="Hand" Background="White" SelectedIndex="0" Width="322" Height="38" BorderThickness="0" x:Name="cbMetaType">
+ <ComboBoxItem Tag="0">璇烽�夋嫨</ComboBoxItem>
+ <ComboBoxItem Tag="1">鏁板瓧姝ｅ皠褰卞儚鍥�</ComboBoxItem>
+ <ComboBoxItem Tag="2">鏁板瓧楂樼▼妯″瀷</ComboBoxItem>
+ <ComboBoxItem Tag="3">鍗曟尝娈垫爡鏍兼暟鎹�</ComboBoxItem>
+ <ComboBoxItem Tag="4">澶氬厜璋辨爡鏍兼暟鎹�</ComboBoxItem>
+ <ComboBoxItem Tag="5">楂樺厜璋辨爡鏍兼暟鎹�</ComboBoxItem>
+ <ComboBoxItem Tag="6">鐭㈤噺鏁版嵁</ComboBoxItem>
+ <ComboBoxItem Tag="7">涓夌淮妯″瀷</ComboBoxItem>
+ </ComboBox>
<Label Grid.Row="3" Grid.Column="0" Content="璧勬簮鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbDir"/>
+ <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbDir"/>
<Button Grid.Row="3" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Dir_MouseLeftButtonDown" x:Name="btnDir"/>
<Label Grid.Row="4" Grid.Column="0" Content="鏁版嵁鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
@@ -195,15 +204,21 @@
<Button Grid.Row="4" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Source_MouseLeftButtonDown" x:Name="btnSource"/>
<Label Grid.Row="5" Grid.Column="0" Content="鍏ュ簱鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbTarget"/>
- <Button Grid.Row="5" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Target_MouseLeftButtonDown" x:Name="btnTarget"/>
+ <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbTarget" IsReadOnly="False" />
+ <Button Grid.Row="5" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Target_MouseLeftButtonDown" x:Name="btnTarget" Visibility="Hidden" />
<ScrollViewer Grid.Row="6" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="5 5 0 5">
<ListView x:Name="lvView">
<ListView.View>
<GridView>
<GridView.Columns>
- <!--<GridViewColumn Header="搴忓彿" Width="50" DisplayMemberBinding="{Binding Path=ID, Mode=OneWay}"/>-->
+ <GridViewColumn Width="30">
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <CheckBox IsChecked="{Binding Path=Checked, Mode=TwoWay}" Tag="{Binding Path=ID, Mode=OneWay}" />
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
<GridViewColumn Header="搴忓彿" Width="Auto">
<GridViewColumn.CellTemplate>
<DataTemplate>
@@ -212,6 +227,7 @@
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="璺緞" Width="Auto" DisplayMemberBinding="{Binding Path=FilePath, Mode=OneWay}"/>
+ <GridViewColumn Header="鏂囦欢澶у皬" Width="Auto" DisplayMemberBinding="{Binding Path=Sizes, Mode=OneWay}"/>
<GridViewColumn Header="杩愯鐘舵��" Width="120" DisplayMemberBinding="{Binding Path=Status, Mode=OneWay}"/>
</GridView.Columns>
</GridView>
@@ -220,6 +236,7 @@
</ScrollViewer>
<Button x:Name="btnLoad" Grid.Row="6" Grid.Column="4" Content="鍔� 杞�" Style="{StaticResource btn}" Click="Load_MouseLeftButtonDown"/>
- <Button x:Name="btnImport" Grid.Row="7" Grid.Column="4" Content="瀵� 鍏�" Style="{StaticResource btn}" VerticalAlignment="Top" Click="Import_MouseLeftButtonDown"/>
+ <Button x:Name="btnDel" Grid.Row="7" Grid.Column="4" Content="鍒� 闄�" Style="{StaticResource btn}" Click="Del_MouseLeftButtonDown"/>
+ <Button x:Name="btnImport" Grid.Row="8" Grid.Column="4" Content="瀵� 鍏�" Style="{StaticResource btn}" VerticalAlignment="Top" Click="Import_MouseLeftButtonDown"/>
</Grid>
</Window>
--
Gitblit v1.9.3