校正人工时及统计修改

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

@@ -0,0 +1,2 @@
+update Inspection_SummaryMb set MenuP='WBS裁剪',MenuC='WBS裁剪' WHERE MenuP='WBS数据'
+GO

SGGL/BLL/OpenService/GetDataService.cs

@@ -272,8 +272,8 @@ namespace BLL
             {
                 try
                 {
-                    DateTime dateS = DateTime.Now.AddMonths(-6);
+                    DateTime dateS = DateTime.Now.AddMonths(-12);
-                    dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-6).Year + "-" + DateTime.Now.AddMonths(-6).Month + "-01");
+                    dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-12).Year + "-" + DateTime.Now.AddMonths(-12).Month + "-01");
                     var getNums = from x in db.SitePerson_PersonInOutNumber
                                   where x.ProjectId == projectId  && x.InOutDate >= dateS
                                   orderby x.InOutDate

SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx

@@ -18,7 +18,7 @@
                     ClicksToEdit="2" DataIDField="InspectionSummaryId" AllowSorting="true" SortField="SortId"
                     SortDirection="DESC" EnableColumnLines="true"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10"   IsFluid="true"
-                    EnableRowDoubleClickEvent="true">
+                    EnableRowDoubleClickEvent="true" AllowColumnLocking="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
@@ -49,14 +49,14 @@
                     </Toolbars>
                     <Columns>
                         <f:RenderField Width="100px" ColumnID="SNumber" DataField="SNumber" SortField="SNumber"
-                            FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center" ID="SNumber" ShowToolTip="true">
+                            FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center" ID="SNumber" ShowToolTip="true" Locked="true">
                         </f:RenderField>
 
                         <f:RenderField Width="150px" ColumnID="ModuleName" DataField="ModuleName"
-                            FieldType="String" HeaderText="模块" TextAlign="Left" HeaderTextAlign="Center">
+                            FieldType="String" HeaderText="模块" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
                         </f:RenderField>
 
-                        <f:GroupField Width="200px" HeaderText="功能菜单" TextAlign="Center" >
+                        <f:GroupField Width="200px" HeaderText="功能菜单" TextAlign="Center" Locked="true">
                            <Columns>
                                         <f:BoundField Width="100px"  ColumnID="MenuP" DataField="MenuP" HeaderText="菜单" />
                                         <f:BoundField Width="100px" DataField="MenuC" ColumnID="MenuC" HeaderText="说明" />

SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs

@@ -443,7 +443,14 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
                     model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
                     model.InspectionSummaryId = Guid.NewGuid().ToString();
                     model.InspectionSummaryMbId = "10";
-                    model.SummeryResult = listWbs.Where(x => x.ProjectId == pid).ToList().Count.ToString();
+                    var WbsCount = listWbs.Where(x => x.ProjectId == pid).ToList().Count;
+                    if (WbsCount > 0)
+                    {
+                        model.SummeryResult = "已裁剪";
+                    }
+                    else {
+                        model.SummeryResult = "未裁剪";
+                    }
                     allList.Add(model);
 
                     //综合管理

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -19,6 +19,35 @@
     body.f-body {
     padding: 0px;
 }
+
+      /*头部按钮样式*/
+        .bgbtn_dbsx{
+            display: inline-block;
+            position: absolute;
+            width: 5%;
+            height: 4%;
+            left: 79%;
+            top: 51px;
+            background: green !important;
+            border: none !important;
+            padding: 0 !important;
+        }
+
+        .bgbtn_gjsx{
+            display: inline-block;
+            position: absolute;
+            width: 5%;
+            height: 4%;
+            left: 72%;
+            top: 51px;
+            background: red !important;
+            border: none !important;
+            padding: 0 !important;
+        }
+    .div_border {
+          border: 1px solid #00FFFF;
+    }
+      
 </style>
 <body>
     <form id="form1" runat="server" style="background-color:#000231">
@@ -253,15 +282,15 @@
                     <div class="y_box_label y_image_default">工作台面</div>
                     <div class="y_box_main">
                         <div class="zyp">
-                            <div class="zyp_box">
+                            <div class="zyp_box" style="cursor:pointer;" runat="server" onclick="showGztm(0)" id="div_Gzgjsx">
                                 <div class="zyp_label">关键事项</div>
                                 <div class="zyp_number" id="div_gjsx" runat="server">0</div>
                             </div>
-                            <div class="zyp_box">
+                            <div class="zyp_box div_border" style="cursor:pointer" runat="server" onclick="showGztm(1)" id="div_Gzdbsx">
                                 <div class="zyp_label">待办事项</div>
                                 <div class="zyp_number" id="div_dbsx" runat="server">0</div>
                             </div>
-                            <div class="zyp_box">
+                            <div class="zyp_box" style="cursor:pointer" runat="server" onclick="showGztm(2)" id="div_Gzgrlc">
                                 <div class="zyp_label">个人流程</div>
                                 <div class="zyp_number" id="div_grlc" runat="server">0</div>
                             </div>
@@ -270,7 +299,11 @@
                                 <div class="zyp_number" id="div_ybrw" runat="server">0</div>
                             </div>
                         </div>
-                        <div class="zyp-lis" runat="server" id="div_dbsxlist">
+                        <div class="zyp-lis" id="div_gjsxlist" runat="server"  style="display:none">
+                          
+                        </div>
+
+                         <div class="zyp-lis" id="div_dbsxlist" runat="server">
                           
                         </div>
                     </div>
@@ -358,6 +391,7 @@
 <script src="lib/echarts.min.js"></script>
 
 <script>
+
     function clOnclick(objval) {
         if (objval == 0) {
             $("#span_gdcl").addClass("y_tab-action")
@@ -375,6 +409,34 @@
 </script>
 
 <script>
+    //点击切换台面
+    function showGztm(objval) {
+        //关键事项
+        if (objval == 0) {
+            $("#div_gjsxlist").show();
+            $("#div_dbsxlist").hide();
+
+            document.getElementById("div_Gzgjsx").className += " div_border";
+            $("#div_Gzdbsx").removeClass("div_border");
+            $("#div_Gzgrlc").removeClass("div_border");
+        } else if (objval == 1) {
+            //待办事项
+            $("#div_dbsxlist").show();
+            $("#div_gjsxlist").hide();
+            document.getElementById("div_Gzdbsx").className += " div_border";
+            $("#div_Gzgjsx").removeClass("div_border");
+            $("#div_Gzgrlc").removeClass("div_border");
+
+        } else if (objval == 2) {
+            //个人流程
+            $("#div_dbsxlist").show();
+            $("#div_gjsxlist").hide();
+            document.getElementById("div_Gzgrlc").className += " div_border";
+            $("#div_Gzgjsx").removeClass("div_border");
+            $("#div_Gzdbsx").removeClass("div_border");
+        }
+    }
+
     function reloadGrid(param) {
         __doPostBack(null, 'ReloadGrid$' + param);
     }

SGGL/FineUIPro.Web/common/mainProject2.aspx.cs

@@ -28,6 +28,7 @@ namespace FineUIPro.Web.common
             {
                 ViewState["ProjectId"] = value;
             }
+
         }
         /// <summary>
         /// 页面加载
@@ -115,6 +116,7 @@ namespace FineUIPro.Web.common
                 getProjectSitePerson();
 
                 //工作台面
+                getGjsx();
                 getGztm();
 
                 //材料到货
@@ -455,7 +457,8 @@ namespace FineUIPro.Web.common
         /// 动火作业许可证
         /// </summary>
         /// <returns></returns>
-        protected int getWrokCount0() {
+        protected int getWrokCount0()
+        {
             var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证").ToList().Count;
             return result;
         }
@@ -536,7 +539,8 @@ namespace FineUIPro.Web.common
                 zlgjzgl = zgl.ToString();
                 zggjzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
             }
-            else {
+            else
+            {
                 zlgjzgl = zgl.ToString();
                 zggjzglDataValue = "0";
             }
@@ -799,7 +803,8 @@ namespace FineUIPro.Web.common
         #endregion
 
         #region 作业许可列表
-        protected string getLicenseManager() {
+        protected string getLicenseManager()
+        {
             string returnHtml = "";
             var list = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId).ToList();
             foreach (var item in list)
@@ -818,8 +823,13 @@ namespace FineUIPro.Web.common
         #endregion
 
         #region 工作台面
-        protected void getGztm() {
+
-            div_dbsxlist.InnerHtml = "";
+        protected void getGztm()
+        {
+            //div_dbsxlist.InnerHtml = "";
+            string returnDbHtml = "<div></div>";
+            if (!string.IsNullOrEmpty(ProjectId))
+            {
                 //关键事项
                 string strSql = @"SELECT GJSXID AS DataId
 	                ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
@@ -850,13 +860,67 @@ namespace FineUIPro.Web.common
                 //待办事项、个人流程
                 div_dbsx.InnerHtml = getDataList.Count().ToString();
                 div_grlc.InnerHtml = getDataList.Count().ToString();
-            string returnHtml = "";
                 foreach (var item in getDataList)
                 {
-                returnHtml += "<div class=\"li\" style='cursor:pointer'  onclick=\"returnWindows('" + item.PCUrl + "')\"><span>"+ item.MenuName + "</span><span>" + item.Content+"</span><span>"+
+                    returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\"  onclick=\"returnWindows(\"" + item.PCUrl + "\")\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><span>" +
                         item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
                 }
-            div_dbsxlist.InnerHtml = returnHtml;
+            }
+            else {
+                returnDbHtml = "<div></div>";
+            }
+            this.div_dbsxlist.InnerHtml = returnDbHtml;
+
+
+        }
+       
+        /// <summary>
+        /// 加载关键事项
+        /// </summary>
+        protected void getGjsx()
+        {
+            string returnDbHtml = "<div></div>";
+            ////关键事项
+            if (!string.IsNullOrEmpty(ProjectId))
+            {
+                string strSql = @"SELECT GJSXID AS DataId
+                         ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
+                         ,'关键事项待处理' AS MenuName
+                         ,GJSX.Detail AS Content
+                         ,users.UserId
+                         ,users.UserName
+                         ,GJSX.CreateDate AS DataTime
+                         ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
+                         ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
+                        FROM GJSX 
+                        LEFT JOIN Sys_User AS users ON users.UserId =@userId
+                        WHERE GJSX.ProjectId=@projectId AND 
+                        GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
+                        and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
+                        or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
+                        )";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+
+                listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
+                listStr.Add(new SqlParameter("@projectId", ProjectId));
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                for (int i = 0; i < tb.Rows.Count; i++)
+                {
+                    returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\"  " +
+                        "onclick=\"returnWindows(\"" + tb.Rows[i]["PCUrl"] + "\")\"><span>" + tb.Rows[i]["MenuName"] + "</span><span>" + tb.Rows[i]["Content"] + "</span><span>" +
+                         tb.Rows[i]["DataTime"].ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
+                }
+            }
+            else
+            {
+                returnDbHtml = "<div></div>";
+            }
+            this.div_gjsxlist.InnerHtml = returnDbHtml;
+
+
+
         }
         #endregion
 
@@ -868,6 +932,7 @@ namespace FineUIPro.Web.common
         protected void Window1_Close(object sender, WindowCloseEventArgs e)
         {
             getGztm();
+            getGjsx();
         }
 
 

SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs

@@ -158,6 +158,15 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_sgfaSpl;
 
+        /// <summary>
+        /// div_Gzgjsx 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgjsx;
+
         /// <summary>
         /// div_gjsx 控件。
         /// </summary>
@@ -167,6 +176,15 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsx;
 
+        /// <summary>
+        /// div_Gzdbsx 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzdbsx;
+
         /// <summary>
         /// div_dbsx 控件。
         /// </summary>
@@ -176,6 +194,15 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsx;
 
+        /// <summary>
+        /// div_Gzgrlc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgrlc;
+
         /// <summary>
         /// div_grlc 控件。
         /// </summary>
@@ -194,6 +221,15 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_ybrw;
 
+        /// <summary>
+        /// div_gjsxlist 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsxlist;
+
         /// <summary>
         /// div_dbsxlist 控件。
         /// </summary>