From 4ee7d38c78f981254a8d3341f8ff8efa2a39b95d Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sat, 15 Mar 2025 16:23:28 +0800 Subject: [PATCH] =?UTF-8?q?1=E5=85=B3=E9=94=AE=E4=BA=8B=E9=A1=B9=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs | 4 +-- .../PZHGL/GJSX/GJSXListEdit.aspx | 2 +- .../PZHGL/GJSX/GJSXListEdit.aspx.cs | 20 +++++------ SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx | 33 ++++++++++--------- .../common/mainMenu_PGJSX.aspx.cs | 16 ++++----- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index 7f0cc98a..132bf99b 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -90,7 +90,7 @@ namespace BLL var userIds = BLL.UserService.GetUserHaveEmailList(); if (userIds.Any() && lstOverdue.Any()) { - var lstProject = lstOverdue.Select(x => new { x.ProjectId ,x.ProjectName}).Distinct().ToList(); + var lstProject = lstOverdue.Select(x => new { x.ProjectId, x.ProjectName }).Distinct().ToList(); foreach (var pro in lstProject) { var lstProjectOverdue = lstOverdue.Where(x => x.ProjectId == pro.ProjectId).ToList(); @@ -127,7 +127,7 @@ namespace BLL index++; } } - //跟踪人为本人 + //跟踪人为本人--x.User_ReceiveUserId != null && x.User_ReceiveUserId != "" && var receiveItems = lstProjectOverdue.Where(x => x.User_ReceiveUserId.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList(); if (receiveItems.Any()) { diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx index a15f758f..b1ff5cce 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx @@ -60,7 +60,7 @@ - diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs index 4c3813fc..c21bb5e9 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs @@ -829,11 +829,11 @@ namespace FineUIPro.Web.PZHGL.GJSX Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); return; } - if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) - { - Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); - return; - } + //if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) + //{ + // Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); + // return; + //} if (this.Date_CompleteDate.Text == "") { Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning); @@ -1028,11 +1028,11 @@ namespace FineUIPro.Web.PZHGL.GJSX Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); return; } - if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) - { - Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); - return; - } + //if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) + //{ + // Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); + // return; + //} if (this.Date_CompleteDate.Text == "") { Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx index e0e6b76c..6da704f4 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx @@ -235,22 +235,25 @@ var option = { title: [{ text: '关键事项关闭率', - top: '0', - left: '30%', + //top: '0', + //left: '10%', textStyle: { color: '#1C1C1C', fontSize: 16, fontWeight: 700 - } + }, + show: true }], tooltip: { trigger: 'item', formatter: '{a}
{b}: {c} ({d}%)' }, legend: { - orient: 'vertical', - right: 10, - top: 'center', + left: '66%', + show: true, + //orient: 'vertical', + //right: 10, + //top: 'center', data: ['已关闭', '未关闭'], textStyle: {//图例文字的样式 @@ -260,7 +263,7 @@ }, graphic: { type: "text", - left: "34%", + left: "45%", top: "54%", style: { text: data2, @@ -275,7 +278,7 @@ { name: '关键事项', type: 'pie', - center: ['38%', '55%'], + center: ['50%', '55%'], radius: ['40%', '78%'], avoidLabelOverlap: false, label: { @@ -320,7 +323,7 @@ var option = { title: { // left:'center', - text: '关键事项统计——事项类别', + text: '关键事项跟踪-按事项类别统计', textStyle: { color: '#1C1C1C', fontSize: 16, @@ -469,7 +472,7 @@ var option = { title: { // left:'center', - text: '关键事项统计——责任人', + text: '关键事项跟踪-按责任人统计', textStyle: { color: '#1C1C1C', fontSize: 16, @@ -717,7 +720,7 @@ var three =<%=Three %>; var xArr = three.categories var series = [{ - name: '关键事项超期统计', + name: '关键事项超期天数统计（累计）', type: 'bar', barWidth: 30, barGap: 0, @@ -746,7 +749,7 @@ var option = { title: { // left:'center', - text: '关键事项超期平均时间统计（单位：天）', + text: '关键事项平均超期天数统计（单位：天）', textStyle: { color: '#1C1C1C', fontSize: 16, @@ -756,10 +759,10 @@ }, tooltip: {}, legend: { - data: ['关键事项超期平均时间（单位：天）'], + data: ['关键事项平均超期天数统计（单位：天）'], left: '3%', show: true, - selectedMode: false, + selectedMode: true, textStyle: {//图例文字的样式 //color: '#1C1C1C', fontSize: 16, @@ -847,7 +850,7 @@ var four =<%=Four %>; var xArr = four.categories; var series = [{ - name: '关键事项超期平均时间', + name: '关键事项平均超期天数统计（单位：天）', type: 'bar', barWidth: 30, barGap: 0, diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs index d069391e..ac13d794 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs @@ -100,7 +100,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "关键事项统计"; + businessColumn.title = "关键事项跟踪-按事项类别统计"; businessColumn.xFontNum = 8; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX @@ -139,7 +139,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "关键事项统计"; + businessColumn.title = "关键事项跟踪-按责任人统计"; businessColumn.xFontNum = 5; //var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId); var allItems = from x in Funs.DB.GJSX @@ -199,7 +199,7 @@ namespace FineUIPro.Web sb.Append(" "); sb.Append(""); sb.Append(""); - sb.Append(""); + sb.Append(""); sb.Append(""); sb.Append(""); sb.Append(""); @@ -259,7 +259,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "超期统计——不足一周"; + businessColumn.title = "关键事项超期天数统计（累计）"; businessColumn.xFontNum = 5; Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); @@ -295,7 +295,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "超期统计——超期一周"; + businessColumn.title = "关键事项超期天数统计（累计）"; businessColumn.xFontNum = 5; Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); @@ -331,7 +331,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "超期统计——超期两周"; + businessColumn.title = "关键事项超期天数统计（累计）"; businessColumn.xFontNum = 5; Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); @@ -367,7 +367,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "超期统计——超期三周"; + businessColumn.title = "关键事项超期天数统计（累计）"; businessColumn.xFontNum = 5; Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); @@ -403,7 +403,7 @@ namespace FineUIPro.Web List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); - businessColumn.title = "超期统计——超期一个月"; + businessColumn.title = "关键事项超期天数统计（累计）"; businessColumn.xFontNum = 5; Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();
事项类别超期统计关键事项超期天数统计（累计）
事项类别