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

1

This commit is contained in:
夏菊 2025-06-10 17:56:07 +08:00
parent 63b616b571
commit 249d673279
2 changed files with 95 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
SGGL/FineUIPro.Web/common/main_new1.aspx
View File

@ -428,8 +428,8 @@
let opt = { let opt = {
grid: { grid: {
top: fontSize(60), top: fontSize(40),
bottom: fontSize(30) bottom: fontSize(20)
}, },
legend: { legend: {
top: fontSize(10), top: fontSize(10),
@ -440,7 +440,6 @@
type: 'category', type: 'category',
data: label, data: label,
axisLabel: { axisLabel: {
color: '#3FB0FF' color: '#3FB0FF'
}, },
axisLine: { axisLine: {
@ -449,23 +448,47 @@
color: '#84D7FE' color: '#84D7FE'
} }
}, },
axisTick: { //axisTick: {
show: false // show: false
} //}
}, },
yAxis: { yAxis: [
type: 'value', {
axisLabel: { type: 'value',
color: '#3FB0FF' name: '数量',
position: 'left',
splitNumber: 5,
alignTicks: true,
axisLabel: {
color: '#3FB0FF'
},
splitLine: {
lineStyle: {
color: '#1B538B', // 设置Y轴线颜色为白色
type: 'dashed'
}
},
}, },
splitLine: { {
show: true, type: 'value',
lineStyle: { name: '百分比',
color: '#1B538B', position: 'right',
type: 'dashed' splitNumber: 5,
interval: 25,
max: 100,
min: 0,
alignTicks: true,
axisLabel: {
color: '#3FB0FF'
},
splitLine: {
lineStyle: {
color: '#1B538B', // 设置Y轴线颜色为白色
type: 'dashed'
}
} }
} }
}, ],
series: [ series: [
{ {
name: '<%=total%>', name: '<%=total%>',
@ -475,6 +498,7 @@
itemStyle: { itemStyle: {
color: '#20AFFF' color: '#20AFFF'
}, },
yAxisIndex: 0,
label: { label: {
// 柱图头部显示值 // 柱图头部显示值
show: true, show: true,
@ -483,7 +507,7 @@
fontSize: fontSize(10), fontSize: fontSize(10),
formatter: (params) => { formatter: (params) => {
let str = params.value; let str = params.value;
console.log(params.name) //console.log(params.name)
if (params.name == '<%=RectificationRate%>') { if (params.name == '<%=RectificationRate%>') {
str = str + '%' str = str + '%'
} }
@ -499,6 +523,7 @@
itemStyle: { itemStyle: {
color: '#12CDA2' color: '#12CDA2'
}, },
yAxisIndex: 0,
label: { label: {
// 柱图头部显示值 // 柱图头部显示值
show: true, show: true,
@ -522,6 +547,7 @@
itemStyle: { itemStyle: {
color: '#FFA602' color: '#FFA602'
}, },
yAxisIndex: 1,
showSymbol: false, showSymbol: false,
areaStyle: { areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [

80
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
View File

@ -1,5 +1,6 @@
using BLL; using BLL;
using FineUIPro.Web.BaseInfo; using FineUIPro.Web.BaseInfo;
using FineUIPro.Web.DataShow;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -152,7 +153,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.SitePerson_Person int result = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where y.IsCQMS == true && x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now) && pids.Contains(x.ProjectId) where y.IsCQMS == true && x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now) && pids.Contains(x.ProjectId)
@ -175,7 +177,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.IsOnSite == true && x.InspectionType.Contains("计量") && pids.Contains(x.ProjectId) where x.IsOnSite == true && x.InspectionType.Contains("计量") && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
@ -196,7 +199,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true && pids.Contains(x.ProjectId) where x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
@ -223,7 +227,8 @@ namespace FineUIPro.Web.common
result = num2; result = num2;
return result; return result;
} }
else { else
{
int result = 0; int result = 0;
//过期提醒记录数 //过期提醒记录数
var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now
@ -247,7 +252,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.Comprehensive_InspectionPerson int result = (from x in Funs.DB.Comprehensive_InspectionPerson
where x.IsTrain == true && pids.Contains(x.ProjectId) where x.IsTrain == true && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
@ -268,7 +274,8 @@ namespace FineUIPro.Web.common
var q = Funs.GetNewIntOrZero(result.ToString()); var q = Funs.GetNewIntOrZero(result.ToString());
return q; return q;
} }
else { else
{
var result = (from x in Funs.DB.Comprehensive_DesignDetails var result = (from x in Funs.DB.Comprehensive_DesignDetails
where pids.Contains(x.ProjectId) where pids.Contains(x.ProjectId)
select x.JoinPersonNum ?? 0).ToList().Sum(); select x.JoinPersonNum ?? 0).ToList().Sum();
@ -285,19 +292,30 @@ namespace FineUIPro.Web.common
if (pids == null) if (pids == null)
{ {
int allCount = 0; int allCount = 0;
var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
join z in Funs.DB.Base_WorkPost on y.WorkPostId equals z.WorkPostId
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.OutTime == null && z.PostType == Const.PostType_2
select x; select x;
//var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
// where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
// select x;
//// 预警人数 //// 预警人数
allCount = getPersonQualitys.Count(); allCount = getPersonQualitys.Count();
this.spanQualityChartAnalysis.InnerHtml = allCount.ToString(); this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
} }
else { else
{
int allCount = 0; int allCount = 0;
var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true && pids.Contains(x.ProjectId) join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
join z in Funs.DB.Base_WorkPost on y.WorkPostId equals z.WorkPostId
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.OutTime == null && z.PostType == Const.PostType_2 && pids.Contains(y.ProjectId)
select x; select x;
//var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
// where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true && pids.Contains(x.ProjectId)
// select x;
//// 预警人数 //// 预警人数
allCount = getPersonQualitys.Count(); allCount = getPersonQualitys.Count();
this.spanQualityChartAnalysis.InnerHtml = allCount.ToString(); this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
@ -326,7 +344,8 @@ namespace FineUIPro.Web.common
// select x).Count(); // select x).Count();
return result; return result;
} }
else { else
{
int result = 0; int result = 0;
var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
where pids.Contains(x.ProjectId) where pids.Contains(x.ProjectId)
@ -337,7 +356,7 @@ namespace FineUIPro.Web.common
} }
} }
/// <summary> /// <summary>
/// 次合格数量 /// 一次合格数量
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public int getIsOnceInspectionManagement() public int getIsOnceInspectionManagement()
@ -350,7 +369,7 @@ namespace FineUIPro.Web.common
// BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate( // BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
// null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true); // null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true where (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).Count(); select x).Count();
result = num2; result = num2;
@ -359,11 +378,12 @@ namespace FineUIPro.Web.common
// select x).Count(); // select x).Count();
return result; return result;
} }
else { else
{
int result = 0; int result = 0;
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true && pids.Contains(x.ProjectId) where (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
result = num2; result = num2;
@ -398,7 +418,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.Check_CheckControl int result = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId) where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
@ -418,7 +439,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.Check_CheckControl int result = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId) where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
@ -463,7 +485,8 @@ namespace FineUIPro.Web.common
select x).Count(); select x).Count();
return result; return result;
} }
else { else
{
int result = (from x in Funs.DB.Check_CheckControl int result = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId) where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
@ -583,7 +606,8 @@ namespace FineUIPro.Web.common
} }
return result; return result;
} }
else { else
{
int result = 0; int result = 0;
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
@ -708,7 +732,7 @@ namespace FineUIPro.Web.common
private void getInspectionManagementInfo() private void getInspectionManagementInfo()
{ {
if (this.CurrUser.UserId == BLL.Const.hfnbdId) if (this.CurrUser.UserId == BLL.Const.hfnbdId && 1 == 2)
{ {
//var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList(); //var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
var q = (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList(); var q = (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList();
@ -731,7 +755,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.ControlId where x.CNProfessionalId == item.ControlId
select x).Count(); select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).Count(); select x).Count();
} }
else else
@ -740,7 +764,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId) where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId) where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
} }
@ -767,7 +791,7 @@ namespace FineUIPro.Web.common
else else
{ {
var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList(); var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
foreach (var item in q) foreach (var item in q)
{ {
//获取专业 //获取专业
@ -785,7 +809,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.CNProfessionalId where x.CNProfessionalId == item.CNProfessionalId
select x).Count(); select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).Count(); select x).Count();
} }
else else
@ -794,7 +818,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId) where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId) where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
select x).Count(); select x).Count();
} }
@ -839,7 +863,7 @@ namespace FineUIPro.Web.common
protected string ncrCount; protected string ncrCount;
private void getNcrInfo() private void getNcrInfo()
{ {
if (pids==null) if (pids == null)
{ {
//闭环项 有完成日期的 //闭环项 有完成日期的
//var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count(); //var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
@ -888,7 +912,7 @@ namespace FineUIPro.Web.common
ncrZy = ncrZy.TrimEnd(','); ncrZy = ncrZy.TrimEnd(',');
ncrCount = ncrCount.TrimEnd(','); ncrCount = ncrCount.TrimEnd(',');
} }
} }
#endregion #endregion