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 
# Conflicts:
#	SGGL/FineUIPro.Web/Web.config
#	SGGL/FineUIPro.Web/common/Menu_JDGL.xml
This commit is contained in:
汪青
2024-05-14 23:28:44 +08:00
parent 8c6b348597 1dde5b74dc
commit 2cf45527a1
119 changed files with 4257 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+40
View File
@@ -1381,6 +1381,9 @@
<Content Include="JDGL\Check\MeterCompletionEdit.aspx" />
<Content Include="JDGL\Check\MeterCompletionIn.aspx" />
<Content Include="JDGL\Check\MonthPlan.aspx" />
<Content Include="JDGL\Check\MonthPlanEdit.aspx" />
<Content Include="JDGL\Check\MonthPlanIn.aspx" />
<Content Include="JDGL\Check\MonthPlanStatisc.aspx" />
<Content Include="JDGL\Check\PipelineCompletion.aspx" />
<Content Include="JDGL\Check\PipelineCompletionEdit.aspx" />
<Content Include="JDGL\Check\PipelineCompletionIn.aspx" />
@@ -1402,6 +1405,8 @@
<Content Include="JDGL\Check\UndergroundPipeCompletion.aspx" />
<Content Include="JDGL\Check\UndergroundPipeCompletionEdit.aspx" />
<Content Include="JDGL\Check\UndergroundPipeCompletionIn.aspx" />
<Content Include="JDGL\Check\WeekPlan.aspx" />
<Content Include="JDGL\Check\WeekPlanIn.aspx" />
<Content Include="JDGL\CostAnalysis\EarnedValueCurve.aspx" />
<Content Include="JDGL\CostAnalysis\JDReport.aspx" />
<Content Include="JDGL\CostAnalysis\PlanAdjust.aspx" />
@@ -13767,6 +13772,27 @@
<Compile Include="JDGL\Check\MonthPlan.aspx.designer.cs">
<DependentUpon>MonthPlan.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\MonthPlanEdit.aspx.cs">
<DependentUpon>MonthPlanEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="JDGL\Check\MonthPlanEdit.aspx.designer.cs">
<DependentUpon>MonthPlanEdit.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\MonthPlanIn.aspx.cs">
<DependentUpon>MonthPlanIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="JDGL\Check\MonthPlanIn.aspx.designer.cs">
<DependentUpon>MonthPlanIn.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\MonthPlanStatisc.aspx.cs">
<DependentUpon>MonthPlanStatisc.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="JDGL\Check\MonthPlanStatisc.aspx.designer.cs">
<DependentUpon>MonthPlanStatisc.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\PipelineCompletion.aspx.cs">
<DependentUpon>PipelineCompletion.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -13914,6 +13940,20 @@
<Compile Include="JDGL\Check\UndergroundPipeCompletionIn.aspx.designer.cs">
<DependentUpon>UndergroundPipeCompletionIn.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\WeekPlan.aspx.cs">
<DependentUpon>WeekPlan.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="JDGL\Check\WeekPlan.aspx.designer.cs">
<DependentUpon>WeekPlan.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\Check\WeekPlanIn.aspx.cs">
<DependentUpon>WeekPlanIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="JDGL\Check\WeekPlanIn.aspx.designer.cs">
<DependentUpon>WeekPlanIn.aspx</DependentUpon>
</Compile>
<Compile Include="JDGL\CostAnalysis\EarnedValueCurve.aspx.cs">
<DependentUpon>EarnedValueCurve.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>