From f9cf37353cb16d8969c6bef6de9e3bedbea10ae5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 25 八月 2023 17:41:26 +0800
Subject: [PATCH] 修改传感器类型和元数据类型为值域(下拉列表框)
---
DataLoader/MainWindow.xaml | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/DataLoader/MainWindow.xaml b/DataLoader/MainWindow.xaml
index 5abb672..e0562e6 100644
--- a/DataLoader/MainWindow.xaml
+++ b/DataLoader/MainWindow.xaml
@@ -2,7 +2,7 @@
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" Closing="Window_Closing"
- Title="鏁版嵁鍏ュ簱 v1.5" WindowStartupLocation="CenterScreen">
+ Title="鏁版嵁鍏ュ簱 v1.6" WindowStartupLocation="CenterScreen">
<Window.Resources>
<Style x:Key="btn" TargetType="Button">
<Setter Property="Background" Value="#005699"/>
@@ -165,26 +165,34 @@
<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" Cursor="Hand" 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>
+ <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}" IsReadOnly="True" x:Name="tbDir"/>
--
Gitblit v1.9.3