现场考勤——当前现场总人数

SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx

@@ -179,65 +179,76 @@
             padding: 20px 0px;
             color: #fff;
         }
-        .base-wrap{
+
-           padding:15px 10px;
+        .base-wrap {
-            height:100%;
+            padding: 15px 10px;
+            height: 100%;
         }
-         .base-wrap .base-tit{
+
-             font-size:12px;
+            .base-wrap .base-tit {
-             color:#fff;
+                font-size: 12px;
+                color: #fff;
             }
-        .base-wrap .base-txt-wrap{
+
-            margin-top:5px;
+            .base-wrap .base-txt-wrap {
-            background-color:#0B508B;
+                margin-top: 5px;
-            border-radius:5px;
+                background-color: #0B508B;
-            color:#FFAE72;
+                border-radius: 5px;
-            height:100%;
+                color: #FFAE72;
-            align-items:center;
+                height: 100%;
-            justify-content:space-around;
+                align-items: center;
+                justify-content: space-around;
             }
-        .base-wrap .base-txt-wrap .num-1{
+
-            background-color:#2A759C;
+                .base-wrap .base-txt-wrap .num-1 {
-            padding:5px;
+                    background-color: #2A759C;
-            font-size:40px;
+                    padding: 5px;
+                    font-size: 40px;
                 }
-        .yj-info-1{
+
-            height:100%;
+        .yj-info-1 {
+            height: 100%;
         }
-        .yj-info-1-list{
+
-            color:#fff;
+        .yj-info-1-list {
+            color: #fff;
         }
-        .yj-info-1 .telbg{
+
-            height:100%;
+        .yj-info-1 .telbg {
-            width:85px;
+            height: 100%;
+            width: 85px;
             background: url(../res/index/images/tel.png) center center no-repeat;
             background-size: contain;
         }
-        .yj-info-1-list-item{
+
-            padding:0 5px;
+        .yj-info-1-list-item {
-            background-color:#2A759C;
+            padding: 0 5px;
-            margin-bottom:5px;
+            background-color: #2A759C;
-            font-size:12px;
+            margin-bottom: 5px;
-            align-items:center;
+            font-size: 12px;
-            justify-content:center;
+            align-items: center;
+            justify-content: center;
         }
-         .yj-info-1-list-item:last-child{
+
-              margin-bottom:0;
+            .yj-info-1-list-item:last-child {
+                margin-bottom: 0;
             }
-         .yj-info-1-list-item .telnum{
+
-             text-align:center;
+            .yj-info-1-list-item .telnum {
-             align-items:center;
+                text-align: center;
-             justify-content:center;
+                align-items: center;
-             display:flex;
+                justify-content: center;
+                display: flex;
             }
-        .yj-info-1-info{
+
-            color:#fff;
+        .yj-info-1-info {
-            background-color:#2A759C;
+            color: #fff;
-            text-align:center;
+            background-color: #2A759C;
-            font-size:16px;
+            text-align: center;
-            height:40px;
+            font-size: 16px;
-            line-height:40px;
+            height: 40px;
-            margin-top:5px;
+            line-height: 40px;
+            margin-top: 5px;
         }
     </style>
 </head>
@@ -248,7 +259,7 @@
                 <div class="item flex1">
                     <div class="bw-b-bottom">
                         <div class="bw-b-bottom-up">
-                            <div class="bw-item-content pd0">
+                            <div class="bw-item-content pd0 js-hover" data-type="SitePersonNum">
                                 <div class="base-wrap flex flexV">
                                     <div class="base-tit">当前现场总人数</div>
                                     <div class="base-txt-wrap  flex flex1">
@@ -296,6 +307,26 @@
 <script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
 <script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
 <script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
+<script type="text/javascript">
+
+    $(function () {
+        initClick();
+    })
+
+    function initClick() {
+        $(".js-hover").click(function () {
+            var htmlContent = GetClickHtml(this);
+        })
+    }
+
+    function GetClickHtml(obj) {
+        var $this = $(obj), type = $this.attr('data-type');
+        if (type == 'SitePersonNum') {
+            $('iframe').attr('src', '../DataShow/ProjectSitePerson.aspx') //项目当前现场人员
+            window.open("../DataShow/ProjectSitePerson.aspx")
+        }
+    }
+</script>
 <script type="text/javascript">
     function category_Two(id, xArr, data) {
         // 基于准备好的dom，初始化echarts实例
@@ -420,7 +451,7 @@
         //     formatter: '{c}',
         // },
         itemStyle: { normal: { color: '#00c771' } }
-    },{
+    }, {
         name: '当月人工时',
         type: 'bar',
         /*  barWidth: 40,*/
@@ -558,7 +589,7 @@
         name: '签到',
         type: 'bar',
         barWidth: 20,
-         barGap:0.05,
+        barGap: 0.05,
         data: four1.series[0].data,
         label: { //柱体上显示数值
             show: true,//开启显示

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

@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.DataShow;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -8,13 +9,35 @@ namespace FineUIPro.Web.common
 {
     public partial class mainMenu_PDigData : PageBase
     {
+        #region 定义项
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
+                this.ProjectId = string.Empty;
+                if (this.CurrUser != null && !string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.ProjectId = this.CurrUser.LoginProjectId;
+                }
                 getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList();
                 getAllPersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).ToList();
-                getPersons = getAllPersons.Where(x =>x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList();
+                getPersons = getAllPersons.Where(x => x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList();
                 ///当前现场总人数
                 getSitePerson();
             }
@@ -26,7 +49,13 @@ namespace FineUIPro.Web.common
         /// </summary>
         private void getSitePerson()
         {
-            var AllCount = getEmployInOutRecords.Count();
+            //var AllCount = getEmployInOutRecords.Count();
+
+            //var  getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.ProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList();
+            // int AllCount = getEmployInOutRecords.Count();
+
+            var getallin = APIPageDataService.getPersonNum(this.ProjectId, DateTime.Now);
+            int AllCount = getallin.Count();
             if (AllCount > 0)
             {
                 ////总人数
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.common
                     {
                         var unitRords = from x in getEmployInOutRecords
                                         join y in getAllPersons on x.IDCardNo equals y.IdentityCard
-                                        where y.UnitId == unitId && y.PersonId != null && x.UnitId== unitId
+                                        where y.UnitId == unitId && y.PersonId != null && x.UnitId == unitId
                                         select x;
                         var unitPersons = getPersons.Where(x => x.UnitId == unitId);
                         int rcount = unitRords.Distinct().Count();
@@ -161,7 +190,7 @@ namespace FineUIPro.Web.common
                 var getTypes = (from x in getEmployInOutRecords
                                 join y in getAllPersons on x.IDCardNo equals y.IdentityCard
                                 join z in Funs.DB.Base_WorkPost on y.WorkPostId equals z.WorkPostId
-                                select new { y.WorkPostId,z.WorkPostName }).Distinct();
+                                select new { y.WorkPostId, z.WorkPostName }).Distinct();
                 if (getTypes.Count() > 0)
                 {
                     foreach (var item in getTypes)

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />