From 4de480ec624d3b79ca690dc906e10cd2fbdc9be7 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 24 四月 2025 15:00:02 +0800
Subject: [PATCH] 升级dev，添加水量预测注释
---
WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 200 insertions(+), 26 deletions(-)
diff --git a/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj b/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj
index 6016060..ac7dd75 100644
--- a/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj
+++ b/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj
@@ -1,5 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\packages\Microsoft.ML.Mkl.Redist.3.0.1\build\netstandard2.0\Microsoft.ML.Mkl.Redist.props" Condition="Exists('..\..\packages\Microsoft.ML.Mkl.Redist.3.0.1\build\netstandard2.0\Microsoft.ML.Mkl.Redist.props')" />
+ <Import Project="..\..\packages\Microsoft.ML.FastTree.3.0.1\build\netstandard2.0\Microsoft.ML.FastTree.props" Condition="Exists('..\..\packages\Microsoft.ML.FastTree.3.0.1\build\netstandard2.0\Microsoft.ML.FastTree.props')" />
+ <Import Project="..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.props" Condition="Exists('..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.props')" />
+ <Import Project="..\..\packages\Microsoft.ML.CpuMath.3.0.1\build\netstandard2.0\Microsoft.ML.CpuMath.props" Condition="Exists('..\..\packages\Microsoft.ML.CpuMath.3.0.1\build\netstandard2.0\Microsoft.ML.CpuMath.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,6 +17,8 @@
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -32,31 +38,128 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.Drawing.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.Utils.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraBars.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraCharts.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraCharts.v22.2.UI, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraCharts.v22.2.Wizard, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraEditors.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraGrid.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <Reference Include="DevExpress.XtraLayout.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
- <Reference Include="DevExpress.XtraTreeList.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <Reference Include="IStation.WinFrmUI.CalcErQu, Version=1.1.1.4, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\out\IStation.WinFrmUI.CalcErQu.dll</HintPath>
+ <Reference Include="Accessibility" />
+ <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.CodeParser.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.DataAccess.v23.2.UI, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Diagram.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.Images.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Pdf.v23.2.Drawing, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.PivotGrid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Sparkline.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.Utils.v23.2.UI, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraCharts.v23.2.Extensions, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraCharts.v23.2.UI, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraCharts.v23.2.Wizard, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraDiagram.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraGauges.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraNavBar.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraPivotGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraReports.v23.2.CodeCompletion, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraReports.v23.2.Extensions, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraRichEdit.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraTreeList.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraVerticalGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.Bcl.Numerics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.Bcl.Numerics.8.0.0\lib\net462\Microsoft.Bcl.Numerics.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.CpuMath, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.CpuMath.3.0.1\lib\netstandard2.0\Microsoft.ML.CpuMath.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.Data, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.Data.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.DataView, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.DataView.3.0.1\lib\netstandard2.0\Microsoft.ML.DataView.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.FastTree, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.FastTree.3.0.1\lib\netstandard2.0\Microsoft.ML.FastTree.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.KMeansClustering, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.KMeansClustering.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.PCA, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.PCA.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.StandardTrainers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.StandardTrainers.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.TimeSeries, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.TimeSeries.3.0.1\lib\netstandard2.0\Microsoft.ML.TimeSeries.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.ML.Transforms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.ML.3.0.1\lib\netstandard2.0\Microsoft.ML.Transforms.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.CodeDom, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.CodeDom.4.5.0\lib\net461\System.CodeDom.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+ </Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Configuration" />
<Reference Include="System.Core" />
+ <Reference Include="System.Data.Linq" />
+ <Reference Include="System.Data.OracleClient" />
+ <Reference Include="System.Deployment" />
+ <Reference Include="System.Design" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.Drawing.Design" />
+ <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Numerics" />
+ <Reference Include="System.Numerics.Tensors, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Numerics.Tensors.8.0.0\lib\net462\System.Numerics.Tensors.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.Threading.Channels, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Transactions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -75,6 +178,12 @@
<DependentUpon>HistoryDataDlg.cs</DependentUpon>
</Compile>
<Compile Include="HistoryDataHelper.cs" />
+ <Compile Include="HistoryDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="HistoryDlg.Designer.cs">
+ <DependentUpon>HistoryDlg.cs</DependentUpon>
+ </Compile>
<Compile Include="HistoryModel.cs" />
<Compile Include="monitor\chart\TimeValueChartView.cs">
<SubType>UserControl</SubType>
@@ -141,6 +250,7 @@
<Compile Include="monitor\chart\TimeValueEasyChartView.designer.cs">
<DependentUpon>TimeValueEasyChartView.cs</DependentUpon>
</Compile>
+ <Compile Include="OutWater\OutWaterHelper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="monitor\DataScreeningChartCtrl.cs">
<SubType>UserControl</SubType>
@@ -153,17 +263,29 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="ResultChartControl.cs">
+ <Compile Include="OutWater\PumpOutWaterAnaDlg.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="ResultChartControl.Designer.cs">
+ <Compile Include="OutWater\PumpOutWaterAnaDlg.Designer.cs">
+ <DependentUpon>PumpOutWaterAnaDlg.cs</DependentUpon>
+ </Compile>
+ <Compile Include="AnaCompareData\ResultChartControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="AnaCompareData\ResultChartControl.Designer.cs">
<DependentUpon>ResultChartControl.cs</DependentUpon>
</Compile>
- <Compile Include="SearchHistoryData.cs">
+ <Compile Include="AnaCompareData\SearchHistoryData.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="SearchHistoryData.designer.cs">
+ <Compile Include="AnaCompareData\SearchHistoryData.designer.cs">
<DependentUpon>SearchHistoryData.cs</DependentUpon>
+ </Compile>
+ <Compile Include="AnaCompareData\UserChoiceDateDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="AnaCompareData\UserChoiceDateDlg.Designer.cs">
+ <DependentUpon>UserChoiceDateDlg.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
@@ -179,9 +301,25 @@
<Project>{0383caa6-d016-4be5-bb2b-97eb12f0c9fa}</Project>
<Name>IStation.BLL.Monitor</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\Calc\IStation.Calc.Core\IStation.Calc.Core.csproj">
+ <Project>{af55ab4d-b3f0-455a-b9cd-02d02783582c}</Project>
+ <Name>IStation.Calc.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Calc\IStation.Calc.Model\IStation.Calc.Model.csproj">
+ <Project>{2ad845bd-ac63-4c54-89f2-0552a4460cd1}</Project>
+ <Name>IStation.Calc.Model</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Component\IStation.Newtonsoft\IStation.Newtonsoft.csproj">
+ <Project>{699a5283-8009-45d8-912e-8fcf3f950157}</Project>
+ <Name>IStation.Newtonsoft</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\Core\IStation.Core\IStation.Core.csproj">
<Project>{c2675c69-ffed-481b-af5a-a56141e9515f}</Project>
<Name>IStation.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\DAL\IStation.DAL.Paras\IStation.DAL.Paras.csproj">
+ <Project>{214c8eda-5c12-4bc1-af2a-8a1591b2d1f5}</Project>
+ <Name>IStation.DAL.Paras</Name>
</ProjectReference>
<ProjectReference Include="..\..\Model\IStation.Model.Basic\IStation.Model.Basic.csproj">
<Project>{768dfba7-383a-4780-bb29-d3f73997ee6b}</Project>
@@ -211,6 +349,10 @@
<Project>{A8C1BB64-0119-48B3-AA8E-0BD346F9467D}</Project>
<Name>IStation.Untity</Name>
</ProjectReference>
+ <ProjectReference Include="..\IStation.WinFrmUI.CalcErQu\IStation.WinFrmUI.CalcErQu.csproj">
+ <Project>{0df332d4-d288-4e2d-89fe-42f76a8d84ee}</Project>
+ <Name>IStation.WinFrmUI.CalcErQu</Name>
+ </ProjectReference>
<ProjectReference Include="..\IStation.WinFrmUI.Core\IStation.WinFrmUI.Core.csproj">
<Project>{ae19abb8-6f6a-4598-b3eb-5ef40d11dc46}</Project>
<Name>IStation.WinFrmUI.Core</Name>
@@ -219,6 +361,9 @@
<ItemGroup>
<EmbeddedResource Include="HistoryDataDlg.resx">
<DependentUpon>HistoryDataDlg.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="HistoryDlg.resx">
+ <DependentUpon>HistoryDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="monitor\chart\TimeValueChartView.resx">
<DependentUpon>TimeValueChartView.cs</DependentUpon>
@@ -257,16 +402,45 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="ResultChartControl.resx">
+ <EmbeddedResource Include="OutWater\PumpOutWaterAnaDlg.resx">
+ <DependentUpon>PumpOutWaterAnaDlg.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="AnaCompareData\ResultChartControl.resx">
<DependentUpon>ResultChartControl.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="SearchHistoryData.resx">
+ <EmbeddedResource Include="AnaCompareData\SearchHistoryData.resx">
<DependentUpon>SearchHistoryData.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="AnaCompareData\UserChoiceDateDlg.resx">
+ <DependentUpon>UserChoiceDateDlg.cs</DependentUpon>
+ </EmbeddedResource>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <None Include="app.config" />
+ <None Include="Resources\gaugestylerightquartercircular.svg" />
+ </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\find.svg" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\find1.svg" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\createlinechart.svg" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\..\packages\Microsoft.ML.CpuMath.3.0.1\build\netstandard2.0\Microsoft.ML.CpuMath.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ML.CpuMath.3.0.1\build\netstandard2.0\Microsoft.ML.CpuMath.props'))" />
+ <Error Condition="!Exists('..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.props'))" />
+ <Error Condition="!Exists('..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.targets'))" />
+ <Error Condition="!Exists('..\..\packages\Microsoft.ML.FastTree.3.0.1\build\netstandard2.0\Microsoft.ML.FastTree.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ML.FastTree.3.0.1\build\netstandard2.0\Microsoft.ML.FastTree.props'))" />
+ <Error Condition="!Exists('..\..\packages\Microsoft.ML.Mkl.Redist.3.0.1\build\netstandard2.0\Microsoft.ML.Mkl.Redist.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ML.Mkl.Redist.3.0.1\build\netstandard2.0\Microsoft.ML.Mkl.Redist.props'))" />
+ </Target>
+ <Import Project="..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.targets" Condition="Exists('..\..\packages\Microsoft.ML.3.0.1\build\netstandard2.0\Microsoft.ML.targets')" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.3