20230918现场当前人数统计修改

SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs

@@ -250,8 +250,8 @@ namespace BLL
                 {
                     getInMaxs = getInMaxs.Where(x => x.IsIn == true);
                 }
-                inCount = getInMaxs.Count();
+                nowCount = getInMaxs.Count();
-                if (inCount == 0)
+                if (nowCount == 0)
                 {
                     return null;
                 }

SGGL/FineUIPro.Web/ErrLog.txt

@@ -1,69 +0,0 @@
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 BLL.HSEDataDWService.getProjecctSafeHours(String projectId) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\DigData\HSEDataDWService.cs:行号 79
-   在 Read_<>f__AnonymousType92`7(ObjectMaterializer`1 )
-   在 System.Data.Linq.SqlClient.ObjectReaderCompiler.ObjectReader`2.MoveNext()
-   在 (IEnumerator )
-   在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean )
-   在 (Grid , IEnumerable , Boolean )
-   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   在 (Grid , Boolean )
-   在 FineUIPro.Grid.DataBind()
-   在 FineUIPro.Web.DigData.HSEDataDW.BindGrid() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\HSEDataDW.aspx.cs:行号 40
-   在 FineUIPro.Web.DigData.HSEDataDW.Page_Load(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\HSEDataDW.aspx.cs:行号 25
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.EventHandler.Invoke(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:09/18/2023 10:52:05
-出错文件:http://localhost:8513/DigData/HSEDataDW.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:09/18/2023 10:52:05
-
-
-错误信息开始=====>
-错误类型:ThreadAbortException
-错误信息:正在中止线程。
-错误堆栈:
-   在 System.Runtime.CompilerServices.RuntimeHelpers._CompileMethod(IRuntimeMethodInfo method)
-   在 System.Reflection.Emit.DynamicMethod.CreateDelegate(Type delegateType, Object target)
-   在 System.Linq.Expressions.Compiler.LambdaCompiler.CreateDelegate()
-   在 System.Linq.Expressions.Compiler.LambdaCompiler.Compile(LambdaExpression lambda, DebugInfoGenerator debugInfoGenerator)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.MakeLocal(Expression e)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitBinary(BinaryExpression b)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitBinary(BinaryExpression b)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitLambda(LambdaExpression lambda)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitUnary(UnaryExpression u)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitExpressionList(ReadOnlyCollection`1 original)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitMethodCall(MethodCallExpression m)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitExpressionList(ReadOnlyCollection`1 original)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.VisitMethodCall(MethodCallExpression m)
-   在 System.Data.Linq.SqlClient.ExpressionVisitor.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Localizer.Visit(Expression exp)
-   在 System.Data.Linq.SqlClient.Funcletizer.Funcletize(Expression expression)
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
-   在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\OpenService\GetDataService.cs:行号 140
-   在 BLL.MonitorService.DoSynchData() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 2129
-   在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\OpenService\MonitorService.cs:行号 110
-出错时间:09/18/2023 11:28:51
-出错时间:09/18/2023 11:28:51
-

SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx

@@ -1,10 +1,17 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SitePersonNowStatistic.aspx.cs" Inherits="FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic" %>
 
 <!DOCTYPE html>
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title>当前人员统计</title>
+    <title>员工信息</title>
-    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />   
+    <style type="text/css">
+        .f-grid-cell-Actions .action {
+            display: inline-block;
+            vertical-align: middle;
+        }
+    </style>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -12,22 +19,25 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="当前人员统计" EnableCollapse="true"
+                  <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目劳务人员" 
-                    runat="server" BoxFlex="1" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true" ForceFit="true"
+                    runat="server" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
-                    SortField="ChangeTime" SortDirection="DESC" EnableColumnLines="true" EnableTextSelection="True"
+                    SortField="ChangeTime" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="20"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange">
+                    SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                    <Toolbars>
+                    OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                    OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>                      
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList runat="server" ID="drpUnit" Label="单位"
+                                <f:DropDownList runat="server" ID="drpUnit" Label="单位" EnableEdit="true"
                                     Width="300px" LabelAlign="Right" LabelWidth="50px">
                                 </f:DropDownList>
-                                <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
+                                <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位" EnableEdit="true"
                                     Width="200px" LabelAlign="Right" LabelWidth="50px">
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" Width="160px" LabelAlign="Right" ></f:TextBox>
                                 <f:TextBox runat="server" ID="txtIdcard" EmptyText="按身份证号码查询" Width="180px" LabelAlign="Right" ></f:TextBox>
-                                <f:DatePicker ID="txtStartDate" runat="server" Label="日期" LabelWidth="50px" Width="200px" EnableEdit="false" Readonly="true">
+                                <f:DatePicker ID="txtStartDate" runat="server" Label="日期" LabelWidth="50px" Width="200px" 
+                                    EnableEdit="false" >
                                 </f:DatePicker>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="查询" OnClick="btnSearch_Click">
@@ -39,7 +49,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                         <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
                             TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
@@ -73,6 +83,9 @@
                             FieldType="String" HeaderText="进场时间" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
                     </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                         </f:ToolbarSeparator>
@@ -86,5 +99,16 @@
             </Items>
         </f:Panel>
     </form>
+    <script type="text/jscript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+           // F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
 </body>
 </html>

SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs

@@ -1,7 +1,7 @@
 using BLL;
+using Microsoft.Office.Core;
+using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 
 namespace FineUIPro.Web.HSSE.SitePerson
@@ -23,11 +23,15 @@ namespace FineUIPro.Web.HSSE.SitePerson
             }
         }
 
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
-                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
                 {
@@ -41,34 +45,50 @@ namespace FineUIPro.Web.HSSE.SitePerson
                 }
                 WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true);
                 this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                Funs.DropDownPageSize(this.ddlPageSize);
                 // 绑定表格
                 this.BindGrid();
             }
         }
 
-        #region 绑定数据
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
             var getData = SitePerson_PersonService.getNowPersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.drpWorkPost.SelectedValue
-                , this.txtPersonName.Text.Trim(),this.txtIdcard.Text.Trim(),Funs.GetNewDateTimeOrNow(this.txtStartDate.Text), Grid1);
+                , this.txtPersonName.Text.Trim(), this.txtIdcard.Text.Trim(), Funs.GetNewDateTimeOrNow(this.txtStartDate.Text), Grid1);
             Grid1.RecordCount = SitePerson_PersonService.nowCount;
             Grid1.DataSource = getData;
-            Grid1.DataBind();
+            Grid1.DataBind();          
         }
-        #endregion
 
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnSearch_Click(object sender, EventArgs e)
         {
-            // 绑定表格
             this.BindGrid();
         }
+        #endregion 
 
-        #region 分页选择下拉改变事件
+
+        #region 分页
         /// <summary>
-        /// 分页选择下拉改变事件
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -77,21 +97,40 @@ namespace FineUIPro.Web.HSSE.SitePerson
             Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
             BindGrid();
         }
-        #endregion
 
-        #region 页索引改变事件
         /// <summary>
-        /// 页索引改变事件
+        /// 排序
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
         {
-            Grid1.PageIndex = e.NewPageIndex;
             BindGrid();
         }
         #endregion
 
+        #region Grid编辑事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+           
+        }
+
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+           
+        }
+        #endregion
+
         #region 导出按钮
         /// 导出按钮
         /// </summary>
@@ -110,7 +149,5 @@ namespace FineUIPro.Web.HSSE.SitePerson
             Response.End();
         }
         #endregion
-
-
     }
 }