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

lixiaojun

2024-07-30 f45bba0b5ecf73df67af6cb60e57ea956d82a8ab

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
    <TargetFramework>net6.0-windows</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
  </PropertyGroup>
 
  <ItemGroup>
    <Compile Remove="01-perform\01-cubic\Curve\**" />
    <Compile Remove="01-perform\01-cubic\Import\**" />
    <Compile Remove="01-perform\01-cubic\Preview\**" />
    <EmbeddedResource Remove="01-perform\01-cubic\Curve\**" />
    <EmbeddedResource Remove="01-perform\01-cubic\Import\**" />
    <EmbeddedResource Remove="01-perform\01-cubic\Preview\**" />
    <None Remove="01-perform\01-cubic\Curve\**" />
    <None Remove="01-perform\01-cubic\Import\**" />
    <None Remove="01-perform\01-cubic\Preview\**" />
    <Page Remove="01-perform\01-cubic\Curve\**" />
    <Page Remove="01-perform\01-cubic\Import\**" />
    <Page Remove="01-perform\01-cubic\Preview\**" />
  </ItemGroup>
 
  <ItemGroup>
    <Compile Remove="01-perform\01-cubic\01-chart\CubicSpline2dEditChart.cs" />
    <Compile Remove="01-perform\01-cubic\01-chart\CubicSpline2dEditChart.Designer.cs" />
    <Compile Remove="01-perform\01-cubic\01-chart\CubicSpline2dMultiChart.cs" />
    <Compile Remove="01-perform\01-cubic\01-chart\CubicSpline2dMultiChart.Designer.cs" />
  </ItemGroup>
 
  <ItemGroup>
    <EmbeddedResource Remove="01-perform\01-cubic\01-chart\CubicSpline2dEditChart.resx" />
    <EmbeddedResource Remove="01-perform\01-cubic\01-chart\CubicSpline2dMultiChart.resx" />
  </ItemGroup>
 
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="NPOI" Version="2.7.1" />
  </ItemGroup>
 
  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Phart.Core\HStation.BLL.Phart.Core.csproj" />
    <ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
  </ItemGroup>
 
  <ItemGroup>
    <Compile Update="01-perform\01-cubic\01-chart\CubicSpline2dChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-perform\01-cubic\02-coordinate\AxisValueDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-perform\01-cubic\02-coordinate\ChartCoordinateDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-perform\01-cubic\03-import\01-excel\ImportCurveByExcelCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-perform\01-cubic\03-import\01-excel\ImportCurveByExcelDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Update="XhsProjectUserControl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="XhsPumpCurveMainPanel.cs" />
  </ItemGroup>
 
  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
 
</Project>