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

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
@@ -65,7 +65,7 @@
   <ItemGroup>
     <Reference Include="Apache.NMS, Version=1.8.0.0, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\DepCode\reference-bll\Reference BLL\Apache.NMS.dll</HintPath>
+      <HintPath>bin\Apache.NMS.dll</HintPath>
     </Reference>
     <Reference Include="Apache.NMS.ActiveMQ, Version=1.7.2.4108, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
       <HintPath>..\packages\Apache.NMS.ActiveMQ.1.7.2\lib\net40\Apache.NMS.ActiveMQ.dll</HintPath>
@@ -100,11 +100,12 @@
       <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 Include="Microsoft.QualityTools.Testing.Fakes">
+      <HintPath>..\FineUIPro\Reference BLL\Microsoft.QualityTools.Testing.Fakes.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@@ -207,6 +208,7 @@
     <Content Include="AttachFile\lib\popcorn.subtitle.js" />
     <Content Include="AttachFile\Look.aspx" />
     <Content Include="AttachFile\OnlineEditing.aspx" />
+    <Content Include="AttachFile\OnlineEditingPrivate.aspx" />
     <Content Include="AttachFile\player.aspx" />
     <Content Include="AttachFile\res\webuploader\Uploader.swf" />
     <Content Include="AttachFile\res\webuploader\webuploader.nolog.js" />
@@ -603,8 +605,13 @@
     <Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
     <Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
     <Content Include="CQMS\WBS\ControlPoint.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideAndCropDataIn.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideList.aspx" />
     <Content Include="CQMS\WBS\Control\DivisionSubProjects.aspx" />
     <Content Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionSubProjectsNew.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionSubProjectsNewEdit.aspx" />
     <Content Include="CQMS\WBS\Control\PointCropping.aspx" />
     <Content Include="CQMS\WBS\Control\PointCroppingEdit.aspx" />
     <Content Include="CQMS\WBS\EditBreakdown.aspx" />
@@ -1388,7 +1395,6 @@
     <Content Include="Images\SUBimages\CHENGDA.gif" />
     <Content Include="Images\SUBimages\CNCEC.png" />
     <Content Include="Images\SUBimages\CNCEC16.gif" />
-    <Content Include="Images\SUBimages\CWCEC.gif" />
     <Content Include="Images\SUBimages\ECEC.gif" />
     <Content Include="Images\SUBimages\ENN.gif" />
     <Content Include="Images\SUBimages\FCC.gif" />
@@ -1446,6 +1452,7 @@
     <Content Include="JDGL\CostAnalysis\JDReport.aspx" />
     <Content Include="JDGL\CostAnalysis\PlanAdjust.aspx" />
     <Content Include="JDGL\CostAnalysis\RectificationMeasureSet.aspx" />
+    <Content Include="JDGL\Progress\WbsManager.aspx" />
     <Content Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx" />
     <Content Include="JDGL\WBSCompleteAndReal\WBSReport.aspx" />
     <Content Include="JDGL\WBSPlan\SeeDetailHistory.aspx" />
@@ -1598,6 +1605,7 @@
     <Content Include="ProjectData\ProjectUnitSelect.aspx" />
     <Content Include="ProjectData\ProjectUnitView.aspx" />
     <Content Include="ProjectData\ProjectUser.aspx" />
+    <Content Include="ProjectData\ProjectUserContact.aspx" />
     <Content Include="ProjectData\ProjectUserSave.aspx" />
     <Content Include="ProjectData\ProjectUserSelect.aspx" />
     <Content Include="ProjectData\ProjectUserView.aspx" />
@@ -2156,6 +2164,8 @@
     <Content Include="ZHGL\InformationProject\PictureView.aspx" />
     <Content Include="ZHGL\Information\AccidentCauseReport.aspx" />
     <Content Include="ZHGL\Information\AccidentCauseReportSave.aspx" />
+    <Content Include="ZHGL\Information\ActionWorkLedger.aspx" />
+    <Content Include="ZHGL\Information\ActionWorkLedgerAdd.aspx" />
     <Content Include="ZHGL\Information\AnalyseHiddenDanger.aspx" />
     <Content Include="ZHGL\Information\AnalyseResource.aspx" />
     <Content Include="ZHGL\Information\AnalyseSafeAccident.aspx" />
@@ -2176,6 +2186,8 @@
     <Content Include="ZHGL\Information\ReportSubmit.aspx" />
     <Content Include="ZHGL\Information\SafetyBriefing.aspx" />
     <Content Include="ZHGL\Information\SafetyBriefingEdit.aspx" />
+    <Content Include="ZHGL\Information\SafetyProductionEvaluation.aspx" />
+    <Content Include="ZHGL\Information\SafetyProductionEvaluationAdd.aspx" />
     <Content Include="ZHGL\Information\SafetyQuarterlyReport.aspx" />
     <Content Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx" />
     <Content Include="ZHGL\Information\WorkSummaryReport.aspx" />
@@ -2280,8 +2292,6 @@
     <Content Include="HSSE\Doc\用户权限怎么设置.doc" />
     <Content Include="HSSE\Doc\隐患整改单操作说明.doc" />
     <Content Include="HJGL\WeldingManage\GetWdldingDailyItem.ashx" />
-    <Content Include="File\Word\Person\~%24经理工作任务书.doc" />
-    <Content Include="File\Word\Person\~WRL0001.tmp" />
     <Content Include="File\Word\Person\安全专业工程师工作任务书.doc" />
     <Content Include="File\Word\Person\安全经理工作任务书.doc" />
     <Content Include="File\Word\Person\施工专业工程师工作任务书.doc" />
@@ -2338,7 +2348,6 @@
     <Content Include="ReportPrint\ReportTabFile\项目现场职工伤亡事故原因分析报.tab" />
     <Content Include="ReportPrint\ReportTabFile\职业健康安全危险源辨识与评价.tab" />
     <Content Include="ReportPrint\ReportTabFile\职业健康安全危险源辨识与评价（重大危险源）.tab" />
-    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Personal\RunLog.aspx" />
     <Content Include="Personal\PersonalSet.aspx" />
     <Content Include="Personal\PersonalInfo.aspx" />
@@ -2394,7 +2403,6 @@
     <Content Include="Controls\My97DatePicker\开发包\skin\whyGreen\datepicker.css" />
     <Content Include="Controls\My97DatePicker\开发包\skin\whyGreen\img.gif" />
     <Content Include="Downloads\chinaexcelweb.cab" />
-    <Content Include="ErrLog.txt" />
     <Content Include="favicon.ico" />
     <Content Include="App_Themes\Default\Default.css" />
     <Content Include="aspnet_client\FreeTextBox\FTB-FreeTextBox.js" />
@@ -3056,7 +3064,6 @@
     <None Include="Controls\My97DatePicker\开发包\skin\whyGreen\vssver.scc" />
     <None Include="Controls\My97DatePicker\开发包\vssver.scc" />
     <None Include="File\Excel\Person\人员信息模版.xls" />
-    <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
     <None Include="ReportPrint\ReportTabFile\培训记录.tab" />
     <None Include="ReportPrint\ReportTabFile\安全生产数据季报.tab" />
     <None Include="ReportPrint\ReportTabFile\应急演练工作计划半年报.tab" />
@@ -6383,6 +6390,13 @@
     <Compile Include="AttachFile\OnlineEditing.aspx.designer.cs">
       <DependentUpon>OnlineEditing.aspx</DependentUpon>
     </Compile>
+    <Compile Include="AttachFile\OnlineEditingPrivate.aspx.cs">
+      <DependentUpon>OnlineEditingPrivate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="AttachFile\OnlineEditingPrivate.aspx.designer.cs">
+      <DependentUpon>OnlineEditingPrivate.aspx</DependentUpon>
+    </Compile>
     <Compile Include="AttachFile\player.aspx.cs">
       <DependentUpon>player.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8637,6 +8651,27 @@
     <Compile Include="CQMS\WBS\ControlPoint.aspx.designer.cs">
       <DependentUpon>ControlPoint.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx.cs">
+      <DependentUpon>DivisionDivideAndCrop.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx.designer.cs">
+      <DependentUpon>DivisionDivideAndCrop.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCropDataIn.aspx.cs">
+      <DependentUpon>DivisionDivideAndCropDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCropDataIn.aspx.designer.cs">
+      <DependentUpon>DivisionDivideAndCropDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideList.aspx.cs">
+      <DependentUpon>DivisionDivideList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideList.aspx.designer.cs">
+      <DependentUpon>DivisionDivideList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.cs">
       <DependentUpon>DivisionSubProjects.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8651,6 +8686,20 @@
     <Compile Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx.designer.cs">
       <DependentUpon>DivisionSubProjectsEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNew.aspx.cs">
+      <DependentUpon>DivisionSubProjectsNew.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNew.aspx.designer.cs">
+      <DependentUpon>DivisionSubProjectsNew.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNewEdit.aspx.cs">
+      <DependentUpon>DivisionSubProjectsNewEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNewEdit.aspx.designer.cs">
+      <DependentUpon>DivisionSubProjectsNewEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\WBS\Control\PointCropping.aspx.cs">
       <DependentUpon>PointCropping.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -14240,6 +14289,13 @@
     <Compile Include="JDGL\CostAnalysis\RectificationMeasureSet.aspx.designer.cs">
       <DependentUpon>RectificationMeasureSet.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JDGL\Progress\WbsManager.aspx.cs">
+      <DependentUpon>WbsManager.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\Progress\WbsManager.aspx.designer.cs">
+      <DependentUpon>WbsManager.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx.cs">
       <DependentUpon>WBSCompleteAudit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15304,6 +15360,13 @@
     <Compile Include="ProjectData\ProjectUser.aspx.designer.cs">
       <DependentUpon>ProjectUser.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ProjectData\ProjectUserContact.aspx.cs">
+      <DependentUpon>ProjectUserContact.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ProjectData\ProjectUserContact.aspx.designer.cs">
+      <DependentUpon>ProjectUserContact.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ProjectData\ProjectUserSave.aspx.cs">
       <DependentUpon>ProjectUserSave.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -18552,6 +18615,20 @@
     <Compile Include="ZHGL\Information\AccidentCauseReportSave.aspx.designer.cs">
       <DependentUpon>AccidentCauseReportSave.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedger.aspx.cs">
+      <DependentUpon>ActionWorkLedger.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedger.aspx.designer.cs">
+      <DependentUpon>ActionWorkLedger.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedgerAdd.aspx.cs">
+      <DependentUpon>ActionWorkLedgerAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedgerAdd.aspx.designer.cs">
+      <DependentUpon>ActionWorkLedgerAdd.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\Information\AnalyseHiddenDanger.aspx.cs">
       <DependentUpon>AnalyseHiddenDanger.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -18692,6 +18769,20 @@
     <Compile Include="ZHGL\Information\SafetyBriefingEdit.aspx.designer.cs">
       <DependentUpon>SafetyBriefingEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluation.aspx.cs">
+      <DependentUpon>SafetyProductionEvaluation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluation.aspx.designer.cs">
+      <DependentUpon>SafetyProductionEvaluation.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluationAdd.aspx.cs">
+      <DependentUpon>SafetyProductionEvaluationAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluationAdd.aspx.designer.cs">
+      <DependentUpon>SafetyProductionEvaluationAdd.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\Information\SafetyQuarterlyReport.aspx.cs">
       <DependentUpon>SafetyQuarterlyReport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19169,9 +19260,6 @@
       <DependentUpon>TestRunPerformanceStandardEdit.aspx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Themes\Web.config" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Themes\Default\Images\" />
     <Folder Include="FileUpload\" />
@@ -19179,6 +19267,7 @@
     <Folder Include="Images\charts_1\" />
     <Folder Include="Images\charts_2\" />
     <Folder Include="Images\charts_3\" />
+    <Folder Include="Properties\PublishProfiles\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BLL\BLL.csproj">