界面显示内容优化

DefaultEdit.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\OpenCvSharp4.runtime.win.4.10.0.20241108\build\net48\OpenCvSharp4.runtime.win.props" Condition="Exists('packages\OpenCvSharp4.runtime.win.4.10.0.20241108\build\net48\OpenCvSharp4.runtime.win.props')" />
   <Import Project="packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -318,7 +317,6 @@
     <Error Condition="!Exists('packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
     <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
-    <Error Condition="!Exists('packages\OpenCvSharp4.runtime.win.4.10.0.20241108\build\net48\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\OpenCvSharp4.runtime.win.4.10.0.20241108\build\net48\OpenCvSharp4.runtime.win.props'))" />
     <Error Condition="!Exists('packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
     <Error Condition="!Exists('packages\HarfBuzzSharp.NativeAssets.macOS.7.3.0.3\build\net462\HarfBuzzSharp.NativeAssets.macOS.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\HarfBuzzSharp.NativeAssets.macOS.7.3.0.3\build\net462\HarfBuzzSharp.NativeAssets.macOS.targets'))" />
     <Error Condition="!Exists('packages\HarfBuzzSharp.NativeAssets.Win32.7.3.0.3\build\net462\HarfBuzzSharp.NativeAssets.Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\HarfBuzzSharp.NativeAssets.Win32.7.3.0.3\build\net462\HarfBuzzSharp.NativeAssets.Win32.targets'))" />

Views/WorkRunView.xaml

@@ -218,7 +218,7 @@
 
                     <StackPanel   Grid.Row="0"
                                   Grid.Column="2">
-                        <TextBlock Text="#1光固化#1功率"
+                        <TextBlock Text="离心转速"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.Power1_1}"
                                    Margin="0,0,80,0" />
@@ -226,51 +226,22 @@
 
                     <StackPanel   Grid.Row="0"
                                   Grid.Column="3">
-                        <TextBlock Text="#1光固化#2功率"
+                        <TextBlock Text="离心时间"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.Power1_2}"
                                    Margin="0,0,80,0" />
                     </StackPanel>
-                    <StackPanel   Grid.Row="0"
-                                  Grid.Column="4">
-                        <TextBlock Text="#2光固化#1功率"
-                                   Margin="0,0,80,0" />
-                        <TextBlock Text="{Binding Management.CurrConfig.Power1_3}"
-                                   Margin="0,0,80,0" />
-                    </StackPanel>
-                    <StackPanel   Grid.Row="0"
-                                  Grid.Column="5">
-                        <TextBlock Text="#2光固化#2功率"
-                                   Margin="0,0,80,0" />
-                        <TextBlock Text="{Binding Management.CurrConfig.Power1_4}"
-                                   Margin="0,0,80,0" />
-                    </StackPanel>
-
+                 
 
                     <StackPanel   Grid.Row="1"
                                   Grid.Column="0">
-                        <TextBlock Text="#1固化箱压力"
-                                   Margin="0,0,80,0" />
-                        <TextBlock Text="{Binding Management.CurrConfig.Pressure1}"
-                                   Margin="0,0,80,0" />
-                    </StackPanel>
-                    <StackPanel   Grid.Row="1"
-                                  Grid.Column="1">
-                        <TextBlock Text="#2固化箱压力"
-                                   Margin="0,0,80,0" />
-                        <TextBlock Text="{Binding Management.CurrConfig.Pressure2}"
-                                   Margin="0,0,80,0" />
-                    </StackPanel>
-
-                    <StackPanel   Grid.Row="1"
-                                  Grid.Column="2">
                         <TextBlock Text="#1光固化时间"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.PTime1}"
                                    Margin="0,0,80,0" />
                     </StackPanel>
                     <StackPanel   Grid.Row="1"
-                                  Grid.Column="3">
+                                  Grid.Column="1">
                         <TextBlock Text="#2光固化时间"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.PTime2}"

packages.config

@@ -11,9 +11,6 @@
   <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="ObservableCollections" version="3.3.4" targetFramework="net48" />
-  <package id="OpenCvSharp4" version="4.10.0.20241108" targetFramework="net48" />
-  <package id="OpenCvSharp4.Extensions" version="4.10.0.20241108" targetFramework="net48" />
-  <package id="OpenCvSharp4.runtime.win" version="4.10.0.20241108" targetFramework="net48" />
   <package id="OpenTK" version="3.3.1" targetFramework="net48" />
   <package id="OpenTK.GLWpfControl" version="3.3.0" targetFramework="net48" />
   <package id="Prism.Core" version="8.1.97" targetFramework="net48" />