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

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -89,6 +89,10 @@
       <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -249,6 +253,7 @@
     <Content Include="BaseInfo\WorkPost.aspx" />
     <Content Include="BaseInfo\WorkStage.aspx" />
     <Content Include="BoSheng\BoExam.aspx" />
+    <Content Include="BoSheng\BoPersonEdit.aspx" />
     <Content Include="BoSheng\BoPersonTrainRecord.aspx" />
     <Content Include="BoSheng\BoTrainPerson.aspx" />
     <Content Include="BoSheng\BoTrain.aspx" />
@@ -564,6 +569,16 @@
     <Content Include="CQMS\ProcessControl\ShowUnitWork.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagement.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagementEdit.aspx" />
+    <Content Include="CQMS\QualityPlanning\ConExperienceSummary.aspx" />
+    <Content Include="CQMS\QualityPlanning\ConExperienceSummaryDataIn.aspx" />
+    <Content Include="CQMS\QualityPlanning\ConExperienceSummaryEdit.aspx" />
+    <Content Include="CQMS\QualityPlanning\Organizational.aspx" />
+    <Content Include="CQMS\QualityPlanning\ProjectQualityPlan.aspx" />
+    <Content Include="CQMS\QualityPlanning\ProjectQualityPlanDataIn.aspx" />
+    <Content Include="CQMS\QualityPlanning\ProjectQualityPlanEdit.aspx" />
+    <Content Include="CQMS\QualityPlanning\QualityManagementSys.aspx" />
+    <Content Include="CQMS\QualityPlanning\QualityManagementSysDataIn.aspx" />
+    <Content Include="CQMS\QualityPlanning\QualityManagementSysEdit.aspx" />
     <Content Include="CQMS\Solution\ConstructSolution.aspx" />
     <Content Include="CQMS\Solution\ConstructSolutionView.aspx" />
     <Content Include="CQMS\Solution\EditConstructSolution.aspx" />
@@ -581,6 +596,8 @@
     <Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
     <Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
     <Content Include="CQMS\WBS\ControlPoint.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionSubProjects.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx" />
     <Content Include="CQMS\WBS\Control\PointCropping.aspx" />
     <Content Include="CQMS\WBS\Control\PointCroppingEdit.aspx" />
     <Content Include="CQMS\WBS\EditBreakdown.aspx" />
@@ -1712,6 +1729,33 @@
     <Content Include="res\assets\js\swiper.min.js" />
     <Content Include="res\assets\js\video-7.15.0.min.js" />
     <Content Include="res\assets\js\world.js" />
+    <Content Include="res\css\company.css" />
+    <Content Include="res\css\swiper.min.css" />
+    <Content Include="res\images\01.png" />
+    <Content Include="res\images\02.png" />
+    <Content Include="res\images\03.png" />
+    <Content Include="res\images\04.png" />
+    <Content Include="res\images\05.png" />
+    <Content Include="res\images\06.png" />
+    <Content Include="res\images\06zbj.png" />
+    <Content Include="res\images\07.png" />
+    <Content Include="res\images\08.png" />
+    <Content Include="res\images\09.png" />
+    <Content Include="res\images\10.png" />
+    <Content Include="res\images\11.png" />
+    <Content Include="res\images\12.png" />
+    <Content Include="res\images\13.png" />
+    <Content Include="res\images\14.png" />
+    <Content Include="res\images\15.png" />
+    <Content Include="res\images\16.png" />
+    <Content Include="res\images\17.png" />
+    <Content Include="res\images\18.png" />
+    <Content Include="res\images\19.png" />
+    <Content Include="res\images\20.png" />
+    <Content Include="res\images\bj.jpg" />
+    <Content Include="res\images\Organizational.png" />
+    <Content Include="res\images\SubOrganizational.png" />
+    <Content Include="res\images\zg05.png" />
     <Content Include="res\index\images\logocenter.png" />
     <Content Include="res\js\swiper-bundle.min.css" />
     <Content Include="res\js\swiper-bundle.min.js" />
@@ -1719,6 +1763,11 @@
     <Content Include="res\js\swiper.js" />
     <Content Include="res\js\swiper.min.css" />
     <Content Include="res\js\swiper.min.js" />
+    <Content Include="res\lib\china.js" />
+    <Content Include="res\lib\echarts.min.js" />
+    <Content Include="res\lib\flex.js" />
+    <Content Include="res\lib\jquery.js" />
+    <Content Include="res\lib\swiper.min.js" />
     <Content Include="res\liveplayer\liveplayer-element.min.js" />
     <Content Include="res\liveplayer\liveplayer.swf" />
     <Content Include="SHIYE\InformationProject\SafetyBriefing.aspx" />
@@ -2987,6 +3036,9 @@
     <Content Include="res\assets\iconfont\iconfont.ttf" />
     <Content Include="res\assets\iconfont\iconfont.woff" />
     <Content Include="res\assets\iconfont\iconfont.woff2" />
+    <Content Include="res\font\iconfont.ttf" />
+    <Content Include="res\font\iconfont.woff" />
+    <Content Include="res\font\iconfont.woff2" />
     <None Include="res\icon\Thumbs.db" />
     <None Include="res\images\16\Thumbs.db" />
     <None Include="res\images\fa_png\Thumbs.db" />
@@ -6645,6 +6697,13 @@
     <Compile Include="BoSheng\BoExam.aspx.designer.cs">
       <DependentUpon>BoExam.aspx</DependentUpon>
     </Compile>
+    <Compile Include="BoSheng\BoPersonEdit.aspx.cs">
+      <DependentUpon>BoPersonEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BoSheng\BoPersonEdit.aspx.designer.cs">
+      <DependentUpon>BoPersonEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="BoSheng\BoPersonTrainRecord.aspx.cs">
       <DependentUpon>BoPersonTrainRecord.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8353,6 +8412,76 @@
     <Compile Include="CQMS\ProcessControl\TestPackageManagementEdit.aspx.designer.cs">
       <DependentUpon>TestPackageManagementEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\QualityPlanning\ConExperienceSummary.aspx.cs">
+      <DependentUpon>ConExperienceSummary.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ConExperienceSummary.aspx.designer.cs">
+      <DependentUpon>ConExperienceSummary.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ConExperienceSummaryDataIn.aspx.cs">
+      <DependentUpon>ConExperienceSummaryDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ConExperienceSummaryDataIn.aspx.designer.cs">
+      <DependentUpon>ConExperienceSummaryDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ConExperienceSummaryEdit.aspx.cs">
+      <DependentUpon>ConExperienceSummaryEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ConExperienceSummaryEdit.aspx.designer.cs">
+      <DependentUpon>ConExperienceSummaryEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\Organizational.aspx.cs">
+      <DependentUpon>Organizational.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\Organizational.aspx.designer.cs">
+      <DependentUpon>Organizational.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ProjectQualityPlan.aspx.cs">
+      <DependentUpon>ProjectQualityPlan.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ProjectQualityPlan.aspx.designer.cs">
+      <DependentUpon>ProjectQualityPlan.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ProjectQualityPlanDataIn.aspx.cs">
+      <DependentUpon>ProjectQualityPlanDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ProjectQualityPlanDataIn.aspx.designer.cs">
+      <DependentUpon>ProjectQualityPlanDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ProjectQualityPlanEdit.aspx.cs">
+      <DependentUpon>ProjectQualityPlanEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\ProjectQualityPlanEdit.aspx.designer.cs">
+      <DependentUpon>ProjectQualityPlanEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\QualityManagementSys.aspx.cs">
+      <DependentUpon>QualityManagementSys.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\QualityManagementSys.aspx.designer.cs">
+      <DependentUpon>QualityManagementSys.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\QualityManagementSysDataIn.aspx.cs">
+      <DependentUpon>QualityManagementSysDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\QualityManagementSysDataIn.aspx.designer.cs">
+      <DependentUpon>QualityManagementSysDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\QualityManagementSysEdit.aspx.cs">
+      <DependentUpon>QualityManagementSysEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\QualityPlanning\QualityManagementSysEdit.aspx.designer.cs">
+      <DependentUpon>QualityManagementSysEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\Solution\ConstructSolution.aspx.cs">
       <DependentUpon>ConstructSolution.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8472,6 +8601,20 @@
     <Compile Include="CQMS\WBS\ControlPoint.aspx.designer.cs">
       <DependentUpon>ControlPoint.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.cs">
+      <DependentUpon>DivisionSubProjects.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.designer.cs">
+      <DependentUpon>DivisionSubProjects.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx.cs">
+      <DependentUpon>DivisionSubProjectsEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx.designer.cs">
+      <DependentUpon>DivisionSubProjectsEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\WBS\Control\PointCropping.aspx.cs">
       <DependentUpon>PointCropping.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>