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

提交代码

Browse Source
This commit is contained in:
高飞
2024-04-19 15:48:37 +08:00
parent 8f650add98
commit ae229cb24e
22 changed files with 1565 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/main_new.aspx
+9 -1
View File
@@ -108,7 +108,7 @@
</div>
</div>
<div class="y_box">
<div class="y_box_label y_image_default">关键事项 <span class="y_more">更多></span></div>
<div class="y_box_label y_image_default">关键事项 <span class="y_more js-hover" data-type="GJSX">更多></span></div>
<div class="y_box_main">
<!-- <div class="y_aq y_row" style="margin-top: .25rem;">
<div class="y_aq_box y_image_default y_row">
@@ -407,6 +407,14 @@
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量共检数据
window.open("../DataShow/InspectionManagement.aspx")
}else if (type == 'WeldOneOK') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //焊接一次合格数据
window.open("../DataShow/WeldOneOK.aspx")
}else if (type == 'GJSX') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //关键事项数据
window.open("../DataShow/GJSX.aspx")
}
else if (type == 'ManagerData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
SGGL/FineUIPro.Web/common/main_new.aspx.cs
+41 -14
View File
@@ -571,27 +571,54 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New select x;
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName== "工艺管道" select x;
decimal a = 0, b = 0;
if (ndtLists.Count() > 0)
{
decimal a = 0, b = 0;
foreach (var item in ndtLists)
foreach (var project in allProjects)
{
//a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
//b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString();
hjDataValue = (100 - result).ToString();
var ndt = (from x in ndtLists
where x.ProjectId == project.ProjectId
orderby x.CreateDate descending
select x).FirstOrDefault();
if (ndt != null)
{
if (ndt.TotalQuantity.HasValue)
{
a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
b += ndt.TotalQuantity.Value;
}
}
}
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString();
hjDataValue = (100 - result).ToString();
}
//if (ndtLists.Count() > 0)
//{
// foreach (var item in ndtLists)
// {
// //a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
// //b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
// }
// if (b > 0)
// {
// result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
// hjallNumber = b.ToString();
// hjfinishNumber = a.ToString();
// hjzgl = result.ToString();
// hjDataValue = (100 - result).ToString();
// }
//}
}
#endregion
SGGL/FineUIPro.Web/common/main_new1.aspx
+3 -3
View File
@@ -171,15 +171,15 @@
<div class="hj-box_label">完成达因数</div>
</div>
<div class="y_column">
<div class="hj-box_number"><%=GetTotalFilmNum() %></div>
<div class="hj-box_number"><%=hjallNumber %></div>
<div class="hj-box_label">拍片总数</div>
</div>
<div class="y_column">
<div class="hj-box_number" style="color: #12CDA2;"><%=GetOKFilmNum() %></div>
<div class="hj-box_number" style="color: #12CDA2;"><%=hjfinishNumber %></div>
<div class="hj-box_label">合格片数</div>
</div>
<div class="y_column">
<div class="hj-box_number" style="color: #FFA602;"><%=GetOKFilmHgl() %></div>
<div class="hj-box_number" style="color: #FFA602;"><%=hjzgl %></div>
<div class="hj-box_label">一次拍片合格率</div>
</div>
</div>
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+67 -31
View File
@@ -15,6 +15,9 @@ namespace FineUIPro.Web.common
public partial class main_new1 : PageBase
{
protected string divProjectImg;
protected string hjallNumber = "0";
protected string hjfinishNumber = "0";
protected string hjzgl = "0";
/// <summary>
/// 页面加载
/// </summary>
@@ -23,7 +26,7 @@ namespace FineUIPro.Web.common
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
if (this.drpProject.Items.Count > 0)
{
@@ -41,6 +44,40 @@ namespace FineUIPro.Web.common
//资质预警
getEarlyWarningCounts();
//在建项目
var allProjects = ProjectService.GetAllProjectDropDownList();
//焊接数据
double result = 0;
Model.SGGLDB db = Funs.DB;
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
decimal a = 0, b = 0;
if (ndtLists.Count() > 0)
{
foreach (var project in allProjects)
{
var ndt = (from x in ndtLists
where x.ProjectId == project.ProjectId
orderby x.CreateDate descending
select x).FirstOrDefault();
if (ndt != null)
{
if (ndt.TotalQuantity.HasValue)
{
a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
b += ndt.TotalQuantity.Value;
}
}
}
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString() + "%";
}
}
}
@@ -120,14 +157,15 @@ namespace FineUIPro.Web.common
/// 机械预警
/// </summary>
/// <returns></returns>
public static int GetJxyjNum() {
public static int GetJxyjNum()
{
int result = 0;
//机具报验的到期提醒和过期提醒记录数加一起
//机具报验的到期提醒数
var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
&& ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
//过期提醒记录数
var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate<DateTime.Now).Count();
var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
result = num1 + num2;
return result;
}
@@ -138,9 +176,8 @@ namespace FineUIPro.Web.common
/// <returns></returns>
public static int GetTrainPersonNum()
{
DateTime date = DateTime.Now.AddDays(-1);
int result = (from x in Funs.DB.Comprehensive_InspectionPerson
where x.IsTrain == true && x.CompileDate.Value.Year == date.Year && x.CompileDate.Value.Month == date.Month && x.CompileDate.Value.Day == date.Day
where x.IsTrain == true
select x).Count();
return result;
}
@@ -151,10 +188,8 @@ namespace FineUIPro.Web.common
/// <returns></returns>
public static int GetTechnicalDisclosePersonNum()
{
DateTime date = DateTime.Now.AddDays(-1);
var result = (from x in Funs.DB.Comprehensive_DesignDetails
where x.DetailsDate.Value.Year == date.Year && x.DetailsDate.Value.Month == date.Month && x.DetailsDate.Value.Day == date.Day
select x.JoinPersonNum??0).ToList().Sum();
select x.JoinPersonNum ?? 0).ToList().Sum();
var q = Funs.GetNewIntOrZero(result.ToString());
return q;
}
@@ -372,8 +407,8 @@ namespace FineUIPro.Web.common
int result = 0;
var getD2 = (from x in Funs.DB.HJGL_FL_Data
orderby x.CompileDate descending
select x).FirstOrDefault();
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
@@ -388,8 +423,8 @@ namespace FineUIPro.Web.common
{
int result = 0;
var getD2 = (from x in Funs.DB.HJGL_FL_Data
orderby x.CompileDate descending
select x).FirstOrDefault();
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
@@ -404,7 +439,7 @@ namespace FineUIPro.Web.common
public static string GetOKFilmHgl()
{
string zgl = "0";
if (GetOKFilmNum()>0)
if (GetOKFilmNum() > 0)
{
zgl = String.Format("{0:N2}", 100.0 * GetOKFilmNum() / GetTotalFilmNum());
}
@@ -421,8 +456,9 @@ namespace FineUIPro.Web.common
protected string InspectionManagementOkCount;
//一次验收合格率
protected string InspectionManagementOneOkCount;
private void getInspectionManagementInfo() {
private void getInspectionManagementInfo()
{
var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
foreach (var item in q)
{
@@ -436,7 +472,7 @@ namespace FineUIPro.Web.common
var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId
select x).Count();
InspectionManagementSumCount += "'"+ num1 + "',";
InspectionManagementSumCount += "'" + num1 + "',";
//根据专业获取合格数
//var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
@@ -450,9 +486,9 @@ namespace FineUIPro.Web.common
//一次验收合格率
var hgl = "0";
if (num1>0)
if (num1 > 0)
{
hgl+= String.Format("{0:N2}", 100.0 * num2 / num1);
hgl += String.Format("{0:N2}", 100.0 * num2 / num1);
}
InspectionManagementOneOkCount += "'" + hgl + "',";
}
@@ -470,7 +506,7 @@ namespace FineUIPro.Web.common
//未整改完成项
protected string ncrwZgbhx;
//整改率
protected string ncrZgl="0%";
protected string ncrZgl = "0%";
//图表数据
//专业
@@ -481,23 +517,23 @@ namespace FineUIPro.Web.common
//闭环项 有完成日期的
//var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
//var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate == null).Count();
var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.Status=="3").Count();
var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => !x.Status.Equals('3') ||x.Status ==null).Count();
var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "已闭合").Count();
var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "整改中").Count();
ncrZgbhx = num1.ToString();
ncrwZgbhx = num2.ToString();
if ((num1 + num2) >0)
if ((num1 + num2) > 0)
{
ncrZgl= String.Format("{0:N2}", 100.0 * num1 / (num1 + num2))+"%";
ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
}
//加载专业
var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
foreach (var item in list)
{
ncrZy += "'"+item.ProfessionalName+"',";
ncrZy += "'" + item.ProfessionalName + "',";
//根据专业加载数据量
var num3= Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId==item.CNProfessionalId).Count();
ncrCount += "'"+num3+"',";
var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId).Count();
ncrCount += "'" + num3 + "',";
}
ncrZy = ncrZy.TrimEnd(',');
ncrCount = ncrCount.TrimEnd(',');
@@ -542,7 +578,7 @@ namespace FineUIPro.Web.common
{
isHiddDefaultImg = true;
divProjectImg += string.Format(" <div class=\"swiper-slide\"><img src=\"{0}\"></div>",
atturl.Replace(Funs.RootPath, "/"));
atturl.Replace(Funs.RootPath, "/"));
}
}
}
@@ -556,10 +592,10 @@ namespace FineUIPro.Web.common
}
string jsCode = "var swiperWrapper = document.getElementById('swiper-wrapper');";
jsCode += "swiperWrapper.innerHTML = '" + divProjectImg + "';";
string script2 = " createSwiper();";
PageContext.RegisterStartupScript(jsCode);
PageContext.RegisterStartupScript(script2);
string script2 = " createSwiper();";
PageContext.RegisterStartupScript(jsCode);
PageContext.RegisterStartupScript(script2);
}
}
}