升级

2026-03-23 15:22:29 +08:00
parent 94584d242b
commit c38590add8
173 changed files with 19679 additions and 4413 deletions
@@ -275,6 +275,7 @@
    <Content Include="BaseInfo\DesignProfessionalView.aspx" />
    <Content Include="BaseInfo\EmergencyType.aspx" />
    <Content Include="BaseInfo\GoodsCategory.aspx" />
+    <Content Include="BaseInfo\RewardAndPunishManager.aspx" />
    <Content Include="BaseInfo\RiskLevelEdit.aspx" />
    <Content Include="BaseInfo\RiskLevel.aspx" />
    <Content Include="BaseInfo\HazardRegisterTypes.aspx" />
@@ -412,6 +413,8 @@
    <Content Include="CQMS\Comprehensive\ConTechnologyDisclosureDataInNew.aspx" />
    <Content Include="CQMS\Comprehensive\ConTechnologyDisclosureDataInNewEdit.aspx" />
    <Content Include="CQMS\Comprehensive\ConTechnologyDisclosureEdit.aspx" />
+    <Content Include="CQMS\Comprehensive\CqmsPerson.aspx" />
+    <Content Include="CQMS\Comprehensive\CqmsPersonEdit.aspx" />
    <Content Include="CQMS\Comprehensive\DataDistribution.aspx" />
    <Content Include="CQMS\Comprehensive\DataDistributionApprove.aspx" />
    <Content Include="CQMS\Comprehensive\DataDistributionDataIn.aspx" />
@@ -495,6 +498,9 @@
    <Content Include="CQMS\ProcessControl\InspectionManagementStatistics.aspx" />
    <Content Include="CQMS\ProcessControl\InspectionNotice.aspx" />
    <Content Include="CQMS\ProcessControl\InspectionNoticeEdit.aspx" />
+    <Content Include="CQMS\ProcessControl\Meeting.aspx" />
+    <Content Include="CQMS\ProcessControl\MeetingEdit.aspx" />
+    <Content Include="CQMS\ProcessControl\MeetingView.aspx" />
    <Content Include="CQMS\ProcessControl\ShowUnitWork.aspx" />
    <Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx" />
    <Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx" />
@@ -956,6 +962,7 @@
    <Content Include="HSSE\ActionPlan\ProjectManageRuleView.aspx" />
    <Content Include="HSSE\Administrative\CarManager.aspx" />
    <Content Include="HSSE\Administrative\CarManagerEdit.aspx" />
+    <Content Include="HSSE\Administrative\CarManagerIn.aspx" />
    <Content Include="HSSE\Administrative\CarManagerView.aspx" />
    <Content Include="HSSE\Administrative\DriverManager.aspx" />
    <Content Include="HSSE\Administrative\DriverManagerEdit.aspx" />
@@ -2280,6 +2287,7 @@
    <Content Include="ZHGL\Information\DCGLKeyProjectRectificationSituationLedgerSave.aspx" />
    <Content Include="ZHGL\Supervise\SuperviseCheckReportFinalizeEdit.aspx" />
    <Content Include="ZHGL\Supervise\UnitHazardRegister.aspx" />
+    <Content Include="ZHGL\Supervise\UnitHazardRegisterDetailIn.aspx" />
    <Content Include="ZHGL\Supervise\UnitHazardRegisterEdit.aspx" />
    <Content Include="ZHGL\Supervise\UnitHazardRegisterRecord.aspx" />
    <Content Include="ZHGL\Supervise\UnitHazardRegisterRecordEdit.aspx" />
@@ -6817,6 +6825,10 @@
    <Compile Include="BaseInfo\GoodsCategory.aspx.designer.cs">
      <DependentUpon>GoodsCategory.aspx</DependentUpon>
    </Compile>
+    <Compile Include="BaseInfo\RewardAndPunishManager.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\RewardAndPunishManager.aspx.designer.cs" />
    <Compile Include="BaseInfo\RiskLevelEdit.aspx.cs">
      <DependentUpon>RiskLevelEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -7001,8 +7013,11 @@
    </Compile>
    <Compile Include="BaseInfo\WorkPostCleanupMerge.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>WorkPostCleanupMerge.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="BaseInfo\WorkPostCleanupMerge.aspx.designer.cs">
+      <DependentUpon>WorkPostCleanupMerge.aspx</DependentUpon>
    </Compile>
-    <Compile Include="BaseInfo\WorkPostCleanupMerge.aspx.designer.cs" />
    <Compile Include="BaseInfo\WorkStage.aspx.cs">
      <DependentUpon>WorkStage.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -7592,6 +7607,14 @@
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="CQMS\Comprehensive\ConTechnologyDisclosureEdit.aspx.designer.cs" />
+    <Compile Include="CQMS\Comprehensive\CqmsPerson.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\CqmsPerson.aspx.designer.cs" />
+    <Compile Include="CQMS\Comprehensive\CqmsPersonEdit.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\CqmsPersonEdit.aspx.designer.cs" />
    <Compile Include="CQMS\Comprehensive\DataDistribution.aspx.cs">
      <DependentUpon>DataDistribution.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -8152,6 +8175,18 @@
    <Compile Include="CQMS\ProcessControl\InspectionNoticeEdit.aspx.designer.cs">
      <DependentUpon>InspectionNoticeEdit.aspx</DependentUpon>
    </Compile>
+    <Compile Include="CQMS\ProcessControl\Meeting.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\Meeting.aspx.designer.cs" />
+    <Compile Include="CQMS\ProcessControl\MeetingEdit.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\MeetingEdit.aspx.designer.cs" />
+    <Compile Include="CQMS\ProcessControl\MeetingView.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\MeetingView.aspx.designer.cs" />
    <Compile Include="CQMS\ProcessControl\ShowUnitWork.aspx.cs">
      <DependentUpon>ShowUnitWork.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -8177,20 +8212,32 @@
    <Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx.designer.cs" />
    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>QCGroupRegistration.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx.designer.cs">
+      <DependentUpon>QCGroupRegistration.aspx</DependentUpon>
    </Compile>
-    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx.designer.cs" />
    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationEdit.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>QCGroupRegistrationEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationEdit.aspx.designer.cs">
+      <DependentUpon>QCGroupRegistrationEdit.aspx</DependentUpon>
    </Compile>
-    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationEdit.aspx.designer.cs" />
    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationView.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>QCGroupRegistrationView.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationView.aspx.designer.cs">
+      <DependentUpon>QCGroupRegistrationView.aspx</DependentUpon>
    </Compile>
-    <Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationView.aspx.designer.cs" />
    <Compile Include="CQMS\QualityActivity\QCManage\QCStatics.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>QCStatics.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityActivity\QCManage\QCStatics.aspx.designer.cs">
+      <DependentUpon>QCStatics.aspx</DependentUpon>
    </Compile>
-    <Compile Include="CQMS\QualityActivity\QCManage\QCStatics.aspx.designer.cs" />
    <Compile Include="CQMS\Solution\ConstructSolutionFinal.aspx.cs">
      <DependentUpon>ConstructSolutionFinal.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -11196,6 +11243,10 @@
    <Compile Include="HSSE\Administrative\CarManagerEdit.aspx.designer.cs">
      <DependentUpon>CarManagerEdit.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HSSE\Administrative\CarManagerIn.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Administrative\CarManagerIn.aspx.designer.cs" />
    <Compile Include="HSSE\Administrative\CarManagerView.aspx.cs">
      <DependentUpon>CarManagerView.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -11226,8 +11277,11 @@
    </Compile>
    <Compile Include="HSSE\Check\CheckSpecialDetailIn.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>CheckSpecialDetailIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Check\CheckSpecialDetailIn.aspx.designer.cs">
+      <DependentUpon>CheckSpecialDetailIn.aspx</DependentUpon>
    </Compile>
-    <Compile Include="HSSE\Check\CheckSpecialDetailIn.aspx.designer.cs" />
    <Compile Include="HSSE\Check\CheckSpecialRecord.aspx.cs">
      <DependentUpon>CheckSpecialRecord.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -12497,16 +12551,25 @@
    </Compile>
    <Compile Include="HSSE\Solution\TemporaryElectricity.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>TemporaryElectricity.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Solution\TemporaryElectricity.aspx.designer.cs">
+      <DependentUpon>TemporaryElectricity.aspx</DependentUpon>
    </Compile>
-    <Compile Include="HSSE\Solution\TemporaryElectricity.aspx.designer.cs" />
    <Compile Include="HSSE\Solution\TemporaryElectricityEdit.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>TemporaryElectricityEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Solution\TemporaryElectricityEdit.aspx.designer.cs">
+      <DependentUpon>TemporaryElectricityEdit.aspx</DependentUpon>
    </Compile>
-    <Compile Include="HSSE\Solution\TemporaryElectricityEdit.aspx.designer.cs" />
    <Compile Include="HSSE\Solution\TemporaryElectricityView.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>TemporaryElectricityView.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Solution\TemporaryElectricityView.aspx.designer.cs">
+      <DependentUpon>TemporaryElectricityView.aspx</DependentUpon>
    </Compile>
-    <Compile Include="HSSE\Solution\TemporaryElectricityView.aspx.designer.cs" />
    <Compile Include="HSSE\TowerCrane\TowerCrane.aspx.cs">
      <DependentUpon>TowerCrane.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -12572,8 +12635,11 @@
    </Compile>
    <Compile Include="SysManage\UnitCleanupMerge.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UnitCleanupMerge.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="SysManage\UnitCleanupMerge.aspx.designer.cs">
+      <DependentUpon>UnitCleanupMerge.aspx</DependentUpon>
    </Compile>
-    <Compile Include="SysManage\UnitCleanupMerge.aspx.designer.cs" />
    <Compile Include="ThreeYearAction\ConstructionStandardization\BenchmarkWorkSite.aspx.cs">
      <DependentUpon>BenchmarkWorkSite.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -18320,24 +18386,41 @@
    </Compile>
    <Compile Include="ZHGL\Supervise\SuperviseCheckReportFinalizeEdit.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>SuperviseCheckReportFinalizeEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Supervise\SuperviseCheckReportFinalizeEdit.aspx.designer.cs">
+      <DependentUpon>SuperviseCheckReportFinalizeEdit.aspx</DependentUpon>
    </Compile>
-    <Compile Include="ZHGL\Supervise\SuperviseCheckReportFinalizeEdit.aspx.designer.cs" />
    <Compile Include="ZHGL\Supervise\UnitHazardRegister.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UnitHazardRegister.aspx</DependentUpon>
    </Compile>
-    <Compile Include="ZHGL\Supervise\UnitHazardRegister.aspx.designer.cs" />
+    <Compile Include="ZHGL\Supervise\UnitHazardRegister.aspx.designer.cs">
+      <DependentUpon>UnitHazardRegister.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterDetailIn.aspx.cs" />
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterDetailIn.aspx.designer.cs" />
    <Compile Include="ZHGL\Supervise\UnitHazardRegisterEdit.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UnitHazardRegisterEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterEdit.aspx.designer.cs">
+      <DependentUpon>UnitHazardRegisterEdit.aspx</DependentUpon>
    </Compile>
-    <Compile Include="ZHGL\Supervise\UnitHazardRegisterEdit.aspx.designer.cs" />
    <Compile Include="ZHGL\Supervise\UnitHazardRegisterRecord.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UnitHazardRegisterRecord.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterRecord.aspx.designer.cs">
+      <DependentUpon>UnitHazardRegisterRecord.aspx</DependentUpon>
    </Compile>
-    <Compile Include="ZHGL\Supervise\UnitHazardRegisterRecord.aspx.designer.cs" />
    <Compile Include="ZHGL\Supervise\UnitHazardRegisterRecordEdit.aspx.cs">
      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>UnitHazardRegisterRecordEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Supervise\UnitHazardRegisterRecordEdit.aspx.designer.cs">
+      <DependentUpon>UnitHazardRegisterRecordEdit.aspx</DependentUpon>
    </Compile>
-    <Compile Include="ZHGL\Supervise\UnitHazardRegisterRecordEdit.aspx.designer.cs" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="App_Themes\Web.config" />