Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

DataBase/版本日志/SGGLDB_WH_2023-04-24.sql

@@ -23,6 +23,6 @@ GO
 alter table WBS_Division add SubItemType char(1) null
 alter table WBS_Breakdown add CheckAcceptType char(1) null
 GO
-insert into WBS_Division select * from CNCEC_SUBQHSEDB..WBS_Division
+insert into WBS_Division select * from WBS_Division
-insert into WBS_Breakdown select * from CNCEC_SUBQHSEDB..WBS_Breakdown
+insert into WBS_Breakdown select * from WBS_Breakdown
 GO

SGGL/BLL/BLL.csproj

@@ -52,7 +52,7 @@
     <Reference Include="EmitMapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll</HintPath>
     </Reference>
-    <Reference Include="FineUIPro, Version=3.1.0.2, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
+    <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
     </Reference>

SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs

@@ -7,6 +7,8 @@ namespace BLL
 {
     public static class WorkloadStatisticsService
     {
+        public static Model.SGGLDB db = Funs.DB;
+
         /// <summary>
         /// 获取模拟树表格
         /// </summary> 
@@ -2554,6 +2556,19 @@ namespace BLL
             }
         }
 
+        private static IQueryable<Model.WBS_CostControl> getCostControls = from x in db.WBS_CostControl select x;
+        private static IQueryable<Model.View_WBS_CostControlDetail> getDetails = from x in db.View_WBS_CostControlDetail select x;
+        private static IQueryable<Model.View_WBS_CostControlParentDetail> getParentDetails = from x in db.View_WBS_CostControlParentDetail select x;
+        private static IQueryable<Model.Wbs_WbsSet> getWbsSets = from x in db.Wbs_WbsSet select x;
+        private static IQueryable<Model.WBS_WbsSetInit> getWbsSetInits = from x in db.WBS_WbsSetInit select x;
+        private static IQueryable<Model.Wbs_UnitProject> getUnitProjects = from x in db.Wbs_UnitProject select x;
+        private static IQueryable<Model.Wbs_UnitProjectInit> getUnitProjectInits = from x in db.Wbs_UnitProjectInit select x;
+        private static IQueryable<Model.WBS_CnProfession> getCnProfessions = from x in db.WBS_CnProfession select x;
+        private static IQueryable<Model.WBS_CnProfessionInit> getCnProfessionInits = from x in db.WBS_CnProfessionInit select x;
+        private static IQueryable<Model.Project_Installation> getInstallations = from x in db.Project_Installation select x;
+        private static IQueryable<Model.View_WBS_CostControlDetailStatistics> getCostControlDetailStatisticss = from x in db.View_WBS_CostControlDetailStatistics select x;
+
+
         /// <summary>
         /// 获取模拟树表格
         /// </summary>
@@ -2598,18 +2613,20 @@ namespace BLL
                     table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String)));
                 }
                 table.Columns.Add(new DataColumn("ShowId", typeof(String)));
-                Model.SGGLDB db = Funs.DB;
+
-                var costControls = from x in db.WBS_CostControl where x.ProjectId == projectId select x;
+                var costControls = getCostControls.Where(x => x.ProjectId == projectId);
-                var details = from x in db.View_WBS_CostControlDetail where x.ProjectId == projectId select x;
+                var details = getDetails.Where(x => x.ProjectId == projectId);
-                var parentDetails = from x in db.View_WBS_CostControlParentDetail select x;
+                var parentDetails = getParentDetails;
-                var wbsSets = from x in db.Wbs_WbsSet where x.ProjectId == projectId select x;
+                var wbsSets = getWbsSets.Where(x => x.ProjectId == projectId);
-                var wbsSetInits = from x in db.WBS_WbsSetInit select x;
+                var wbsSetInits = getWbsSetInits;
-                var unitProjects = from x in db.Wbs_UnitProject where x.ProjectId == projectId select x;
+
-                var unitProjectInits = from x in db.Wbs_UnitProjectInit select x;
+                var unitProjects = getUnitProjects.Where(x => x.ProjectId == projectId);
-                var cnProfessions = from x in db.WBS_CnProfession where x.ProjectId == projectId select x;
+                var unitProjectInits = getUnitProjectInits;
-                var cnProfessionInits = from x in db.WBS_CnProfessionInit select x;
+                var cnProfessions = getCnProfessions.Where(x => x.ProjectId == projectId);
-                var installations = from x in db.Project_Installation where x.ProjectId == projectId select x;
+                var cnProfessionInits = getCnProfessionInits;
-                CostControlDetailStatisticsList = (from x in db.View_WBS_CostControlDetailStatistics where x.ProjectId == projectId select x).Distinct().ToList();
+                var installations = getInstallations.Where(x => x.ProjectId == projectId);
+
+                CostControlDetailStatisticsList = getCostControlDetailStatisticss.Where(x=> x.ProjectId == projectId).Distinct().ToList();
                 List<Model.View_WBS_CostControlDetailStatistics> newList = new List<Model.View_WBS_CostControlDetailStatistics>();
                 var installationList = CostControlDetailStatisticsList.Where(x => x.WBSType == "Installation" && x.SupId == "0");
                 foreach (var item in installationList)

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -16240,7 +16240,7 @@
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>
           </DevelopmentServerVPath>
-          <IISUrl>http://localhost:3345/</IISUrl>
+          <IISUrl>http://localhost:9733/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInput.aspx

@@ -136,7 +136,7 @@
             Width="1400px" Height="650px">
         </f:Window>
         <f:Window ID="Window2" Title="项目情况" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+            Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Maximized="true"
             Width="1400px" Height="650px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs

@@ -1,15 +1,10 @@
-using System;
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.OleDb;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.UI;
 using System.Web.UI.WebControls;
-using BLL;
-using Newtonsoft.Json.Linq;
 
 namespace FineUIPro.Web.JDGL.WBS
 {

SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.cs

@@ -1,10 +1,6 @@
 using BLL;
-using Microsoft.Office.Interop.Excel;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
 using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.ZHGL.Environmental

SGGL/FineUIPro.Web/indexProject.aspx

@@ -62,6 +62,10 @@
             background-color: transparent;
         }
 
+        .f-widget-content {
+            background-color: transparent;
+        }
+
         .header .layui-nav {
             padding: 0;
             margin: 0;
@@ -166,6 +170,7 @@
         .login-icon {
 
         }
+
     </style>
 </head>
 <body class="wrap" onresize="myFunction()">