lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
潘鸿锋
2024-07-26 09:38:35 +08:00
parent 47e63fb706 724edd0121
commit 2c1cd6b767
5 changed files with 146 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+2 -28
View File
@@ -2021,9 +2021,6 @@
<Content Include="Transfer\Chart\Instrumentation.aspx" />
<Content Include="Transfer\Chart\PunchlistFrom.aspx" />
<Content Include="Transfer\Chart\PunchlistFromChart.aspx" />
<Content Include="Transfer\Chart\PunchlistFromChartNew.aspx" />
<Content Include="Transfer\Chart\PunchlistFromProgress.aspx" />
<Content Include="Transfer\Chart\PunchlistFromSort.aspx" />
<Content Include="Transfer\Chart\TransferChart.aspx" />
<Content Include="Transfer\CivilStructure.aspx" />
<Content Include="Transfer\CivilStructureDataIn.aspx" />
@@ -17590,27 +17587,6 @@
<Compile Include="Transfer\Chart\PunchlistFromChart.aspx.designer.cs">
<DependentUpon>PunchlistFromChart.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.cs">
<DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.designer.cs">
<DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.cs">
<DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.designer.cs">
<DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromSort.aspx.cs">
<DependentUpon>PunchlistFromSort.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromSort.aspx.designer.cs">
<DependentUpon>PunchlistFromSort.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\TransferChart.aspx.cs">
<DependentUpon>TransferChart.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -19096,10 +19072,8 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<!--<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
To modify your build process, add your task inside one of the targets below and uncomment it.
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- 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.
<Target Name="BeforeBuild">
</Target>
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />
SGGL/FineUIPro.Web/Web.config
+1 -1
View File
@@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" 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"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1"/>
<compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>