From 3f95c54152806c69e3e1d4ab7e9122fe19c4b01d Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sun, 4 May 2025 12:33:20 +0800 Subject: [PATCH 01/19] 1 --- SGGL/BLL/OpenService/GetDataService.cs | 4 +-- .../common/mainMenu_PDigData.aspx | 36 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index 73fb9210..49e5a7f1 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -272,8 +272,8 @@ namespace BLL { try { - DateTime dateS = DateTime.Now.AddMonths(-12); - dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-12).Year + "-" + DateTime.Now.AddMonths(-12).Month + "-01"); + DateTime dateS = DateTime.Now.AddMonths(-3); + dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-3).Year + "-" + DateTime.Now.AddMonths(-3).Month + "-01"); var getNums = from x in db.SitePerson_PersonInOutNumber where x.ProjectId == projectId && x.InOutDate >= dateS orderby x.InOutDate diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx index 28ae3853..3024a419 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx @@ -380,30 +380,30 @@ name: '累计人工时', type: 'line', data: two.series[0].data, - label: { //柱体上显示数值 - show: true,//开启显示 - position: 'top',//在上方显示 - textStyle: {//数值样式 - fontSize: '20px', - color: '#fff' - }, - formatter: '{c}', - }, + //label: { //柱体上显示数值 + // show: true,//开启显示 + // position: 'top',//在上方显示 + // textStyle: {//数值样式 + // fontSize: '20px', + // color: '#fff' + // }, + // formatter: '{c}', + // }, itemStyle: { normal: { color: '#00c771' } } },{ name: '当月人工时', type: 'bar', barWidth: 40, data: two.series[1].data, - label: { //柱体上显示数值 - show: true,//开启显示 - position: 'inside',//内部 - textStyle: {//数值样式 - fontSize: '20px', - color: '#fff' - }, - formatter: '{c}', - }, + //label: { //柱体上显示数值 + // show: true,//开启显示 + // position: 'inside',//内部 + // textStyle: {//数值样式 + // fontSize: '20px', + // color: '#fff' + // }, + // formatter: '{c}', + // }, }] category_Two('two', xArr, data) From 57370857107dc31271a048bae42826d3c6af866e Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sun, 4 May 2025 12:34:21 +0800 Subject: [PATCH 02/19] 1 --- SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx index 3024a419..857b35b7 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx @@ -392,8 +392,8 @@ itemStyle: { normal: { color: '#00c771' } } },{ name: '当月人工时', - type: 'bar', - barWidth: 40, + type: 'bar', + /* barWidth: 40,*/ data: two.series[1].data, //label: { //柱体上显示数值 // show: true,//开启显示 From a92df1a6826cda26b2334c4c0b291ad373163aea Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sun, 4 May 2025 13:12:51 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A0=A1=E6=AD=A3?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=9C=BA=E4=BA=BA=E6=95=B0=E5=8F=8A=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/OpenService/GetDataService.cs | 7 ++++--- SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index 49e5a7f1..8f774c7c 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -272,8 +272,8 @@ namespace BLL { try { - DateTime dateS = DateTime.Now.AddMonths(-3); - dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-3).Year + "-" + DateTime.Now.AddMonths(-3).Month + "-01"); + DateTime dateS = DateTime.Now.AddMonths(-12); + 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 @@ -281,7 +281,8 @@ namespace BLL var getInouts = from x in db.SitePerson_PersonInOut where x.ProjectId == projectId && x.ChangeTime.Value >= dateS select x; - int SafeHours = 0; + //int SafeHours = 0; + int SafeHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == projectId && x.InOutDate < dateS).Max(x => x.WorkHours) ?? 0; foreach (var itemNum in getNums) { DateTime date = Funs.GetNewDateTimeOrNow(itemNum.InOutDate.ToShortDateString()); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx index 857b35b7..3e651ad4 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx @@ -327,7 +327,7 @@ }, axisLabel: { show: true, - interval: 0, + /*interval: 0,*/ textStyle: { color: 'rgba(255, 255, 255, 0.8)' } From b785ed0e86307451a9462f3a8770ef88936f5481 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Wed, 7 May 2025 10:10:04 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/common/mainProject2.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 5d1ce19a..71282ffe 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -505,7 +505,7 @@ namespace FineUIPro.Web.common int allCount = 0; var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId - where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId == ProjectId + where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId == ProjectId && y.OutTime == null select x; //// 预警人数 allCount = getPersonQualitys.Count(); From e87f7f97ca1dd374e6b856fa9729a25a410060b8 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 9 May 2025 11:20:03 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=B1=87=E6=80=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/common/mainProject2.aspx.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 71282ffe..16acbcea 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -254,14 +254,11 @@ namespace FineUIPro.Web.common { int AllCount = 0; int MCount = 0; - //修改日期2024-10-30 16:53:50 为了和另一个看板相同 - //Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date) - //var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now); - var getallin = from x in Funs.DB.T_d_EmployInOutRecord - join z in Funs.DB.Base_WorkPost on x.PostId equals z.WorkPostId + join z in Funs.DB.Base_WorkPost on x.PostId equals z.WorkPostId into zGroup + from z in zGroup.DefaultIfEmpty() where x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date - select new { z.PostType }; + select new {x.IDCardNo, z.PostType }; AllCount = getallin.Count(); if (AllCount > 0) From 491566bded1a995c9a9896a385b03aef2876b996 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 9 May 2025 16:58:38 +0800 Subject: [PATCH 06/19] 1 --- .../ProcessControl/InspectionManagement.aspx | 14 +++++------ .../FineUIPro.Web/common/mainProject2.aspx.cs | 24 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx index a4d61fba..5c95bb92 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx @@ -9,7 +9,7 @@