TyroneGit/YuPu-OrpaonEMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改初版

Browse Source
This commit is contained in:
Tyrone CT
2025-12-25 11:13:13 +08:00
parent 51e4d5add4
commit 7c001e6396
15 changed files with 1450 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OrpaonEMS.App/Views/AutoHandView.xaml
View File

@@ -687,6 +687,10 @@
FontSize="16"
Text="{Binding YuePuRunModelService.EsSoc2}" />
</StackPanel>
<StackPanel Grid.RowSpan="2" Grid.Column="2">
<TextBlock Text="{Binding YuePuRunModelService.LogicMsg}" TextWrapping="Wrap" />
</StackPanel>
</Grid>
</Grid>

362
OrpaonEMS.App/Views/ControlConfigView.xaml
View File

@@ -14,15 +14,18 @@
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid>
<Grid.RowDefinitions>
<!--<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<ColumnDefinition />
</Grid.ColumnDefinitions>-->
<Border
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Margin="5,5,5,5"
Background="White"
CornerRadius="10">
@@ -41,20 +44,44 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.Resources>
<Style x:Key="TextIco" TargetType="TextBlock">
<Setter Property="Margin" Value="0,2,10,2" />
<Setter Property="Margin" Value="0,2,5,2" />
<Setter Property="FontSize" Value="20" />
<Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="FontFamily" Value="../Assets/Fonts/#iconfont" />
<Setter Property="Foreground" Value="Black" />
</Style>
<Style x:Key="TextTitle" TargetType="TextBlock">
<Setter Property="Margin" Value="5,0,10,0" />
<Setter Property="FontSize" Value="20" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Foreground" Value="Black" />
</Style>
<Style x:Key="TextValue" TargetType="TextBlock">
<Setter Property="Margin" Value="10,0,5,0" />
<Setter Property="FontSize" Value="20" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Foreground" Value="Black" />
</Style>
<Style x:Key="StackPanelText" TargetType="StackPanel">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
@@ -74,98 +101,261 @@
VerticalAlignment="Center"
FontSize="20"
Foreground="#596B75"
Text="Mqtt配置" />
</StackPanel>
<StackPanel Grid.Row="1" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe62e;" />
<TextBox
Width="100"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="IP地址"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="{Binding ConfigDataService.MqttServerUrl}">
<i:Interaction.Behaviors>
<keyboard:NumericKeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="1"
Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe839;" />
<TextBox
Width="100"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="端口号"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="{Binding ConfigDataService.MqttServerPort}">
<i:Interaction.Behaviors>
<keyboard:NumericKeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>
Text="控制参数配置" />
</StackPanel>
<StackPanel
Grid.Row="2"
Grid.Column="0"
Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe7fd;" />
<TextBox
Width="100"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="用户名"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="{Binding ConfigDataService.MqttUser}">
<i:Interaction.Behaviors>
<keyboard:KeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>
</StackPanel>
<StackPanel
Grid.Row="2"
Grid.Column="1"
Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe83a;" />
<TextBox
Width="100"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="密码"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="{Binding ConfigDataService.MqttPwd}">
<i:Interaction.Behaviors>
<keyboard:KeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>
</StackPanel>
<StackPanel
Grid.Row="3"
Grid.ColumnSpan="2"
Style="{StaticResource StackPanelText}">
<StackPanel Grid.Row="1" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBox
Width="260"
<TextBlock Style="{StaticResource TextTitle}" Text="1-光伏充电储能上限（95-99）:" />
<Slider
x:Name="Slider1"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="100"
Minimum="50"
Orientation="Horizontal"
SelectionEnd="99"
SelectionStart="95"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding SolarToEsAsFullSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider1, Path=Value, Mode=OneWay, StringFormat=0}" />
<!--<TextBox
Width="180"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="客户端标识"
materialDesign:HintAssist.Hint="建议数据:【90-99】"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="{Binding ConfigDataService.MqttClientId}">
Text="145">
<i:Interaction.Behaviors>
<keyboard:KeyboardBehavior />
<keyboard:NumericKeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>
</TextBox>-->
</StackPanel>
<StackPanel Grid.Row="2" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="2-主模式:切换从模式时主储能Soc下限（0-20）:" />
<Slider
x:Name="Slider2"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="50"
Minimum="0"
Orientation="Horizontal"
SelectionEnd="10"
SelectionStart="1"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding Master_ToSlaveByMasterSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider2, Path=Value, Mode=OneWay, StringFormat=0}" />
</StackPanel>
<StackPanel Grid.Row="3" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="3-主模式:切换从模式时从储能Soc下限（0-20）:" />
<Slider
x:Name="Slider3"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="50"
Minimum="0"
Orientation="Horizontal"
SelectionEnd="10"
SelectionStart="1"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding Master_ToSlaveBySlaveSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider3, Path=Value, Mode=OneWay, StringFormat=0}" />
<!--<TextBox
Width="180"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="建议数据:【90-99】"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="145">
<i:Interaction.Behaviors>
<keyboard:NumericKeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>-->
</StackPanel>
<StackPanel Grid.Row="4" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="4-主模式:光伏到从储能已充满,主储能Soc阀值（80-99）:" />
<Slider
x:Name="Slider4"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="100"
Minimum="50"
Orientation="Horizontal"
SelectionEnd="100"
SelectionStart="90"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding Master_SolarToSlaveEsFullByMasterSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider4, Path=Value, Mode=OneWay, StringFormat=0}" />
<!--<TextBox
Width="180"
VerticalAlignment="Center"
materialDesign:HintAssist.Hint="建议数据:【90-99】"
FontSize="14"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="145">
<i:Interaction.Behaviors>
<keyboard:NumericKeyboardBehavior />
</i:Interaction.Behaviors>
</TextBox>-->
</StackPanel>
<StackPanel Grid.Row="6" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="5-从模式:切换主模式时从储能Soc下限（0-20）:" />
<Slider
x:Name="Slider6"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="50"
Minimum="0"
Orientation="Horizontal"
SelectionEnd="10"
SelectionStart="1"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding Slave_ToMasterBySlaveSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider6, Path=Value, Mode=OneWay, StringFormat=0}" />
</StackPanel>
<StackPanel Grid.Row="7" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="6-从模式:切换主模式时主储能Soc下限（0-20）:" />
<Slider
x:Name="Slider7"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="50"
Minimum="0"
Orientation="Horizontal"
SelectionEnd="10"
SelectionStart="1"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding Slave_ToMasterByMasterSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider7, Path=Value, Mode=OneWay, StringFormat=0}" />
</StackPanel>
<StackPanel Grid.Row="8" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="7-从模式:光伏到主储能已充满,从储能Soc阀值（80-99）:" />
<Slider
x:Name="Slider8"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="100"
Minimum="50"
Orientation="Horizontal"
SelectionEnd="100"
SelectionStart="90"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding Slave_SolarToMasterEsFullBySlaverSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider8, Path=Value, Mode=OneWay, StringFormat=0}" />
</StackPanel>
<StackPanel Grid.Row="10" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="8-晚上充电:主储能充满Soc上限(建议90-99):" />
<Slider
x:Name="Slider10"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="100"
Minimum="50"
Orientation="Horizontal"
SelectionEnd="99"
SelectionStart="90"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding NightMaster_ToMasterFullSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider10, Path=Value, Mode=OneWay, StringFormat=0}" />
</StackPanel>
<StackPanel Grid.Row="11" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="9-晚上充电:从储能充满Soc上限(建议50-90):" />
<Slider
x:Name="Slider11"
Width="280"
IsSelectionRangeEnabled="True"
Maximum="100"
Minimum="0"
Orientation="Horizontal"
SelectionEnd="90"
SelectionStart="50"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding NightSlave_ToSlaveFullSoc}" />
<TextBlock
Margin="5,0"
Style="{StaticResource TextValue}"
Text="{Binding ElementName=Slider11, Path=Value, Mode=OneWay, StringFormat=0}" />
</StackPanel>
<StackPanel Grid.Row="13" Style="{StaticResource StackPanelText}">
<TextBlock Style="{StaticResource TextIco}" Text="&#xe747;" />
<TextBlock Style="{StaticResource TextTitle}" Text="放电模式时间：" />
<ComboBox
Width="240"
DisplayMemberPath="DisChargeTime"
ItemsSource="{Binding DisChargeModels}"
SelectedValue="{Binding SelectedDisChargeModelId, Mode=TwoWay}"
SelectedValuePath="Model" />
</StackPanel>
<StackPanel
Grid.Row="4"
Grid.Row="18"
Grid.ColumnSpan="2"
Margin="0,0,20,0"
Margin="0,0,20,5"
HorizontalAlignment="Right"
VerticalAlignment="Center">
<Button Command="{Binding BtnMqttConfigSave}" Content="保存配置" />
<Button Command="{Binding BtnConfigSave}" Content="使用并保存配置" />
</StackPanel>
<StackPanel
Grid.Row="18"
Grid.ColumnSpan="2"
Margin="20,0,20,5"
HorizontalAlignment="Left"
VerticalAlignment="Center">
<Button Command="{Binding BtnCloseSys}" Content="关闭系统" />
</StackPanel>
</Grid>
</Border>