Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
@@ -1824,6 +1824,7 @@
|
||||
<Content Include="TestRun\ProduceTestRun\TestRunRecordEdit.aspx" />
|
||||
<Content Include="TestRun\ProduceTestRun\TestRunReport.aspx" />
|
||||
<Content Include="TestRun\ProduceTestRun\TestRunReportEdit.aspx" />
|
||||
<Content Include="TestRun\Report\FourDecisionSchedule.aspx" />
|
||||
<Content Include="TestRun\Report\PreRunSchedule.aspx" />
|
||||
<Content Include="TestRun\Report\ScheduleSetUp.aspx" />
|
||||
<Content Include="TestRun\Report\TestRunSchedule.aspx" />
|
||||
@@ -2052,6 +2053,8 @@
|
||||
<Content Include="ZHGL\Supervise\SuperviseCheckReport.aspx" />
|
||||
<Content Include="ZHGL\Supervise\SuperviseCheckReportEdit.aspx" />
|
||||
<Content Include="common\font\DIN-Medium.otf" />
|
||||
<Content Include="ZHGL\TestRunPerformance\TestRunPerformanceStandard.aspx" />
|
||||
<Content Include="ZHGL\TestRunPerformance\TestRunPerformanceStandardEdit.aspx" />
|
||||
<None Include="Doc\help1.doc" />
|
||||
<None Include="Doc\危险源因素辨识及评价方法说明.doc" />
|
||||
<None Include="Doc\危险源清单导入说明.doc" />
|
||||
@@ -16305,6 +16308,13 @@
|
||||
<Compile Include="TestRun\ProduceTestRun\TestRunReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>TestRunReportEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Report\FourDecisionSchedule.aspx.cs">
|
||||
<DependentUpon>FourDecisionSchedule.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Report\FourDecisionSchedule.aspx.designer.cs">
|
||||
<DependentUpon>FourDecisionSchedule.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="TestRun\Report\PreRunSchedule.aspx.cs">
|
||||
<DependentUpon>PreRunSchedule.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -17894,6 +17904,20 @@
|
||||
<Compile Include="ZHGL\Supervise\SuperviseCheckReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>SuperviseCheckReportEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceStandard.aspx.cs">
|
||||
<DependentUpon>TestRunPerformanceStandard.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceStandard.aspx.designer.cs">
|
||||
<DependentUpon>TestRunPerformanceStandard.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceStandardEdit.aspx.cs">
|
||||
<DependentUpon>TestRunPerformanceStandardEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\TestRunPerformance\TestRunPerformanceStandardEdit.aspx.designer.cs">
|
||||
<DependentUpon>TestRunPerformanceStandardEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="App_Themes\Web.config" />
|
||||
|
||||
Reference in New Issue
Block a user