Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
@@ -208,6 +208,8 @@
|
||||
<Content Include="BaseInfo\CNProfessionalView.aspx" />
|
||||
<Content Include="BaseInfo\CompanyModel.aspx" />
|
||||
<Content Include="BaseInfo\CompanyModelEdit.aspx" />
|
||||
<Content Include="BaseInfo\CompanyModelKind.aspx" />
|
||||
<Content Include="BaseInfo\CompanyModelKindEdit.aspx" />
|
||||
<Content Include="BaseInfo\ConstructionTestType.aspx" />
|
||||
<Content Include="BaseInfo\CostType.aspx" />
|
||||
<Content Include="BaseInfo\CQMSTrainObject.aspx" />
|
||||
@@ -1390,6 +1392,21 @@
|
||||
<Content Include="res\indexv1\js\video-7.15.0.min.js" />
|
||||
<Content Include="res\indexv1\js\world.js" />
|
||||
<Content Include="SysManage\OutputValueProject.aspx" />
|
||||
<Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
|
||||
<Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
|
||||
<Content Include="ZHGL\DataIn\AccidentCauseReportImport.aspx" />
|
||||
<Content Include="ZHGL\DataIn\DrillConductedQuarterlyReportBar.aspx" />
|
||||
<Content Include="ZHGL\DataIn\DrillConductedQuarterlyReportBarIn.aspx" />
|
||||
<Content Include="ZHGL\DataIn\DrillConductedQuarterlyReportImport.aspx" />
|
||||
<Content Include="ZHGL\DataIn\DrillPlanHalfYearReportBar.aspx" />
|
||||
<Content Include="ZHGL\DataIn\DrillPlanHalfYearReportBarIn.aspx" />
|
||||
<Content Include="ZHGL\DataIn\DrillPlanHalfYearReportImport.aspx" />
|
||||
<Content Include="ZHGL\DataIn\MillionsMonthlyReportBar.aspx" />
|
||||
<Content Include="ZHGL\DataIn\MillionsMonthlyReportBarIn.aspx" />
|
||||
<Content Include="ZHGL\DataIn\MillionsMonthlyReportImport.aspx" />
|
||||
<Content Include="ZHGL\DataIn\SafetyQuarterlyReportBar.aspx" />
|
||||
<Content Include="ZHGL\DataIn\SafetyQuarterlyReportBarIn.aspx" />
|
||||
<Content Include="ZHGL\DataIn\SafetyQuarterlyReportImport.aspx" />
|
||||
<Content Include="ZHGL\DataSync\CQMSData_CQMS.aspx" />
|
||||
<Content Include="ZHGL\DataSync\CQMSData_CQMSEdit.aspx" />
|
||||
<Content Include="ZHGL\DataSync\HJGLData_HJGL.aspx" />
|
||||
@@ -1406,6 +1423,18 @@
|
||||
<Content Include="ZHGL\DataSync\ProjectDataSync\Project_SYHSEData_SYHSEEdit.aspx" />
|
||||
<Content Include="ZHGL\DataSync\SYHSEData_SYHSE.aspx" />
|
||||
<Content Include="ZHGL\DataSync\SYHSEData_SYHSEEdit.aspx" />
|
||||
<Content Include="ZHGL\Information\AccidentCauseReport.aspx" />
|
||||
<Content Include="ZHGL\Information\AccidentCauseReportSave.aspx" />
|
||||
<Content Include="ZHGL\Information\DrillConductedQuarterlyReport.aspx" />
|
||||
<Content Include="ZHGL\Information\DrillConductedQuarterlyReportAdd.aspx" />
|
||||
<Content Include="ZHGL\Information\DrillPlanHalfYearReport.aspx" />
|
||||
<Content Include="ZHGL\Information\DrillPlanHalfYearReportAdd.aspx" />
|
||||
<Content Include="ZHGL\Information\MillionsMonthlyReport.aspx" />
|
||||
<Content Include="ZHGL\Information\MillionsMonthlyReportSave.aspx" />
|
||||
<Content Include="ZHGL\Information\ReportAuditSee.aspx" />
|
||||
<Content Include="ZHGL\Information\ReportSubmit.aspx" />
|
||||
<Content Include="ZHGL\Information\SafetyQuarterlyReport.aspx" />
|
||||
<Content Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx" />
|
||||
<Content Include="ZHGL\Plan\MainPlan.aspx" />
|
||||
<Content Include="ZHGL\Plan\MainPlanEdit.aspx" />
|
||||
<Content Include="ZHGL\Plan\MainPlanView.aspx" />
|
||||
@@ -5645,6 +5674,20 @@
|
||||
<Compile Include="BaseInfo\CompanyModelEdit.aspx.designer.cs">
|
||||
<DependentUpon>CompanyModelEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="BaseInfo\CompanyModelKind.aspx.cs">
|
||||
<DependentUpon>CompanyModelKind.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BaseInfo\CompanyModelKind.aspx.designer.cs">
|
||||
<DependentUpon>CompanyModelKind.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="BaseInfo\CompanyModelKindEdit.aspx.cs">
|
||||
<DependentUpon>CompanyModelKindEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BaseInfo\CompanyModelKindEdit.aspx.designer.cs">
|
||||
<DependentUpon>CompanyModelKindEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="BaseInfo\ConstructionTestType.aspx.cs">
|
||||
<DependentUpon>ConstructionTestType.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -12327,6 +12370,111 @@
|
||||
<Compile Include="PersonManage\Test\TestRecord.aspx.designer.cs">
|
||||
<DependentUpon>TestRecord.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\AccidentCauseReportBar.aspx.cs">
|
||||
<DependentUpon>AccidentCauseReportBar.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\AccidentCauseReportBar.aspx.designer.cs">
|
||||
<DependentUpon>AccidentCauseReportBar.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx.cs">
|
||||
<DependentUpon>AccidentCauseReportBarIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx.designer.cs">
|
||||
<DependentUpon>AccidentCauseReportBarIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\AccidentCauseReportImport.aspx.cs">
|
||||
<DependentUpon>AccidentCauseReportImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\AccidentCauseReportImport.aspx.designer.cs">
|
||||
<DependentUpon>AccidentCauseReportImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillConductedQuarterlyReportBar.aspx.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportBar.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillConductedQuarterlyReportBar.aspx.designer.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportBar.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillConductedQuarterlyReportBarIn.aspx.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportBarIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillConductedQuarterlyReportBarIn.aspx.designer.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportBarIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillConductedQuarterlyReportImport.aspx.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillConductedQuarterlyReportImport.aspx.designer.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillPlanHalfYearReportBar.aspx.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportBar.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillPlanHalfYearReportBar.aspx.designer.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportBar.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillPlanHalfYearReportBarIn.aspx.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportBarIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillPlanHalfYearReportBarIn.aspx.designer.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportBarIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillPlanHalfYearReportImport.aspx.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\DrillPlanHalfYearReportImport.aspx.designer.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\MillionsMonthlyReportBar.aspx.cs">
|
||||
<DependentUpon>MillionsMonthlyReportBar.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\MillionsMonthlyReportBar.aspx.designer.cs">
|
||||
<DependentUpon>MillionsMonthlyReportBar.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\MillionsMonthlyReportBarIn.aspx.cs">
|
||||
<DependentUpon>MillionsMonthlyReportBarIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\MillionsMonthlyReportBarIn.aspx.designer.cs">
|
||||
<DependentUpon>MillionsMonthlyReportBarIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\MillionsMonthlyReportImport.aspx.cs">
|
||||
<DependentUpon>MillionsMonthlyReportImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\MillionsMonthlyReportImport.aspx.designer.cs">
|
||||
<DependentUpon>MillionsMonthlyReportImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\SafetyQuarterlyReportBar.aspx.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportBar.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\SafetyQuarterlyReportBar.aspx.designer.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportBar.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\SafetyQuarterlyReportBarIn.aspx.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportBarIn.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\SafetyQuarterlyReportBarIn.aspx.designer.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportBarIn.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\SafetyQuarterlyReportImport.aspx.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataIn\SafetyQuarterlyReportImport.aspx.designer.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\DataSync\CQMSData_CQMS.aspx.cs">
|
||||
<DependentUpon>CQMSData_CQMS.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -12439,6 +12587,90 @@
|
||||
<Compile Include="ZHGL\DataSync\SYHSEData_SYHSEEdit.aspx.designer.cs">
|
||||
<DependentUpon>SYHSEData_SYHSEEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\AccidentCauseReport.aspx.cs">
|
||||
<DependentUpon>AccidentCauseReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\AccidentCauseReport.aspx.designer.cs">
|
||||
<DependentUpon>AccidentCauseReport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\AccidentCauseReportSave.aspx.cs">
|
||||
<DependentUpon>AccidentCauseReportSave.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\AccidentCauseReportSave.aspx.designer.cs">
|
||||
<DependentUpon>AccidentCauseReportSave.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillConductedQuarterlyReport.aspx.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillConductedQuarterlyReport.aspx.designer.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillConductedQuarterlyReportAdd.aspx.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportAdd.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillConductedQuarterlyReportAdd.aspx.designer.cs">
|
||||
<DependentUpon>DrillConductedQuarterlyReportAdd.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillPlanHalfYearReport.aspx.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillPlanHalfYearReport.aspx.designer.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillPlanHalfYearReportAdd.aspx.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportAdd.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\DrillPlanHalfYearReportAdd.aspx.designer.cs">
|
||||
<DependentUpon>DrillPlanHalfYearReportAdd.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\MillionsMonthlyReport.aspx.cs">
|
||||
<DependentUpon>MillionsMonthlyReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\MillionsMonthlyReport.aspx.designer.cs">
|
||||
<DependentUpon>MillionsMonthlyReport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\MillionsMonthlyReportSave.aspx.cs">
|
||||
<DependentUpon>MillionsMonthlyReportSave.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\MillionsMonthlyReportSave.aspx.designer.cs">
|
||||
<DependentUpon>MillionsMonthlyReportSave.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\ReportAuditSee.aspx.cs">
|
||||
<DependentUpon>ReportAuditSee.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\ReportAuditSee.aspx.designer.cs">
|
||||
<DependentUpon>ReportAuditSee.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\ReportSubmit.aspx.cs">
|
||||
<DependentUpon>ReportSubmit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\ReportSubmit.aspx.designer.cs">
|
||||
<DependentUpon>ReportSubmit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\SafetyQuarterlyReport.aspx.cs">
|
||||
<DependentUpon>SafetyQuarterlyReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\SafetyQuarterlyReport.aspx.designer.cs">
|
||||
<DependentUpon>SafetyQuarterlyReport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>SafetyQuarterlyReportEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\Plan\MainPlan.aspx.cs">
|
||||
<DependentUpon>MainPlan.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
Reference in New Issue
Block a user