HStation/XHS.V1.0.git

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

qin

2025-03-07 3e7d5f8fd4a2fc44b16b8d589716099451433c53

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

已修改8个文件

已添加4个文件

	Desktop/IBox.Desktop/IBox.Desktop.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Desktop/PBS.Desktop/PBS.Desktop.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Desktop/PBS.Desktop/PBS.Desktop.csproj.user	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Desktop/PBS.Desktop/XtraForm1.Designer.cs	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Desktop/PBS.Desktop/XtraForm1.cs	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HStation.PBS.sln	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/IBox.WinFrmUI/IBox.WinFrmUI.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/IBox.WinFrmUI/IBoxForm.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/IBox.WinFrmUI/Model/CalcResultViewModel.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/PBS.WinFrmUI/XtraUserControl1.Designer.cs	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WinFrmUI/PBS.WinFrmUI/XtraUserControl1.cs	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Desktop/IBox.Desktop/IBox.Desktop.csproj

@@ -25,7 +25,6 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
  </ItemGroup>

  <ItemGroup>

 Desktop/PBS.Desktop/PBS.Desktop.csproj

@@ -8,6 +8,7 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <ApplicationManifest>app.manifest</ApplicationManifest>
    <ApplicationIcon>Hstation.ico</ApplicationIcon>
    <UseWPF>False</UseWPF>
  </PropertyGroup>

  <ItemGroup>

 Desktop/PBS.Desktop/PBS.Desktop.csproj.user

@@ -17,10 +17,8 @@
    <Compile Update="MainForm.cs">
      <SubType>Form</SubType>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Update="MainForm.resx">
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <Compile Update="XtraForm1.cs">
      <SubType>Form</SubType>
    </Compile>
  </ItemGroup>
</Project>

 Desktop/PBS.Desktop/XtraForm1.Designer.cs

对比新文件
@@ -0,0 +1,38 @@
锘縩amespace PBS.Desktop
{
    partial class XtraForm1
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Text = "XtraForm1";
        }

        #endregion
    }
}

 Desktop/PBS.Desktop/XtraForm1.cs

对比新文件
@@ -0,0 +1,21 @@
锘縰sing System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;

namespace PBS.Desktop
{
    public partial class XtraForm1: DevExpress.XtraEditors.XtraForm
    {
        public XtraForm1()
        {
            InitializeComponent();
        }
    }
}

 HStation.PBS.sln

@@ -157,8 +157,6 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HStation", "HStation", "{8592F739-4B08-4B0F-B0D5-FAB10D60B2A2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.Desktop", "Desktop\PBS.Desktop\PBS.Desktop.csproj", "{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.WinFrmUI", "WinFrmUI\PBS.WinFrmUI\PBS.WinFrmUI.csproj", "{1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.WinFrmUI.WE", "WinFrmUI\PBS.WinFrmUI.WE\PBS.WinFrmUI.WE.csproj", "{54038B93-F0D3-48F5-8F85-4A02360537C8}"
@@ -182,6 +180,8 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBox.WinFrmUI", "WinFrmUI\IBox.WinFrmUI\IBox.WinFrmUI.csproj", "{DE18C1FA-7D71-4C1E-996C-69F83B00F083}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBox.Desktop", "Desktop\IBox.Desktop\IBox.Desktop.csproj", "{1DA4F16F-D655-49E7-A128-34C70223A26D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.Desktop", "Desktop\PBS.Desktop\PBS.Desktop.csproj", "{C013AD3B-53A4-8187-1CFB-DA23F8811577}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1204,24 +1204,6 @@
        {36AD458B-32A8-4FF9-8548-8FD2CD7ADABF}.Release|x64.Build.0 = Release|Any CPU
        {36AD458B-32A8-4FF9-8548-8FD2CD7ADABF}.Release|x86.ActiveCfg = Release|Any CPU
        {36AD458B-32A8-4FF9-8548-8FD2CD7ADABF}.Release|x86.Build.0 = Release|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug|x64.ActiveCfg = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug|x64.Build.0 = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug|x86.ActiveCfg = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug|x86.Build.0 = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test|x64.Build.0 = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test|x86.Build.0 = Debug|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release|Any CPU.Build.0 = Release|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release|x64.ActiveCfg = Release|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release|x64.Build.0 = Release|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release|x86.ActiveCfg = Release|Any CPU
        {50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release|x86.Build.0 = Release|Any CPU
        {1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1438,6 +1420,24 @@
        {1DA4F16F-D655-49E7-A128-34C70223A26D}.Release|x64.Build.0 = Release|Any CPU
        {1DA4F16F-D655-49E7-A128-34C70223A26D}.Release|x86.ActiveCfg = Release|Any CPU
        {1DA4F16F-D655-49E7-A128-34C70223A26D}.Release|x86.Build.0 = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug|x64.ActiveCfg = Debug|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug|x64.Build.0 = Debug|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug|x86.ActiveCfg = Debug|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug|x86.Build.0 = Debug|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test|Any CPU.ActiveCfg = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test|Any CPU.Build.0 = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test|x64.ActiveCfg = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test|x64.Build.0 = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test|x86.ActiveCfg = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test|x86.Build.0 = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release|Any CPU.Build.0 = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release|x64.ActiveCfg = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release|x64.Build.0 = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release|x86.ActiveCfg = Release|Any CPU
        {C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release|x86.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE

 WinFrmUI/IBox.WinFrmUI/IBox.WinFrmUI.csproj

@@ -34,13 +34,11 @@
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="InTheHand.Net.Bluetooth" Version="4.1.44" />
    <PackageReference Include="NPOI" Version="2.7.1" />
    <PackageReference Include="Yw.Untity.Core" Version="3.0.6" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\Service\PBS.Service\PBS.Service.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" />
  </ItemGroup>

</Project>

 WinFrmUI/IBox.WinFrmUI/IBoxForm.cs

@@ -463,7 +463,7 @@
            }
        }
        public Build _SelectedBuild;
        private List<CalcResultViewModel> _res;
        //private List<CalcResultViewModel> _res;
        private string filePath = "Data\\AnalyData_{0}.json";
        //private void ShowChart()
        //{

 WinFrmUI/IBox.WinFrmUI/Model/CalcResultViewModel.cs

@@ -1,11 +1,4 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yw.WinFrmUI.Q3d;

namespace IBox.WinFrmUI
锘縩amespace IBox.WinFrmUI
{
    public class CalcResultViewModel
    {
@@ -17,6 +10,6 @@

        public int it_Times;

        public dict<long, int> unitNum;
        // public dict<long, int> unitNum;
    }
}

 WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user

@@ -20,5 +20,8 @@
    <Compile Update="01-place\PlaceMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="XtraUserControl1.cs">
      <SubType>UserControl</SubType>
    </Compile>
  </ItemGroup>
</Project>

 WinFrmUI/PBS.WinFrmUI/XtraUserControl1.Designer.cs

对比新文件
@@ -0,0 +1,37 @@
锘縩amespace PBS.WinFrmUI
{
    partial class XtraUserControl1
    {
        /// <summary> 
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary> 
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Component Designer generated code

        /// <summary> 
        /// Required method for Designer support - do not modify 
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
        }

        #endregion
    }
}

 WinFrmUI/PBS.WinFrmUI/XtraUserControl1.cs

对比新文件
@@ -0,0 +1,21 @@
锘縰sing System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Text;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;

namespace PBS.WinFrmUI
{
    public partial class XtraUserControl1: DevExpress.XtraEditors.XtraUserControl
    {
        public XtraUserControl1()
        {
            InitializeComponent();
        }
    }
}

			@@ -25,7 +25,6 @@

			<ItemGroup>
			<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
			<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
			</ItemGroup>

			<ItemGroup>

			@@ -8,6 +8,7 @@
			<ImplicitUsings>enable</ImplicitUsings>
			<ApplicationManifest>app.manifest</ApplicationManifest>
			<ApplicationIcon>Hstation.ico</ApplicationIcon>
			<UseWPF>False</UseWPF>
			</PropertyGroup>

			<ItemGroup>

			@@ -17,10 +17,8 @@
			<Compile Update="MainForm.cs">
			<SubType>Form</SubType>
			</Compile>
			</ItemGroup>
			<ItemGroup>
			<EmbeddedResource Update="MainForm.resx">
			<SubType>Designer</SubType>
			</EmbeddedResource>
			<Compile Update="XtraForm1.cs">
			<SubType>Form</SubType>
			</Compile>
			</ItemGroup>
			</Project>

对比新文件
			@@ -0,0 +1,38 @@
			锘縩amespace PBS.Desktop
			{
			partial class XtraForm1
			{
			/// <summary>
			/// Required designer variable.
			/// </summary>
			private System.ComponentModel.IContainer components = null;

			/// <summary>
			/// Clean up any resources being used.
			/// </summary>
			/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
			protected override void Dispose(bool disposing)
			{
			if (disposing && (components != null))
			{
			components.Dispose();
			}
			base.Dispose(disposing);
			}

			#region Windows Form Designer generated code

			/// <summary>
			/// Required method for Designer support - do not modify
			/// the contents of this method with the code editor.
			/// </summary>
			private void InitializeComponent()
			{
			this.components = new System.ComponentModel.Container();
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			this.Text = "XtraForm1";
			}

			#endregion
			}
			}

对比新文件
			@@ -0,0 +1,21 @@
			锘縰sing System;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Data;
			using System.Drawing;
			using System.Text;
			using System.Linq;
			using System.Threading.Tasks;
			using System.Windows.Forms;
			using DevExpress.XtraEditors;

			namespace PBS.Desktop
			{
			public partial class XtraForm1: DevExpress.XtraEditors.XtraForm
			{
			public XtraForm1()
			{
			InitializeComponent();
			}
			}
			}

			@@ -157,8 +157,6 @@
			EndProject
			Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HStation", "HStation", "{8592F739-4B08-4B0F-B0D5-FAB10D60B2A2}"
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.Desktop", "Desktop\PBS.Desktop\PBS.Desktop.csproj", "{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}"
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.WinFrmUI", "WinFrmUI\PBS.WinFrmUI\PBS.WinFrmUI.csproj", "{1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}"
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.WinFrmUI.WE", "WinFrmUI\PBS.WinFrmUI.WE\PBS.WinFrmUI.WE.csproj", "{54038B93-F0D3-48F5-8F85-4A02360537C8}"
			@@ -182,6 +180,8 @@
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBox.WinFrmUI", "WinFrmUI\IBox.WinFrmUI\IBox.WinFrmUI.csproj", "{DE18C1FA-7D71-4C1E-996C-69F83B00F083}"
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBox.Desktop", "Desktop\IBox.Desktop\IBox.Desktop.csproj", "{1DA4F16F-D655-49E7-A128-34C70223A26D}"
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PBS.Desktop", "Desktop\PBS.Desktop\PBS.Desktop.csproj", "{C013AD3B-53A4-8187-1CFB-DA23F8811577}"
			EndProject
			Global
			GlobalSection(SolutionConfigurationPlatforms) = preSolution
			@@ -1204,24 +1204,6 @@
			{36AD458B-32A8-4FF9-8548-8FD2CD7ADABF}.Release\|x64.Build.0 = Release\|Any CPU
			{36AD458B-32A8-4FF9-8548-8FD2CD7ADABF}.Release\|x86.ActiveCfg = Release\|Any CPU
			{36AD458B-32A8-4FF9-8548-8FD2CD7ADABF}.Release\|x86.Build.0 = Release\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug\|x64.ActiveCfg = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug\|x64.Build.0 = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug\|x86.ActiveCfg = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Debug\|x86.Build.0 = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test\|Any CPU.ActiveCfg = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test\|Any CPU.Build.0 = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test\|x64.ActiveCfg = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test\|x64.Build.0 = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test\|x86.ActiveCfg = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.dll_test\|x86.Build.0 = Debug\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release\|Any CPU.Build.0 = Release\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release\|x64.ActiveCfg = Release\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release\|x64.Build.0 = Release\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release\|x86.ActiveCfg = Release\|Any CPU
			{50AB583D-E2A5-446B-A16F-FCEBB0E41E19}.Release\|x86.Build.0 = Release\|Any CPU
			{1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
			{1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
			{1FE67D7F-281A-4859-8FCD-DAEA4C5A5E53}.Debug\|x64.ActiveCfg = Debug\|Any CPU
			@@ -1438,6 +1420,24 @@
			{1DA4F16F-D655-49E7-A128-34C70223A26D}.Release\|x64.Build.0 = Release\|Any CPU
			{1DA4F16F-D655-49E7-A128-34C70223A26D}.Release\|x86.ActiveCfg = Release\|Any CPU
			{1DA4F16F-D655-49E7-A128-34C70223A26D}.Release\|x86.Build.0 = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug\|x64.ActiveCfg = Debug\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug\|x64.Build.0 = Debug\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug\|x86.ActiveCfg = Debug\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Debug\|x86.Build.0 = Debug\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test\|Any CPU.ActiveCfg = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test\|Any CPU.Build.0 = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test\|x64.ActiveCfg = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test\|x64.Build.0 = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test\|x86.ActiveCfg = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.dll_test\|x86.Build.0 = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release\|Any CPU.Build.0 = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release\|x64.ActiveCfg = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release\|x64.Build.0 = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release\|x86.ActiveCfg = Release\|Any CPU
			{C013AD3B-53A4-8187-1CFB-DA23F8811577}.Release\|x86.Build.0 = Release\|Any CPU
			EndGlobalSection
			GlobalSection(SolutionProperties) = preSolution
			HideSolutionNode = FALSE

			@@ -34,13 +34,11 @@
			<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
			<PackageReference Include="InTheHand.Net.Bluetooth" Version="4.1.44" />
			<PackageReference Include="NPOI" Version="2.7.1" />
			<PackageReference Include="Yw.Untity.Core" Version="3.0.6" />
			</ItemGroup>

			<ItemGroup>
			<ProjectReference Include="..\..\Service\PBS.Service\PBS.Service.csproj" />
			<ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
			<ProjectReference Include="..\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" />
			</ItemGroup>

			</Project>

			@@ -463,7 +463,7 @@
			}
			}
			public Build _SelectedBuild;
			private List<CalcResultViewModel> _res;
			//private List<CalcResultViewModel> _res;
			private string filePath = "Data\\AnalyData_{0}.json";
			//private void ShowChart()
			//{

			@@ -1,11 +1,4 @@
			锘縰sing System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			using Yw.WinFrmUI.Q3d;

			namespace IBox.WinFrmUI
			锘縩amespace IBox.WinFrmUI
			{
			public class CalcResultViewModel
			{
			@@ -17,6 +10,6 @@

			public int it_Times;

			public dict<long, int> unitNum;
			// public dict<long, int> unitNum;
			}
			}

			@@ -20,5 +20,8 @@
			<Compile Update="01-place\PlaceMgrPage.cs">
			<SubType>UserControl</SubType>
			</Compile>
			<Compile Update="XtraUserControl1.cs">
			<SubType>UserControl</SubType>
			</Compile>
			</ItemGroup>
			</Project>

对比新文件
			@@ -0,0 +1,37 @@
			锘縩amespace PBS.WinFrmUI
			{
			partial class XtraUserControl1
			{
			/// <summary>
			/// Required designer variable.
			/// </summary>
			private System.ComponentModel.IContainer components = null;

			/// <summary>
			/// Clean up any resources being used.
			/// </summary>
			/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
			protected override void Dispose(bool disposing)
			{
			if (disposing && (components != null))
			{
			components.Dispose();
			}
			base.Dispose(disposing);
			}

			#region Component Designer generated code

			/// <summary>
			/// Required method for Designer support - do not modify
			/// the contents of this method with the code editor.
			/// </summary>
			private void InitializeComponent()
			{
			components = new System.ComponentModel.Container();
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			}

			#endregion
			}
			}