修改整体字体大小

This commit is contained in:
MoYue 2024-04-30 08:57:08 +08:00
parent c52b64532f
commit 6ff183ae55
14 changed files with 206 additions and 209 deletions

View File

@ -10,7 +10,7 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
FontFamily="{StaticResource DigitalDisplay}" FontFamily="{StaticResource DigitalDisplay}"
FontSize="13" FontSize="13"
Foreground="White" Foreground="#333"
FontWeight="ExtraLight" FontWeight="ExtraLight"
Background="#FAFCFF" Background="#FAFCFF"
Title="原位实验室主控系统" Height="800" Width="1400"> Title="原位实验室主控系统" Height="800" Width="1400">
@ -137,7 +137,6 @@
<TextBlock Text="&#xe81d;" FontFamily="{StaticResource Icons}" <TextBlock Text="&#xe81d;" FontFamily="{StaticResource Icons}"
VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"
RenderTransformOrigin="0.5,0.5" Name="arrow" RenderTransformOrigin="0.5,0.5" Name="arrow"
Foreground="White"
FontSize="9"> FontSize="9">
</TextBlock> </TextBlock>
</Grid> </Grid>
@ -260,7 +259,7 @@
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left"
Margin="15,0"> Margin="15,0">
<Run Text="原位实验室主控系统" FontSize="15" FontWeight="ExtraBold"/> <Run Text="原位实验室主控系统" FontSize="15" FontWeight="ExtraBold" />
<Run Text="v1.0" FontSize="13"/> <Run Text="v1.0" FontSize="13"/>
</TextBlock> </TextBlock>
@ -276,7 +275,7 @@
</StackPanel.Resources> </StackPanel.Resources>
<!--时间和星期--> <!--时间和星期-->
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2" Margin="37,0" FontSize="15" FontWeight="Normal" <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2" Margin="37,0" FontSize="16" FontWeight="Normal"
Foreground="#555" DataContext="{x:Static sys:DateTime.Now}" Name="txt_time"> Foreground="#555" DataContext="{x:Static sys:DateTime.Now}" Name="txt_time">
<Run Text="{Binding Now,Mode=OneWay,StringFormat='yyyy年MM月dd日'}" Name="txt_date" DataContext="{x:Static sys:DateTime.Now}" /> <Run Text="{Binding Now,Mode=OneWay,StringFormat='yyyy年MM月dd日'}" Name="txt_date" DataContext="{x:Static sys:DateTime.Now}" />
<Run Text=" "/> <Run Text=" "/>
@ -306,7 +305,7 @@
<ToggleButton Content="{Binding CurrentUser.RealName}" <ToggleButton Content="{Binding CurrentUser.RealName}"
ContentStringFormat="Hi! {0}" ContentStringFormat="Hi! {0}"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontWeight="Normal" Foreground="White" FontSize="15" FontWeight="Normal"
Margin="0,0,10,0" Name="tbtn_user" Margin="0,0,10,0" Name="tbtn_user"
Height="30" Height="30"
WindowChrome.IsHitTestVisibleInChrome="True" WindowChrome.IsHitTestVisibleInChrome="True"
@ -314,17 +313,17 @@
<!--最小化按钮--> <!--最小化按钮-->
<Button Content="&#xe7e6;" FontFamily="{StaticResource Icons}" <Button Content="&#xe7e6;" FontFamily="{StaticResource Icons}"
Style="{StaticResource ControlButtonStyle}" Foreground="White" Style="{StaticResource ControlButtonStyle}" FontSize="15"
Click="Button_MinClick"/> Click="Button_MinClick"/>
<!--最大化按钮--> <!--最大化按钮-->
<Button Content="&#xe694;" FontFamily="{StaticResource Icons}" <Button Content="&#xe694;" FontFamily="{StaticResource Icons}"
Style="{StaticResource ControlButtonStyle}" Foreground="White" Style="{StaticResource ControlButtonStyle}" FontSize="15"
Click="Button_MaxClick"/> Click="Button_MaxClick"/>
<!--关闭按钮--> <!--关闭按钮-->
<Button Content="&#xe625;" FontFamily="{StaticResource Icons}" <Button Content="&#xe625;" FontFamily="{StaticResource Icons}"
Style="{StaticResource ControlButtonStyle}" Foreground="White" Style="{StaticResource ControlButtonStyle}" FontSize="15"
Click="Button_Click"/> Click="Button_Click"/>
</StackPanel> </StackPanel>
@ -418,14 +417,14 @@
<!--用户真实姓名--> <!--用户真实姓名-->
<TextBlock Text="{Binding CurrentUser.RealName}" <TextBlock Text="{Binding CurrentUser.RealName}"
Grid.Row="1" HorizontalAlignment="Center" Grid.Row="1" HorizontalAlignment="Center"
FontWeight="Bold" FontSize="14"/> FontWeight="Bold" FontSize="15"/>
<!--用户年龄及性别--> <!--用户年龄及性别-->
<StackPanel Grid.Row="2" VerticalAlignment="Center" <StackPanel Grid.Row="2" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Orientation="Horizontal" TextBlock.FontSize="11"> Orientation="Horizontal" TextBlock.FontSize="11">
<TextBlock Text="{Binding CurrentUser.Age}" Margin="5,0" FontSize="14"/> <TextBlock Text="{Binding CurrentUser.Age}" Margin="5,0" FontSize="15"/>
<TextBlock Text="{Binding CurrentUser.Gender1}" Margin="5,0" FontSize="14"/> <TextBlock Text="{Binding CurrentUser.Gender1}" Margin="5,0" FontSize="15"/>
</StackPanel> </StackPanel>
<Border Background="#EEE" Height="0.5" Grid.Row="3"/> <Border Background="#EEE" Height="0.5" Grid.Row="3"/>
@ -434,14 +433,14 @@
<Button Content="修改密码" Grid.Row="4" <Button Content="修改密码" Grid.Row="4"
Style="{StaticResource NormalButtonStyle}" Style="{StaticResource NormalButtonStyle}"
Background="Transparent" Foreground="#409EFE" Background="Transparent" Foreground="#409EFE"
Margin="5,3" FontSize="13" Margin="5,3" FontSize="14"
Command="{Binding ModifyPasswordCommand}"/> Command="{Binding ModifyPasswordCommand}"/>
<!--切换账号--> <!--切换账号-->
<Button Content="切换账号" Grid.Row="5" <Button Content="切换账号" Grid.Row="5"
Style="{StaticResource NormalButtonStyle}" Style="{StaticResource NormalButtonStyle}"
Background="Transparent" Foreground="#409EFE" Background="Transparent" Foreground="#409EFE"
Margin="5,3" FontSize="13" Margin="5,3" FontSize="14"
Command="{Binding SwitchCommand}"/> Command="{Binding SwitchCommand}"/>
</Grid> </Grid>
</Grid> </Grid>
@ -514,7 +513,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{TemplateBinding Header}" VerticalAlignment="Center" <TextBlock Text="{TemplateBinding Header}" VerticalAlignment="Center"
Margin="10,5,0,5" Margin="10,5,0,5"
FontSize="14"/> FontSize="15"/>
<Grid Grid.Column="1" Name="close_grid" Visibility="Collapsed" <Grid Grid.Column="1" Name="close_grid" Visibility="Collapsed"
Width="30" Margin="0,0,-3,0"> Width="30" Margin="0,0,-3,0">
<Button Grid.Column="1" Style="{StaticResource TabCloseButtonStyle}" <Button Grid.Column="1" Style="{StaticResource TabCloseButtonStyle}"
@ -541,7 +540,7 @@
</Setter> </Setter>
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="Gray"/> <Setter Property="Background" Value="#EEE"/>
</Trigger> </Trigger>
<Trigger Property="IsSelected" Value="True"> <Trigger Property="IsSelected" Value="True">
<Setter Property="Background"> <Setter Property="Background">

View File

@ -69,8 +69,8 @@
</Border.Effect> </Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" > <StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="#AAA" Margin="0,10,0,5" FontSize="12"> <TextBlock Foreground="#AAA" Margin="0,10,0,5" FontSize="12">
<Run Text="&#xe8b8;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/> <Run Text="&#xe8b8;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="16"/>
<Run Text="组包时间" FontSize="18"/> <Run Text="组包时间" FontSize="15"/>
</TextBlock> </TextBlock>
<TextBlock Text="{Binding SysStatusModel.PackagingTime ,Mode=TwoWay,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" FontSize="15" FontWeight="Normal" Foreground="#555"/> <TextBlock Text="{Binding SysStatusModel.PackagingTime ,Mode=TwoWay,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" FontSize="15" FontWeight="Normal" Foreground="#555"/>
@ -143,7 +143,7 @@
</Border> </Border>
<!--刷新--> <!--刷新-->
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshCommand}" Width="60" Margin="5,0" Background="#88409EFE"/> <Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshCommand}" FontSize="15" Width="60" Margin="5,0" Background="#88409EFE"/>
</UniformGrid> </UniformGrid>
</Grid> </Grid>

View File

@ -15,12 +15,12 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavitybatterylevel }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavitybatterylevel }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="100" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="电池电压" Width="120" Binding="{Binding Voltage}"/> <DataGridTextColumn Header="电池电压/V" Width="120" Binding="{Binding Voltage}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</ScrollViewer> </ScrollViewer>

View File

@ -14,19 +14,19 @@
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavityenergyconversion }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavityenergyconversion }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="90" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="DN1-24V使能" Width="120" Binding="{Binding Enable1Of24V}"/> <DataGridTextColumn Header="DN1-24V使能" Width="130" Binding="{Binding Enable1Of24V}"/>
<DataGridTextColumn Header="DN1-12V使能" Width="120" Binding="{Binding Enable1Of12V}"/> <DataGridTextColumn Header="DN1-12V使能" Width="130" Binding="{Binding Enable1Of12V}"/>
<DataGridTextColumn Header="DN2-24V使能" Width="120" Binding="{Binding Enable2Of24V}"/> <DataGridTextColumn Header="DN2-24V使能" Width="130" Binding="{Binding Enable2Of24V}"/>
<DataGridTextColumn Header="DN2-12V使能" Width="120" Binding="{Binding Enable2Of12V}" /> <DataGridTextColumn Header="DN2-12V使能" Width="130" Binding="{Binding Enable2Of12V}" />
<DataGridTextColumn Header="DN3-24V使能" Width="120" Binding="{Binding Enable3Of24V}"/> <DataGridTextColumn Header="DN3-24V使能" Width="130" Binding="{Binding Enable3Of24V}"/>
<DataGridTextColumn Header="DN3-12V使能" Width="120" Binding="{Binding Enable3Of12V}"/> <DataGridTextColumn Header="DN3-12V使能" Width="130" Binding="{Binding Enable3Of12V}"/>
<DataGridTextColumn Header="DN4-24V使能" Width="120" Binding="{Binding Enable4Of24V}"/> <DataGridTextColumn Header="DN4-24V使能" Width="130" Binding="{Binding Enable4Of24V}"/>
<DataGridTextColumn Header="DN4-12V使能" Width="120" Binding="{Binding Enable4Of12V}"/> <DataGridTextColumn Header="DN4-12V使能" Width="130" Binding="{Binding Enable4Of12V}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</ScrollViewer> </ScrollViewer>

View File

@ -15,11 +15,11 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavityenvironment }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavityenvironment }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="90" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="温度1" Width="120" Binding="{Binding Temperature1}"/> <DataGridTextColumn Header="温度1" Width="120" Binding="{Binding Temperature1}"/>
<DataGridTextColumn Header="温度2" Width="120" Binding="{Binding Temperature2}"/> <DataGridTextColumn Header="温度2" Width="120" Binding="{Binding Temperature2}"/>
<DataGridTextColumn Header="湿度1" Width="120" Binding="{Binding HumDataIdNumity1}"/> <DataGridTextColumn Header="湿度1" Width="120" Binding="{Binding HumDataIdNumity1}"/>

View File

@ -14,24 +14,24 @@
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavityoperationstatus }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavityoperationstatus }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="90" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="DN1-48V电压" Width="120" Binding="{Binding Voltage48V1}"/> <DataGridTextColumn Header="DN1-48V电压" Width="140" Binding="{Binding Voltage48V1}"/>
<DataGridTextColumn Header="DN1-48V电流" Width="120" Binding="{Binding Current48V1}"/> <DataGridTextColumn Header="DN1-48V电流" Width="140" Binding="{Binding Current48V1}"/>
<DataGridTextColumn Header="DN1-24V电流" Width="120" Binding="{Binding Current24V1}"/> <DataGridTextColumn Header="DN1-24V电流" Width="140" Binding="{Binding Current24V1}"/>
<DataGridTextColumn Header="DN2-48V电流" Width="120" Binding="{Binding Current48V2}" /> <DataGridTextColumn Header="DN2-48V电流" Width="140" Binding="{Binding Current48V2}" />
<DataGridTextColumn Header="DN2-24V电流" Width="120" Binding="{Binding Current24V2}"/> <DataGridTextColumn Header="DN2-24V电流" Width="140" Binding="{Binding Current24V2}"/>
<DataGridTextColumn Header="DN3-48V电流" Width="120" Binding="{Binding Current48V3}"/> <DataGridTextColumn Header="DN3-48V电流" Width="140" Binding="{Binding Current48V3}"/>
<DataGridTextColumn Header="DN3-24V电流" Width="120" Binding="{Binding Current24V3}"/> <DataGridTextColumn Header="DN3-24V电流" Width="140" Binding="{Binding Current24V3}"/>
<DataGridTextColumn Header="DN4-48V电流" Width="120" Binding="{Binding Current48V4}"/> <DataGridTextColumn Header="DN4-48V电流" Width="140" Binding="{Binding Current48V4}"/>
<DataGridTextColumn Header="DN4-24V电流" Width="120" Binding="{Binding Current24V4}"/> <DataGridTextColumn Header="DN4-24V电流" Width="140" Binding="{Binding Current24V4}"/>
<DataGridTextColumn Header="漏电流模块1" Width="120" Binding="{Binding LeakageCurrent1}"/> <DataGridTextColumn Header="漏电流模块1" Width="140" Binding="{Binding LeakageCurrent1}"/>
<DataGridTextColumn Header="漏电流模块2" Width="120" Binding="{Binding LeakageCurrent2}"/> <DataGridTextColumn Header="漏电流模块2" Width="140" Binding="{Binding LeakageCurrent2}"/>
<DataGridTextColumn Header="漏电流模块3" Width="120" Binding="{Binding LeakageCurrent3}"/> <DataGridTextColumn Header="漏电流模块3" Width="140" Binding="{Binding LeakageCurrent3}"/>
<DataGridTextColumn Header="漏电流模块4" Width="120" Binding="{Binding LeakageCurrent4}"/> <DataGridTextColumn Header="漏电流模块4" Width="140" Binding="{Binding LeakageCurrent4}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</ScrollViewer> </ScrollViewer>

View File

@ -15,29 +15,29 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavityoutputcurrent }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavityoutputcurrent }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="90" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="色质联用输出电流" Width="150" Binding="{Binding CurrentOfGC_MS}"/> <DataGridTextColumn Header="色质联用输出电流" Width="170" Binding="{Binding CurrentOfGC_MS}"/>
<DataGridTextColumn Header="备用串口1输出电流" Width="150" Binding="{Binding CurrentOfSecondComPort1}"/> <DataGridTextColumn Header="备用串口1输出电流" Width="170" Binding="{Binding CurrentOfSecondComPort1}"/>
<DataGridTextColumn Header="备用串口2输出电流" Width="150" Binding="{Binding CurrentOfSecondComPort2}"/> <DataGridTextColumn Header="备用串口2输出电流" Width="170" Binding="{Binding CurrentOfSecondComPort2}"/>
<DataGridTextColumn Header="光通讯机输出电流" Width="150" Binding="{Binding CurrentOfOpticalComm}" /> <DataGridTextColumn Header="光通讯机输出电流" Width="170" Binding="{Binding CurrentOfOpticalComm}" />
<DataGridTextColumn Header="ADCP输出电流" Width="120" Binding="{Binding CurrentOfADCP}"/> <DataGridTextColumn Header="ADCP输出电流" Width="120" Binding="{Binding CurrentOfADCP}"/>
<DataGridTextColumn Header="CTD输出电流" Width="120" Binding="{Binding CurrentOfCTD}"/> <DataGridTextColumn Header="CTD输出电流" Width="120" Binding="{Binding CurrentOfCTD}"/>
<DataGridTextColumn Header="气相色谱仪输出电流" Width="150" Binding="{Binding CurrentOfDC_ECD}"/> <DataGridTextColumn Header="气相色谱仪输出电流" Width="170" Binding="{Binding CurrentOfDC_ECD}"/>
<DataGridTextColumn Header="甲烷同位素分析仪电流" Width="150" Binding="{Binding CurrentOfCH4}"/> <DataGridTextColumn Header="甲烷同位素分析仪电流" Width="170" Binding="{Binding CurrentOfCH4}"/>
<DataGridTextColumn Header="二氧化碳同位素分析仪电流" Width="150" Binding="{Binding CurrentOfCo2}"/> <DataGridTextColumn Header="二氧化碳同位素分析仪电流" Width="190" Binding="{Binding CurrentOfCo2}"/>
<DataGridTextColumn Header="备用网口输出电流" Width="120" Binding="{Binding CurrentOfSNetPort}"/> <DataGridTextColumn Header="备用网口输出电流" Width="160" Binding="{Binding CurrentOfSNetPort}"/>
<DataGridTextColumn Header="串口服务器输出电流" Width="120" Binding="{Binding CurrentOfSerialServer}"/> <DataGridTextColumn Header="串口服务器输出电流" Width="140" Binding="{Binding CurrentOfSerialServer}"/>
<DataGridTextColumn Header="工作机输出电流" Width="120" Binding="{Binding CurrentOfIPC}"/> <DataGridTextColumn Header="工作机输出电流" Width="140" Binding="{Binding CurrentOfIPC}"/>
<DataGridTextColumn Header="显微拉曼分析仪输出电流" Width="150" Binding="{Binding CurrentOfMicroRaman}"/> <DataGridTextColumn Header="显微拉曼分析仪输出电流" Width="170" Binding="{Binding CurrentOfMicroRaman}"/>
<DataGridTextColumn Header="质谱仪输出电流" Width="120" Binding="{Binding CurrentOfMS}"/> <DataGridTextColumn Header="质谱仪输出电流" Width="140" Binding="{Binding CurrentOfMS}"/>
<DataGridTextColumn Header="声学定位输出电流" Width="120" Binding="{Binding CurrentOfALD}"/> <DataGridTextColumn Header="声学定位输出电流" Width="140" Binding="{Binding CurrentOfALD}"/>
<DataGridTextColumn Header="摄像1的输出电流" Width="120" Binding="{Binding CurrrentOfVDataIdNumeo1}"/> <DataGridTextColumn Header="摄像1的输出电流" Width="140" Binding="{Binding CurrrentOfVDataIdNumeo1}"/>
<DataGridTextColumn Header="摄像2的输出电流" Width="120" Binding="{Binding CurrentOfVDataIdNumeo2}"/> <DataGridTextColumn Header="摄像2的输出电流" Width="140" Binding="{Binding CurrentOfVDataIdNumeo2}"/>
<DataGridTextColumn Header="电交换机2输出电流" Width="120" Binding="{Binding CurrentOfSwichBoard}"/> <DataGridTextColumn Header="电交换机2输出电流" Width="140" Binding="{Binding CurrentOfSwichBoard}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</ScrollViewer> </ScrollViewer>

View File

@ -15,29 +15,29 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavityoutputfeedback }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavityoutputfeedback }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="90" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="色质联用输出反馈" Width="150" Binding="{Binding OutputFeedbackOfGC_MS}"/> <DataGridTextColumn Header="色质联用输出反馈" Width="150" Binding="{Binding OutputFeedbackOfGC_MS}"/>
<DataGridTextColumn Header="备用串口1输出反馈" Width="150" Binding="{Binding OutputFeedback1OfSecondComPort}"/> <DataGridTextColumn Header="备用串口1输出反馈" Width="150" Binding="{Binding OutputFeedback1OfSecondComPort}"/>
<DataGridTextColumn Header="备用串口2输出反馈" Width="150" Binding="{Binding OutputFeedback2OfSecondComPort}"/> <DataGridTextColumn Header="备用串口2输出反馈" Width="150" Binding="{Binding OutputFeedback2OfSecondComPort}"/>
<DataGridTextColumn Header="光通讯机输出反馈" Width="150" Binding="{Binding OutputFeedbackOfOpticalComm}" /> <DataGridTextColumn Header="光通讯机输出反馈" Width="150" Binding="{Binding OutputFeedbackOfOpticalComm}" />
<DataGridTextColumn Header="ADCP输出反馈" Width="120" Binding="{Binding OutputFeedbackOfADCP}"/> <DataGridTextColumn Header="ADCP输出反馈" Width="120" Binding="{Binding OutputFeedbackOfADCP}"/>
<DataGridTextColumn Header="CTD输出反馈" Width="120" Binding="{Binding OutputFeedbackOfCTD}"/> <DataGridTextColumn Header="CTD输出反馈" Width="120" Binding="{Binding OutputFeedbackOfCTD}"/>
<DataGridTextColumn Header="气相色谱仪输出反馈" Width="150" Binding="{Binding OutputFeedbackOfDC_ECD}"/> <DataGridTextColumn Header="气相色谱仪输出反馈" Width="170" Binding="{Binding OutputFeedbackOfDC_ECD}"/>
<DataGridTextColumn Header="甲烷同位素分析仪反馈" Width="150" Binding="{Binding OutputFeedbackOfCH4}"/> <DataGridTextColumn Header="甲烷同位素分析仪反馈" Width="170" Binding="{Binding OutputFeedbackOfCH4}"/>
<DataGridTextColumn Header="二氧化碳同位素分析仪反馈" Width="150" Binding="{Binding OutputFeedbackOfCo2}"/> <DataGridTextColumn Header="二氧化碳同位素分析仪反馈" Width="200" Binding="{Binding OutputFeedbackOfCo2}"/>
<DataGridTextColumn Header="备用网口反馈" Width="120" Binding="{Binding OutputFeedbackOfSNetPort}"/> <DataGridTextColumn Header="备用网口反馈" Width="120" Binding="{Binding OutputFeedbackOfSNetPort}"/>
<DataGridTextColumn Header="串口服务器反馈" Width="120" Binding="{Binding OutputFeedbackOfSerialServer}"/> <DataGridTextColumn Header="串口服务器反馈" Width="120" Binding="{Binding OutputFeedbackOfSerialServer}"/>
<DataGridTextColumn Header="工作机输出反馈" Width="120" Binding="{Binding OutputFeedbackOfIPC}"/> <DataGridTextColumn Header="工作机输出反馈" Width="140" Binding="{Binding OutputFeedbackOfIPC}"/>
<DataGridTextColumn Header="显微拉曼分析仪输出反馈" Width="150" Binding="{Binding OutputFeedbackOfMicroRaman}"/> <DataGridTextColumn Header="显微拉曼分析仪输出反馈" Width="180" Binding="{Binding OutputFeedbackOfMicroRaman}"/>
<DataGridTextColumn Header="质谱仪输出反馈" Width="120" Binding="{Binding OutputFeedbackOfMS}"/> <DataGridTextColumn Header="质谱仪输出反馈" Width="140" Binding="{Binding OutputFeedbackOfMS}"/>
<DataGridTextColumn Header="声学定位输出反馈" Width="120" Binding="{Binding OutputFeedbackOfALD}"/> <DataGridTextColumn Header="声学定位输出反馈" Width="140" Binding="{Binding OutputFeedbackOfALD}"/>
<DataGridTextColumn Header="摄像1的输出反馈" Width="120" Binding="{Binding OutputFeedbackOfVDataIdNumeo1}"/> <DataGridTextColumn Header="摄像1的输出反馈" Width="140" Binding="{Binding OutputFeedbackOfVDataIdNumeo1}"/>
<DataGridTextColumn Header="摄像2的输出反馈" Width="120" Binding="{Binding OutputFeedbackOfVDataIdNumeo2}"/> <DataGridTextColumn Header="摄像2的输出反馈" Width="140" Binding="{Binding OutputFeedbackOfVDataIdNumeo2}"/>
<DataGridTextColumn Header="电交换机2输出反馈" Width="120" Binding="{Binding OutputFeedbackOfSwichBoard}"/> <DataGridTextColumn Header="电交换机2输出反馈" Width="140" Binding="{Binding OutputFeedbackOfSwichBoard}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</ScrollViewer> </ScrollViewer>

View File

@ -15,29 +15,29 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding cavityoutputstatus }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding cavityoutputstatus }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="60" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="记录时间" Width="140" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="记录时间" Width="170" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="腔体识别码" Width="70" Binding="{Binding CavityPIN}"/> <DataGridTextColumn Header="腔体识别码" Width="90" Binding="{Binding CavityPIN}"/>
<DataGridTextColumn Header="色质联用输出状态" Width="150" Binding="{Binding OutputStateOfGC_MS}"/> <DataGridTextColumn Header="色质联用输出状态" Width="150" Binding="{Binding OutputStateOfGC_MS}"/>
<DataGridTextColumn Header="备用串口1输出状态" Width="150" Binding="{Binding OutputStateOfSecondComPort1}"/> <DataGridTextColumn Header="备用串口1输出状态" Width="150" Binding="{Binding OutputStateOfSecondComPort1}"/>
<DataGridTextColumn Header="备用串口2输出状态" Width="150" Binding="{Binding OutputStateOfSecondComPort2}"/> <DataGridTextColumn Header="备用串口2输出状态" Width="150" Binding="{Binding OutputStateOfSecondComPort2}"/>
<DataGridTextColumn Header="光通讯机输出状态" Width="150" Binding="{Binding OutputStateOfOpticalComm}" /> <DataGridTextColumn Header="光通讯机输出状态" Width="150" Binding="{Binding OutputStateOfOpticalComm}" />
<DataGridTextColumn Header="ADCP输出状态" Width="120" Binding="{Binding OutputStateOfADCP}"/> <DataGridTextColumn Header="ADCP输出状态" Width="120" Binding="{Binding OutputStateOfADCP}"/>
<DataGridTextColumn Header="CTD输出状态" Width="120" Binding="{Binding OutputStateOfCTD}"/> <DataGridTextColumn Header="CTD输出状态" Width="120" Binding="{Binding OutputStateOfCTD}"/>
<DataGridTextColumn Header="气相色谱仪输出状态" Width="150" Binding="{Binding OutputStateOfDC_ECD}"/> <DataGridTextColumn Header="气相色谱仪输出状态" Width="170" Binding="{Binding OutputStateOfDC_ECD}"/>
<DataGridTextColumn Header="甲烷同位素分析仪状态" Width="150" Binding="{Binding OutputStateOfCH4}"/> <DataGridTextColumn Header="甲烷同位素分析仪状态" Width="180" Binding="{Binding OutputStateOfCH4}"/>
<DataGridTextColumn Header="二氧化碳同位素分析仪状态" Width="150" Binding="{Binding OutputStateOfCo2}"/> <DataGridTextColumn Header="二氧化碳同位素分析仪状态" Width="200" Binding="{Binding OutputStateOfCo2}"/>
<DataGridTextColumn Header="备用网口状态" Width="120" Binding="{Binding OutputStateOfSNetPort}"/> <DataGridTextColumn Header="备用网口状态" Width="120" Binding="{Binding OutputStateOfSNetPort}"/>
<DataGridTextColumn Header="串口服务器状态" Width="120" Binding="{Binding OutputStateOfSerialServer}"/> <DataGridTextColumn Header="串口服务器状态" Width="120" Binding="{Binding OutputStateOfSerialServer}"/>
<DataGridTextColumn Header="工作机输出状态" Width="120" Binding="{Binding OutputStateOfIPC}"/> <DataGridTextColumn Header="工作机输出状态" Width="140" Binding="{Binding OutputStateOfIPC}"/>
<DataGridTextColumn Header="显微拉曼分析仪输出状态" Width="150" Binding="{Binding OutputStateOfMicroRaman}"/> <DataGridTextColumn Header="显微拉曼分析仪输出状态" Width="180" Binding="{Binding OutputStateOfMicroRaman}"/>
<DataGridTextColumn Header="质谱仪输出状态" Width="120" Binding="{Binding OutputStateOfMS}"/> <DataGridTextColumn Header="质谱仪输出状态" Width="140" Binding="{Binding OutputStateOfMS}"/>
<DataGridTextColumn Header="声学定位输出状态" Width="120" Binding="{Binding OutputStateOfALD}"/> <DataGridTextColumn Header="声学定位输出状态" Width="140" Binding="{Binding OutputStateOfALD}"/>
<DataGridTextColumn Header="摄像1的输出状态" Width="120" Binding="{Binding OutputStateOfVDataIdNumeo1}"/> <DataGridTextColumn Header="摄像1的输出状态" Width="140" Binding="{Binding OutputStateOfVDataIdNumeo1}"/>
<DataGridTextColumn Header="摄像2的输出状态" Width="120" Binding="{Binding OutputStateOfVDataIdNumeo2}"/> <DataGridTextColumn Header="摄像2的输出状态" Width="140" Binding="{Binding OutputStateOfVDataIdNumeo2}"/>
<DataGridTextColumn Header="电交换机2输出状态" Width="120" Binding="{Binding OutputStateOfSwichBoard}"/> <DataGridTextColumn Header="电交换机2输出状态" Width="140" Binding="{Binding OutputStateOfSwichBoard}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</ScrollViewer> </ScrollViewer>

View File

@ -15,16 +15,16 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"> <ScrollViewer ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Hidden" x:Name="sv" CanContentScroll="False" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
<DataGrid ItemsSource="{Binding SequentialHistortyList }" FontSize="12" FontWeight="Bold" IsReadOnly="True" > <DataGrid ItemsSource="{Binding SequentialHistortyList }" FontSize="15" FontWeight="Bold" IsReadOnly="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" /> <DataGridTextColumn Header="序号" Width="40" Binding="{Binding DataIdNum}" />
<DataGridTextColumn Header="当前时序" Width="80" Binding="{Binding Sequential}" /> <DataGridTextColumn Header="当前时序" Width="80" Binding="{Binding Sequential}" />
<DataGridTextColumn Header="创建时间" Width="140" Binding="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="创建时间" Width="155" Binding="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="开始时间" Width="140" Binding="{Binding StartTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="开始时间" Width="155" Binding="{Binding StartTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="结束时间" Width="140" Binding="{Binding EndTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/> <DataGridTextColumn Header="结束时间" Width="155" Binding="{Binding EndTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
<DataGridTextColumn Header="配置号" Width="70" Binding="{Binding SequenceGroup}"/> <DataGridTextColumn Header="配置号" Width="70" Binding="{Binding SequenceGroup}"/>
<DataGridTextColumn Header="传感器" Width="100" Binding="{Binding SensorID}"/> <DataGridTextColumn Header="传感器" Width="170" Binding="{Binding SensorID}"/>
<DataGridTextColumn Header="工作时长/s" Width="100" Binding="{Binding WorkTime}"/> <DataGridTextColumn Header="工作时长/s" Width="110" Binding="{Binding WorkTime}"/>
<DataGridTextColumn Header="循环时长/s" Width="100" Binding="{Binding DurationTime}"/> <DataGridTextColumn Header="循环时长/s" Width="100" Binding="{Binding DurationTime}"/>
<DataGridTextColumn Header="是否已删除" Width="100" Binding="{Binding DeleteType}"/> <DataGridTextColumn Header="是否已删除" Width="100" Binding="{Binding DeleteType}"/>
</DataGrid.Columns> </DataGrid.Columns>

View File

@ -14,7 +14,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Background="#F7F9FA" Height="1" VerticalAlignment="Bottom"/> <Border Background="#F7F9FA" Height="1" VerticalAlignment="Bottom"/>
<Grid TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid TextBlock.FontSize="15" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="30"/> <ColumnDefinition Width="30"/>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
@ -144,8 +144,8 @@
Name="expandBox" Width="15" Height="15" Name="expandBox" Width="15" Height="15"
Template="{StaticResource ExpandeButtonTemplate}"/> Template="{StaticResource ExpandeButtonTemplate}"/>
<TextBlock Text="{Binding MenuHeader}" VerticalAlignment="Center" Grid.Column="1"/> <TextBlock Text="{Binding MenuHeader}" VerticalAlignment="Center" Grid.Column="1" FontSize="15"/>
<TextBlock Text="{Binding TargetView}" VerticalAlignment="Center" HorizontalAlignment="Left" <TextBlock Text="{Binding TargetView}" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="15"
Grid.Column="2" /> Grid.Column="2" />
<TextBlock Text="{Binding MenuIcon}" VerticalAlignment="Center" HorizontalAlignment="Center" <TextBlock Text="{Binding MenuIcon}" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="3" FontFamily="{StaticResource Icons}" FontSize="16"/> Grid.Column="3" FontFamily="{StaticResource Icons}" FontSize="16"/>
@ -153,12 +153,12 @@
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" <StackPanel Orientation="Horizontal" VerticalAlignment="Center"
HorizontalAlignment="Center" Grid.Column="4" HorizontalAlignment="Center" Grid.Column="4"
Name="operationPanel"> Name="operationPanel">
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,3,0"> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,3,0" >
<Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}">编辑</Hyperlink> CommandParameter="{Binding}">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Margin="3,0,0,0"> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Margin="3,0,0,0">
<Hyperlink Command="{Binding DataContext.DeleteCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}">删除</Hyperlink> CommandParameter="{Binding}">删除</Hyperlink>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>

View File

@ -124,7 +124,7 @@
</Border> </Border>
<!--角色列表--> <!--角色列表-->
<ListBox ItemsSource="{Binding RoleList}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Margin="5,10" BorderThickness="0" SelectedItem="{Binding CurrentRole}"> <ListBox ItemsSource="{Binding RoleList}" FontSize="15" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Margin="5,10" BorderThickness="0" SelectedItem="{Binding CurrentRole}">
<ListBox.ItemContainerStyle> <ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem"> <Style TargetType="ListBoxItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/> <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@ -200,8 +200,8 @@
<!--选择权限组信息--> <!--选择权限组信息-->
<StackPanel Margin="5,10" DataContext="{Binding CurrentRole}"> <StackPanel Margin="5,10" DataContext="{Binding CurrentRole}">
<TextBlock Text="{Binding RoleName}" Margin="5" FontWeight="Bold" Foreground="#666"/> <TextBlock Text="{Binding RoleName}" Margin="5" FontWeight="Bold" Foreground="#666" FontSize="15"/>
<TextBlock Text="{Binding RoleDesc}" Margin="5,3" Foreground="#999"/> <TextBlock Text="{Binding RoleDesc}" Margin="5,3" Foreground="#999" FontSize="14"/>
</StackPanel> </StackPanel>
<!--选择用户--> <!--选择用户-->
@ -212,16 +212,16 @@
<!--菜单选项--> <!--菜单选项-->
<Border Background="#F0F6FB" Grid.Row="1" Height="26" Margin="5,0" CornerRadius="5,5,0,0" BorderThickness="0,0,0,1" BorderBrush="#409EFE"> <Border Background="#F0F6FB" Grid.Row="1" Height="26" Margin="5,0" CornerRadius="5,5,0,0" BorderThickness="0,0,0,1" BorderBrush="#409EFE">
<TextBlock Text="菜单选项" VerticalAlignment="Center" Margin="10,0" Foreground="Gray"/> <TextBlock Text="菜单选项" VerticalAlignment="Center" Margin="10,0" Foreground="Gray" FontSize="15"/>
</Border> </Border>
<!--用户选项--> <!--用户选项-->
<Border Background="#F0F6FB" Grid.Row="1" Grid.Column="1" Height="26" Margin="5,0" CornerRadius="5,5,0,0" BorderThickness="0,0,0,1" BorderBrush="#409EFE"> <Border Background="#F0F6FB" Grid.Row="1" Grid.Column="1" Height="26" Margin="5,0" CornerRadius="5,5,0,0" BorderThickness="0,0,0,1" BorderBrush="#409EFE">
<TextBlock Text="用户选项" VerticalAlignment="Center" Margin="10,0" Foreground="Gray"/> <TextBlock Text="用户选项" VerticalAlignment="Center" Margin="10,0" Foreground="Gray" FontSize="15"/>
</Border> </Border>
<!--绑定菜单--> <!--绑定菜单-->
<TreeView ItemsSource="{Binding Menus}" Grid.Row="2" Margin="5,0,5,10" BorderThickness="0" Background="Transparent"> <TreeView ItemsSource="{Binding Menus}" FontSize="15" Grid.Row="2" Margin="5,0,5,10" BorderThickness="0" Background="Transparent">
<TreeView.ItemTemplate> <TreeView.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding Children}"> <HierarchicalDataTemplate ItemsSource="{Binding Children}">
<Grid Height="26"> <Grid Height="26">
@ -250,7 +250,7 @@
</TreeView> </TreeView>
<!--绑定用户--> <!--绑定用户-->
<ListBox ItemsSource="{Binding Users}" Grid.Column="1" Grid.Row="2" Margin="5,3" VerticalAlignment="Top" BorderThickness="0"> <ListBox ItemsSource="{Binding Users}" FontSize="15" Grid.Column="1" Grid.Row="2" Margin="5,3" VerticalAlignment="Top" BorderThickness="0">
<ListBox.ItemContainerStyle> <ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem"> <Style TargetType="ListBoxItem">
<Setter Property="Template"> <Setter Property="Template">
@ -283,11 +283,11 @@
</Border> </Border>
<TextBlock Text="{Binding RealName}" Grid.Column="1" VerticalAlignment="Center"/> <TextBlock Text="{Binding RealName}" Grid.Column="1" VerticalAlignment="Center"/>
<Border Width="1" Height="15" Background="#DDD" Grid.Column="1" HorizontalAlignment="Right"/> <Border Width="1" Height="15" Background="#DDD" Grid.Column="1" HorizontalAlignment="Right"/>
<Button Content="&#xe625;" Grid.Column="2" Style="{StaticResource IconButtonStyle}" <Button Content="&#xe625;" Grid.Column="2" Style="{StaticResource IconButtonStyle}"
Width="24" Height="24" Background="Transparent" Foreground="#666" Width="24" Height="24" Background="Transparent" Foreground="#666"
FontSize="8" FontSize="10"
Command="{Binding DataContext.DeleteUserCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" Command="{Binding DataContext.DeleteUserCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}"/> CommandParameter="{Binding}"/>
</Grid> </Grid>

View File

@ -80,11 +80,11 @@
<!--开始和结束时间--> <!--开始和结束时间-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="时序 1" FontSize="14" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" /> <TextBlock Text="时序 1" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" />
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime1,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime1,Mode=TwoWay}"/>
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime1,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime1,Mode=TwoWay}"/>
</StackPanel> </StackPanel>
<!--刷新 新建 下发--> <!--刷新 新建 下发-->
@ -108,7 +108,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid Grid.Row="0" TextBlock.FontSize="13" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -125,7 +125,7 @@
<TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS1}" Margin="0,10"> <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS1}" Margin="0,10">
<ListBox.ItemContainerStyle> <ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem"> <Style TargetType="ListBoxItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/> <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@ -157,20 +157,20 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="14" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="14" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding WorkTime}" FontSize="14" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding DurationTime}" FontSize="14" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS1Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS1Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Margin="5,3"> <TextBlock Margin="5,3">
<Hyperlink Command="{Binding DataContext.DeleteS1Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteS1Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
@ -200,11 +200,11 @@
<!--开始和结束时间--> <!--开始和结束时间-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="时序 2" FontSize="14" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" /> <TextBlock Text="时序 2" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" />
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime2,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime2,Mode=TwoWay}"/>
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime2,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime2,Mode=TwoWay}"/>
</StackPanel> </StackPanel>
<!--刷新 新建 下发--> <!--刷新 新建 下发-->
@ -229,7 +229,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid Grid.Row="0" TextBlock.FontSize="13" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -278,21 +278,21 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="14" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="14" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding WorkTime}" FontSize="14" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding DurationTime}" FontSize="14" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Margin="5,3"> <TextBlock Margin="5,3">
<Hyperlink Command="{Binding DataContext.DeleteS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
@ -322,11 +322,11 @@
<!--开始和结束时间--> <!--开始和结束时间-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="时序 3" FontSize="14" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" /> <TextBlock Text="时序 3" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" />
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime3,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime3,Mode=TwoWay}"/>
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime3,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime3,Mode=TwoWay}"/>
</StackPanel> </StackPanel>
<!--刷新 新建 下发--> <!--刷新 新建 下发-->
@ -350,7 +350,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid Grid.Row="0" TextBlock.FontSize="13" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -399,20 +399,20 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="14" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="14" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding WorkTime}" FontSize="14" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding DurationTime}" FontSize="14" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Margin="5,3"> <TextBlock Margin="5,3">
<Hyperlink Command="{Binding DataContext.DeleteS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
@ -442,11 +442,11 @@
<!--开始和结束时间--> <!--开始和结束时间-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="时序 4" FontSize="14" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" /> <TextBlock Text="时序 4" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" />
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime4,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime4,Mode=TwoWay}"/>
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime4,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime4,Mode=TwoWay}"/>
</StackPanel> </StackPanel>
<!--刷新 新建 下发--> <!--刷新 新建 下发-->
@ -470,7 +470,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid Grid.Row="0" TextBlock.FontSize="13" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -519,21 +519,21 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="14" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="14" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding WorkTime}" FontSize="14" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding DurationTime}" FontSize="14" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Margin="5,3"> <TextBlock Margin="5,3">
<Hyperlink Command="{Binding DataContext.DeleteS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
@ -563,11 +563,11 @@
<!--开始和结束时间--> <!--开始和结束时间-->
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="时序 5" FontSize="14" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" /> <TextBlock Text="时序 5" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground=" #9B30FF" VerticalAlignment="Center" />
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime5,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,3" hc:InfoElement.Title="开始时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialStartTime5,Mode=TwoWay}"/>
<hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="80" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="14" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime5,Mode=TwoWay}"/> <hc:DateTimePicker hc:InfoElement.ShowClearButton="True" hc:InfoElement.TitleWidth="100" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15,5" hc:InfoElement.Title="结束时间:" Foreground="Black" FontSize="15" Width="300" Background="Transparent" BorderBrush="White" SelectedDateTime="{Binding SequentialEndTime5,Mode=TwoWay}"/>
</StackPanel> </StackPanel>
<!--刷新 新建 下发--> <!--刷新 新建 下发-->
@ -591,7 +591,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid Grid.Row="0" TextBlock.FontSize="13" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -640,20 +640,20 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="14" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="14" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding WorkTime}" FontSize="14" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding DurationTime}" FontSize="14" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Margin="5,3"> <TextBlock Margin="5,3">
<Hyperlink Command="{Binding DataContext.DeleteS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" FontSize="15"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>

View File

@ -13,7 +13,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Background="#EEE" Height="1" VerticalAlignment="Bottom"/> <Border Background="#EEE" Height="1" VerticalAlignment="Bottom"/>
<Grid TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666"> <Grid TextBlock.FontSize="15" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="40"/> <ColumnDefinition Width="40"/>
<ColumnDefinition Width="70"/> <ColumnDefinition Width="70"/>
@ -69,7 +69,7 @@
<Border BorderBrush="#EEE" BorderThickness="0,0,0,1" Height="1" VerticalAlignment="Bottom" Grid.ColumnSpan="10" SnapsToDevicePixels="True"/> <Border BorderBrush="#EEE" BorderThickness="0,0,0,1" Height="1" VerticalAlignment="Bottom" Grid.ColumnSpan="10" SnapsToDevicePixels="True"/>
<!--序号--> <!--序号-->
<TextBlock Text="{Binding Index}" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="{Binding Index}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="15"/>
<!--头像--> <!--头像-->
<Border Grid.Column="1" Width="38" Height="38" <Border Grid.Column="1" Width="38" Height="38"
CornerRadius="5" BorderBrush="White" BorderThickness="1" CornerRadius="5" BorderBrush="White" BorderThickness="1"
@ -86,19 +86,19 @@
<!--用户Name--> <!--用户Name-->
<TextBlock Text="{Binding UserName}" VerticalAlignment="Center" <TextBlock Text="{Binding UserName}" VerticalAlignment="Center"
FontWeight="Bold" Foreground="#555" FontWeight="Bold" Foreground="#555" FontSize="15"
Grid.Column="2" Margin="5,0"/> Grid.Column="2" Margin="5,0"/>
<!--姓名--> <!--姓名-->
<TextBlock Text="{Binding RealName}" VerticalAlignment="Center" <TextBlock Text="{Binding RealName}" VerticalAlignment="Center"
Foreground="#555" Grid.Column="3" Margin="5,0"/> Foreground="#555" Grid.Column="3" Margin="5,0" FontSize="15"/>
<!--地址--> <!--地址-->
<TextBlock Text="{Binding Address}" FontSize="12" Foreground="#888" <TextBlock Text="{Binding Address}" FontSize="15" Foreground="#888"
VerticalAlignment="Center" Margin="5,0" VerticalAlignment="Center" Margin="5,0"
Grid.Column="4"/> Grid.Column="4"/>
<!--性别--> <!--性别-->
<TextBlock Text="女" Name="tb_gender" Grid.Column="5" Foreground="#888" <TextBlock Text="女" Name="tb_gender" Grid.Column="5" Foreground="#888"
VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="12"/> FontSize="15"/>
<!--权限列表--> <!--权限列表-->
<ItemsControl Grid.Column="6" ItemsSource="{Binding Roles}" <ItemsControl Grid.Column="6" ItemsSource="{Binding Roles}"
VerticalAlignment="Center" HorizontalAlignment="Center"> VerticalAlignment="Center" HorizontalAlignment="Center">
@ -118,7 +118,7 @@
</ItemsControl> </ItemsControl>
<!--状态--> <!--状态-->
<TextBlock Text="锁定" Name="tb_status" Grid.Column="7" Foreground="#888" <TextBlock Text="锁定" Name="tb_status" Grid.Column="7" Foreground="#888"
VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="12"/> VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="15"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="8" VerticalAlignment="Center" <StackPanel Grid.Column="8" VerticalAlignment="Center"
@ -126,12 +126,12 @@
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" CommandParameter="{Binding}" FontSize="15"
TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Margin="5,3"> <TextBlock Margin="5,3">
<Hyperlink Command="{Binding DataContext.DeleteCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.DeleteCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" CommandParameter="{Binding}" FontSize="15"
TextDecorations="None" Foreground="#409EFE">删除</Hyperlink> TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
</TextBlock> </TextBlock>
<ToggleButton Content="&#xe60b;" FontFamily="{StaticResource Icons}" <ToggleButton Content="&#xe60b;" FontFamily="{StaticResource Icons}"
@ -139,10 +139,8 @@
Name="tb_more"/> Name="tb_more"/>
</StackPanel> </StackPanel>
<Popup StaysOpen="False" IsOpen="{Binding ElementName=tb_more,Path=IsChecked}" <Popup StaysOpen="False" IsOpen="{Binding ElementName=tb_more,Path=IsChecked}" PlacementTarget="{Binding ElementName=tb_more}" AllowsTransparency="True"
PlacementTarget="{Binding ElementName=tb_more}" HorizontalOffset="-100" VerticalOffset="2">
AllowsTransparency="True"
HorizontalOffset="-100" VerticalOffset="2">
<Border Width="120" Background="#F0F6FB" CornerRadius="3" Margin="5"> <Border Width="120" Background="#F0F6FB" CornerRadius="3" Margin="5">
<Border.Effect> <Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Direction="0" Color="Gray" Opacity="0.1"/> <DropShadowEffect BlurRadius="10" ShadowDepth="0" Direction="0" Color="Gray" Opacity="0.1"/>
@ -155,15 +153,15 @@
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Height="1" Background="#DDD" Grid.Row="2" Margin="0,3"/> <Border Height="1" Background="#DDD" Grid.Row="2" Margin="0,3"/>
<Button Content="编辑角色" Style="{StaticResource MoreMenuButtonStyle}" <Button Content="编辑角色" Style="{StaticResource MoreMenuButtonStyle}" FontSize="15"
Command="{Binding DataContext.SelectRoleCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" Command="{Binding DataContext.SelectRoleCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}"/> CommandParameter="{Binding}"/>
<Button Content="重置密码" Grid.Row="1" Style="{StaticResource MoreMenuButtonStyle}" <Button Content="重置密码" Grid.Row="1" Style="{StaticResource MoreMenuButtonStyle}" FontSize="15"
Command="{Binding DataContext.ResetPasswordCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" Command="{Binding DataContext.ResetPasswordCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}"/> CommandParameter="{Binding}"/>
<Button Content="{Binding LockButtonText}" Grid.Row="3" Style="{StaticResource MoreMenuButtonStyle}" <Button Content="{Binding LockButtonText}" Grid.Row="3" Style="{StaticResource MoreMenuButtonStyle}" FontSize="15"
Command="{Binding DataContext.LockUserCommand,RelativeSource={RelativeSource AncestorType=UserControl}}" Command="{Binding DataContext.LockUserCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}"/> CommandParameter="{Binding}"/>
</Grid> </Grid>
</Border> </Border>
</Popup> </Popup>