20260514 1

This commit is contained in:
毕文静 2026-05-14 17:09:23 +08:00
parent 4c1852dad8
commit 55b5ba529b
8 changed files with 199 additions and 80 deletions

File diff suppressed because one or more lines are too long

View File

@ -21,8 +21,6 @@
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -76,39 +74,6 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath> <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration.Binder, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.6.0.0\lib\net461\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Http, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Http.6.0.0\lib\net461\Microsoft.Extensions.Http.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.6.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Options, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Options.6.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.6.0.0\lib\net461\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Primitives, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
</Reference>
<Reference Include="Microsoft.SQLServer.ManagedDTS, Version=10.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> <Reference Include="Microsoft.SQLServer.ManagedDTS, Version=10.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath> <HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
@ -129,47 +94,17 @@
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath> <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <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.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Data.Linq" /> <Reference Include="System.Data.Linq" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.DirectoryServices" /> <Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Net.Http">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath> <HintPath>E:\工作\集团子公司\CNCEC_SUBQHSE\SUBQHSE\BLL\bin\Debug\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Net.Http.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.Json.8.0.0\lib\netstandard2.0\System.Net.Http.Json.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<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>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.0\lib\netstandard2.0\System.Text.Json.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.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.DataVisualization" /> <Reference Include="System.Web.DataVisualization" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@ -409,13 +344,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

@ -179,6 +179,173 @@
<Content Include="AttachFile\res\webuploader\webuploader.nolog.min.js" /> <Content Include="AttachFile\res\webuploader\webuploader.nolog.min.js" />
<Content Include="AttachFile\webuploader2.aspx" /> <Content Include="AttachFile\webuploader2.aspx" />
<Content Include="AttachFile\webuploader.aspx" /> <Content Include="AttachFile\webuploader.aspx" />
<Content Include="bin\AipSdk.dll" />
<Content Include="bin\AOP.Common.dll" />
<Content Include="bin\Aspose.Words.dll" />
<Content Include="bin\Aspose.Words.xml" />
<Content Include="bin\BLL.pdb" />
<Content Include="bin\BouncyCastle.Crypto.dll" />
<Content Include="bin\BouncyCastle.Crypto.xml" />
<Content Include="bin\FastReport.Bars.dll" />
<Content Include="bin\FastReport.Compat.dll" />
<Content Include="bin\FastReport.dll" />
<Content Include="bin\FastReport.Editor.dll" />
<Content Include="bin\FastReport.Web.dll" />
<Content Include="bin\FineUIPro.dll" />
<Content Include="bin\FineUIPro.Web.dll" />
<Content Include="bin\FineUIPro.Web.pdb" />
<Content Include="bin\FineUIPro.xml" />
<Content Include="bin\ICSharpCode.SharpZipLib.dll" />
<Content Include="bin\ICSharpCode.SharpZipLib.pdb" />
<Content Include="bin\ICSharpCode.SharpZipLib.xml" />
<Content Include="bin\Microsoft.Bcl.HashCode.dll" />
<Content Include="bin\Microsoft.Bcl.HashCode.xml" />
<Content Include="bin\Microsoft.mshtml.dll" />
<Content Include="bin\Microsoft.Win32.Primitives.dll" />
<Content Include="bin\Model.dll" />
<Content Include="bin\Model.pdb" />
<Content Include="bin\netstandard.dll" />
<Content Include="bin\Newtonsoft.Json.dll" />
<Content Include="bin\Newtonsoft.Json.pdb" />
<Content Include="bin\Newtonsoft.Json.xml" />
<Content Include="bin\NPOI.dll" />
<Content Include="bin\NPOI.OOXML.dll" />
<Content Include="bin\NPOI.OOXML.pdb" />
<Content Include="bin\NPOI.OOXML.xml" />
<Content Include="bin\NPOI.OpenXml4Net.dll" />
<Content Include="bin\NPOI.OpenXml4Net.pdb" />
<Content Include="bin\NPOI.OpenXmlFormats.dll" />
<Content Include="bin\NPOI.OpenXmlFormats.pdb" />
<Content Include="bin\NPOI.pdb" />
<Content Include="bin\NPOI.xml" />
<Content Include="bin\SgManager.AI.dll" />
<Content Include="bin\SgManager.AI.pdb" />
<Content Include="bin\Spire.Pdf.dll" />
<Content Include="bin\Spire.Pdf.xml" />
<Content Include="bin\System.AppContext.dll" />
<Content Include="bin\System.Buffers.dll" />
<Content Include="bin\System.Buffers.xml" />
<Content Include="bin\System.Collections.Concurrent.dll" />
<Content Include="bin\System.Collections.dll" />
<Content Include="bin\System.Collections.NonGeneric.dll" />
<Content Include="bin\System.Collections.Specialized.dll" />
<Content Include="bin\System.ComponentModel.dll" />
<Content Include="bin\System.ComponentModel.EventBasedAsync.dll" />
<Content Include="bin\System.ComponentModel.Primitives.dll" />
<Content Include="bin\System.ComponentModel.TypeConverter.dll" />
<Content Include="bin\System.Console.dll" />
<Content Include="bin\System.Data.Common.dll" />
<Content Include="bin\System.Diagnostics.Contracts.dll" />
<Content Include="bin\System.Diagnostics.Debug.dll" />
<Content Include="bin\System.Diagnostics.FileVersionInfo.dll" />
<Content Include="bin\System.Diagnostics.Process.dll" />
<Content Include="bin\System.Diagnostics.StackTrace.dll" />
<Content Include="bin\System.Diagnostics.TextWriterTraceListener.dll" />
<Content Include="bin\System.Diagnostics.Tools.dll" />
<Content Include="bin\System.Diagnostics.TraceSource.dll" />
<Content Include="bin\System.Diagnostics.Tracing.dll" />
<Content Include="bin\System.Drawing.Primitives.dll" />
<Content Include="bin\System.Dynamic.Runtime.dll" />
<Content Include="bin\System.Globalization.Calendars.dll" />
<Content Include="bin\System.Globalization.dll" />
<Content Include="bin\System.Globalization.Extensions.dll" />
<Content Include="bin\System.IO.Compression.dll" />
<Content Include="bin\System.IO.Compression.ZipFile.dll" />
<Content Include="bin\System.IO.dll" />
<Content Include="bin\System.IO.FileSystem.dll" />
<Content Include="bin\System.IO.FileSystem.DriveInfo.dll" />
<Content Include="bin\System.IO.FileSystem.Primitives.dll" />
<Content Include="bin\System.IO.FileSystem.Watcher.dll" />
<Content Include="bin\System.IO.IsolatedStorage.dll" />
<Content Include="bin\System.IO.MemoryMappedFiles.dll" />
<Content Include="bin\System.IO.Pipes.dll" />
<Content Include="bin\System.IO.UnmanagedMemoryStream.dll" />
<Content Include="bin\System.Linq.dll" />
<Content Include="bin\System.Linq.Expressions.dll" />
<Content Include="bin\System.Linq.Parallel.dll" />
<Content Include="bin\System.Linq.Queryable.dll" />
<Content Include="bin\System.Memory.dll" />
<Content Include="bin\System.Memory.xml" />
<Content Include="bin\System.Net.Http.dll" />
<Content Include="bin\System.Net.NameResolution.dll" />
<Content Include="bin\System.Net.NetworkInformation.dll" />
<Content Include="bin\System.Net.Ping.dll" />
<Content Include="bin\System.Net.Primitives.dll" />
<Content Include="bin\System.Net.Requests.dll" />
<Content Include="bin\System.Net.Security.dll" />
<Content Include="bin\System.Net.Sockets.dll" />
<Content Include="bin\System.Net.WebHeaderCollection.dll" />
<Content Include="bin\System.Net.WebSockets.Client.dll" />
<Content Include="bin\System.Net.WebSockets.dll" />
<Content Include="bin\System.Numerics.Vectors.dll" />
<Content Include="bin\System.Numerics.Vectors.xml" />
<Content Include="bin\System.ObjectModel.dll" />
<Content Include="bin\System.Reflection.dll" />
<Content Include="bin\System.Reflection.Extensions.dll" />
<Content Include="bin\System.Reflection.Primitives.dll" />
<Content Include="bin\System.Resources.Reader.dll" />
<Content Include="bin\System.Resources.ResourceManager.dll" />
<Content Include="bin\System.Resources.Writer.dll" />
<Content Include="bin\System.Runtime.CompilerServices.Unsafe.dll" />
<Content Include="bin\System.Runtime.CompilerServices.Unsafe.xml" />
<Content Include="bin\System.Runtime.CompilerServices.VisualC.dll" />
<Content Include="bin\System.Runtime.dll" />
<Content Include="bin\System.Runtime.Extensions.dll" />
<Content Include="bin\System.Runtime.Handles.dll" />
<Content Include="bin\System.Runtime.InteropServices.dll" />
<Content Include="bin\System.Runtime.InteropServices.RuntimeInformation.dll" />
<Content Include="bin\System.Runtime.Numerics.dll" />
<Content Include="bin\System.Runtime.Serialization.Formatters.dll" />
<Content Include="bin\System.Runtime.Serialization.Json.dll" />
<Content Include="bin\System.Runtime.Serialization.Primitives.dll" />
<Content Include="bin\System.Runtime.Serialization.Xml.dll" />
<Content Include="bin\System.Security.Claims.dll" />
<Content Include="bin\System.Security.Cryptography.Algorithms.dll" />
<Content Include="bin\System.Security.Cryptography.Csp.dll" />
<Content Include="bin\System.Security.Cryptography.Encoding.dll" />
<Content Include="bin\System.Security.Cryptography.Primitives.dll" />
<Content Include="bin\System.Security.Cryptography.X509Certificates.dll" />
<Content Include="bin\System.Security.Principal.dll" />
<Content Include="bin\System.Security.SecureString.dll" />
<Content Include="bin\System.Text.Encoding.dll" />
<Content Include="bin\System.Text.Encoding.Extensions.dll" />
<Content Include="bin\System.Text.RegularExpressions.dll" />
<Content Include="bin\System.Threading.dll" />
<Content Include="bin\System.Threading.Overlapped.dll" />
<Content Include="bin\System.Threading.Tasks.dll" />
<Content Include="bin\System.Threading.Tasks.Parallel.dll" />
<Content Include="bin\System.Threading.Thread.dll" />
<Content Include="bin\System.Threading.ThreadPool.dll" />
<Content Include="bin\System.Threading.Timer.dll" />
<Content Include="bin\System.ValueTuple.dll" />
<Content Include="bin\System.Xml.ReaderWriter.dll" />
<Content Include="bin\System.Xml.XDocument.dll" />
<Content Include="bin\System.Xml.XmlDocument.dll" />
<Content Include="bin\System.Xml.XmlSerializer.dll" />
<Content Include="bin\System.Xml.XPath.dll" />
<Content Include="bin\System.Xml.XPath.XDocument.dll" />
<Content Include="bin\ThoughtWorks.QRCode.dll" />
<Content Include="bin\UglyToad.PdfPig.Core.dll" />
<Content Include="bin\UglyToad.PdfPig.Core.pdb" />
<Content Include="bin\UglyToad.PdfPig.Core.xml" />
<Content Include="bin\UglyToad.PdfPig.dll" />
<Content Include="bin\UglyToad.PdfPig.DocumentLayoutAnalysis.dll" />
<Content Include="bin\UglyToad.PdfPig.DocumentLayoutAnalysis.pdb" />
<Content Include="bin\UglyToad.PdfPig.DocumentLayoutAnalysis.xml" />
<Content Include="bin\UglyToad.PdfPig.Fonts.dll" />
<Content Include="bin\UglyToad.PdfPig.Fonts.pdb" />
<Content Include="bin\UglyToad.PdfPig.Fonts.xml" />
<Content Include="bin\UglyToad.PdfPig.Package.dll" />
<Content Include="bin\UglyToad.PdfPig.Package.pdb" />
<Content Include="bin\UglyToad.PdfPig.Package.xml" />
<Content Include="bin\UglyToad.PdfPig.pdb" />
<Content Include="bin\UglyToad.PdfPig.Tokenization.dll" />
<Content Include="bin\UglyToad.PdfPig.Tokenization.pdb" />
<Content Include="bin\UglyToad.PdfPig.Tokenization.xml" />
<Content Include="bin\UglyToad.PdfPig.Tokens.dll" />
<Content Include="bin\UglyToad.PdfPig.Tokens.pdb" />
<Content Include="bin\UglyToad.PdfPig.Tokens.xml" />
<Content Include="bin\UglyToad.PdfPig.xml" />
<Content Include="common\BaseInfo\AudiFlowEdit.aspx" /> <Content Include="common\BaseInfo\AudiFlowEdit.aspx" />
<Content Include="common\BaseInfo\AudiFlowSet.aspx" /> <Content Include="common\BaseInfo\AudiFlowSet.aspx" />
<Content Include="common\BaseInfo\DepartEdit.aspx" /> <Content Include="common\BaseInfo\DepartEdit.aspx" />
@ -1557,6 +1724,10 @@
<Content Include="YLRQ\WeldingReport\FeedbackResultShowColumn.aspx" /> <Content Include="YLRQ\WeldingReport\FeedbackResultShowColumn.aspx" />
<Content Include="YLRQ\WeldingReport\StatisticsSampleTable.aspx" /> <Content Include="YLRQ\WeldingReport\StatisticsSampleTable.aspx" />
<Content Include="YLRQ\WeldingReport\WelderPerformance.aspx" /> <Content Include="YLRQ\WeldingReport\WelderPerformance.aspx" />
<Content Include="bin\BLL.dll.config" />
<Content Include="bin\FineUIPro.lic.dev.config" />
<None Include="bin\FineUIPro.Web.dll.config" />
<Content Include="bin\SgManager.AI.dll.config" />
<None Include="ceuser\ceuser.dat" /> <None Include="ceuser\ceuser.dat" />
<None Include="common\ReportPrint\ReportTabFile\射线检测结果确认表.tab" /> <None Include="common\ReportPrint\ReportTabFile\射线检测结果确认表.tab" />
<None Include="common\ReportPrint\ReportTabFile\焊接系统_合格焊工登记表.tab" /> <None Include="common\ReportPrint\ReportTabFile\焊接系统_合格焊工登记表.tab" />
@ -5774,14 +5945,12 @@
</Compile> </Compile>
<Compile Include="HJGL\HotHardManage\HardReportSetDataIn.aspx.cs"> <Compile Include="HJGL\HotHardManage\HardReportSetDataIn.aspx.cs">
<DependentUpon>HardReportSetDataIn.aspx</DependentUpon> <DependentUpon>HardReportSetDataIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile> </Compile>
<Compile Include="HJGL\HotHardManage\HardReportSetDataIn.aspx.designer.cs"> <Compile Include="HJGL\HotHardManage\HardReportSetDataIn.aspx.designer.cs">
<DependentUpon>HardReportSetDataIn.aspx</DependentUpon> <DependentUpon>HardReportSetDataIn.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx.cs"> <Compile Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx.cs">
<DependentUpon>HardReportSetDataInEdit.aspx</DependentUpon> <DependentUpon>HardReportSetDataInEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile> </Compile>
<Compile Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx.designer.cs"> <Compile Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx.designer.cs">
<DependentUpon>HardReportSetDataInEdit.aspx</DependentUpon> <DependentUpon>HardReportSetDataInEdit.aspx</DependentUpon>

View File

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

View File

@ -67,7 +67,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/> <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers> </httpHandlers>
<compilation debug="true" targetFramework="4.6.1"> <compilation debug="false" targetFramework="4.6.1">
<assemblies> <assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies> </assemblies>

View File

@ -115,6 +115,18 @@
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="bin\Debug\Model.dll" />
<Content Include="bin\Debug\Model.pdb" />
<Content Include="bin\Debug\Newtonsoft.Json.dll" />
<Content Include="bin\Debug\Newtonsoft.Json.pdb" />
<Content Include="bin\Debug\Newtonsoft.Json.xml" />
<Content Include="bin\Release\Model.dll" />
<Content Include="bin\Release\Model.pdb" />
<Content Include="bin\Release\Newtonsoft.Json.dll" />
<Content Include="bin\Release\Newtonsoft.Json.pdb" />
<Content Include="bin\Release\Newtonsoft.Json.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View File

@ -76,6 +76,16 @@
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">
<Project>{bbc7282a-9e2b-4bd6-9c6d-333cefc6f332}</Project>
<Name>BLL</Name>
</ProjectReference>
<ProjectReference Include="..\Model\Model.csproj">
<Project>{fd1e1931-1688-4b4a-bcd6-335a81465343}</Project>
<Name>Model</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />