lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1关键事项看板

This commit is contained in:
夏菊 2025-03-15 16:23:28 +08:00
parent e6502c0b4e
commit 4ee7d38c78
5 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
View File

@ -90,7 +90,7 @@ namespace BLL
var userIds = BLL.UserService.GetUserHaveEmailList(); var userIds = BLL.UserService.GetUserHaveEmailList();
if (userIds.Any() && lstOverdue.Any()) 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) foreach (var pro in lstProject)
{ {
var lstProjectOverdue = lstOverdue.Where(x => x.ProjectId == pro.ProjectId).ToList(); var lstProjectOverdue = lstOverdue.Where(x => x.ProjectId == pro.ProjectId).ToList();
@ -127,7 +127,7 @@ namespace BLL
index++; index++;
} }
} }
//跟踪人为本人 //跟踪人为本人--x.User_ReceiveUserId != null && x.User_ReceiveUserId != "" &&
var receiveItems = lstProjectOverdue.Where(x => x.User_ReceiveUserId.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList(); var receiveItems = lstProjectOverdue.Where(x => x.User_ReceiveUserId.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList();
if (receiveItems.Any()) if (receiveItems.Any())
{ {

2
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
View File

@ -60,7 +60,7 @@
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true" <f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true"
LabelWidth="110px"> LabelWidth="110px">
</f:DatePicker> </f:DatePicker>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px" <f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableEdit="true"
OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true"> OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
</f:DropDownList> </f:DropDownList>

20
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -829,11 +829,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) //if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{ //{
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); // Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return; // return;
} //}
if (this.Date_CompleteDate.Text == "") if (this.Date_CompleteDate.Text == "")
{ {
Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning);
@ -1028,11 +1028,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) //if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{ //{
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); // Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return; // return;
} //}
if (this.Date_CompleteDate.Text == "") if (this.Date_CompleteDate.Text == "")
{ {
Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning);

33
SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
View File

@ -235,22 +235,25 @@
var option = { var option = {
title: [{ title: [{
text: '关键事项关闭率', text: '关键事项关闭率',
top: '0', //top: '0',
left: '30%', //left: '10%',
textStyle: { textStyle: {
color: '#1C1C1C', color: '#1C1C1C',
fontSize: 16, fontSize: 16,
fontWeight: 700 fontWeight: 700
} },
show: true
}], }],
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' formatter: '{a} <br/>{b}: {c} ({d}%)'
}, },
legend: { legend: {
orient: 'vertical', left: '66%',
right: 10, show: true,
top: 'center', //orient: 'vertical',
//right: 10,
//top: 'center',
data: ['已关闭', '未关闭'], data: ['已关闭', '未关闭'],
textStyle: {//图例文字的样式 textStyle: {//图例文字的样式
@ -260,7 +263,7 @@
}, },
graphic: { graphic: {
type: "text", type: "text",
left: "34%", left: "45%",
top: "54%", top: "54%",
style: { style: {
text: data2, text: data2,
@ -275,7 +278,7 @@
{ {
name: '关键事项', name: '关键事项',
type: 'pie', type: 'pie',
center: ['38%', '55%'], center: ['50%', '55%'],
radius: ['40%', '78%'], radius: ['40%', '78%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
label: { label: {
@ -320,7 +323,7 @@
var option = { var option = {
title: { title: {
// left:'center', // left:'center',
text: '关键事项统计——事项类别', text: '关键事项跟踪-按事项类别统计',
textStyle: { textStyle: {
color: '#1C1C1C', color: '#1C1C1C',
fontSize: 16, fontSize: 16,
@ -469,7 +472,7 @@
var option = { var option = {
title: { title: {
// left:'center', // left:'center',
text: '关键事项统计——责任人', text: '关键事项跟踪-按责任人统计',
textStyle: { textStyle: {
color: '#1C1C1C', color: '#1C1C1C',
fontSize: 16, fontSize: 16,
@ -717,7 +720,7 @@
var three =<%=Three %>; var three =<%=Three %>;
var xArr = three.categories var xArr = three.categories
var series = [{ var series = [{
name: '关键事项超期统计', name: '关键事项超期天数统计（累计）',
type: 'bar', type: 'bar',
barWidth: 30, barWidth: 30,
barGap: 0, barGap: 0,
@ -746,7 +749,7 @@
var option = { var option = {
title: { title: {
// left:'center', // left:'center',
text: '关键事项超期平均时间统计（单位：天）', text: '关键事项平均超期天数统计（单位：天）',
textStyle: { textStyle: {
color: '#1C1C1C', color: '#1C1C1C',
fontSize: 16, fontSize: 16,
@ -756,10 +759,10 @@
}, },
tooltip: {}, tooltip: {},
legend: { legend: {
data: ['关键事项超期平均时间（单位：天）'], data: ['关键事项平均超期天数统计（单位：天）'],
left: '3%', left: '3%',
show: true, show: true,
selectedMode: false, selectedMode: true,
textStyle: {//图例文字的样式 textStyle: {//图例文字的样式
//color: '#1C1C1C', //color: '#1C1C1C',
fontSize: 16, fontSize: 16,
@ -847,7 +850,7 @@
var four =<%=Four %>; var four =<%=Four %>;
var xArr = four.categories; var xArr = four.categories;
var series = [{ var series = [{
name: '关键事项超期平均时间', name: '关键事项平均超期天数统计（单位：天）',
type: 'bar', type: 'bar',
barWidth: 30, barWidth: 30,
barGap: 0, barGap: 0,

16
SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs
View File

@ -100,7 +100,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "关键事项统计"; businessColumn.title = "关键事项跟踪-按事项类别统计";
businessColumn.xFontNum = 8; businessColumn.xFontNum = 8;
var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();
var allItems = from x in Funs.DB.GJSX var allItems = from x in Funs.DB.GJSX
@ -139,7 +139,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "关键事项统计"; businessColumn.title = "关键事项跟踪-按责任人统计";
businessColumn.xFontNum = 5; businessColumn.xFontNum = 5;
//var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId); //var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId);
var allItems = from x in Funs.DB.GJSX var allItems = from x in Funs.DB.GJSX
@ -199,7 +199,7 @@ namespace FineUIPro.Web
sb.Append("<table id=\"myTable\" class=\"myTableClass\" > "); sb.Append("<table id=\"myTable\" class=\"myTableClass\" > ");
sb.Append("<thead>"); sb.Append("<thead>");
sb.Append("<tr>"); sb.Append("<tr>");
sb.Append("<th class=\"tab-title\" colspan=\"6\">事项类别超期统计</th>"); sb.Append("<th class=\"tab-title\" colspan=\"6\">关键事项超期天数统计（累计）</th>");
sb.Append("</tr>"); sb.Append("</tr>");
sb.Append("<tr>"); sb.Append("<tr>");
sb.Append("<th class=\"tab-header\">事项类别</th>"); sb.Append("<th class=\"tab-header\">事项类别</th>");
@ -259,7 +259,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "超期统计——不足一周"; businessColumn.title = "关键事项超期天数统计（累计）";
businessColumn.xFontNum = 5; businessColumn.xFontNum = 5;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();
@ -295,7 +295,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "超期统计——超期一周"; businessColumn.title = "关键事项超期天数统计（累计）";
businessColumn.xFontNum = 5; businessColumn.xFontNum = 5;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();
@ -331,7 +331,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "超期统计——超期两周"; businessColumn.title = "关键事项超期天数统计（累计）";
businessColumn.xFontNum = 5; businessColumn.xFontNum = 5;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();
@ -367,7 +367,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "超期统计——超期三周"; businessColumn.title = "关键事项超期天数统计（累计）";
businessColumn.xFontNum = 5; businessColumn.xFontNum = 5;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();
@ -403,7 +403,7 @@ namespace FineUIPro.Web
List<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>(); List<string> listCategories = new List<string>();
businessColumn.title = "超期统计——超期一个月"; businessColumn.title = "关键事项超期天数统计（累计）";
businessColumn.xFontNum = 5; businessColumn.xFontNum = 5;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList();