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-18 15:04:08 +08:00
parent 15781a6969
commit 6ba17f2d02
18 changed files with 1882 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/main_new.aspx
+10 -5
View File
@@ -100,10 +100,10 @@
<div class="y_zlry_label">质量培训累计人员</div>
<div class="y_zlry_value" id="divCqmsPxNum" runat="server">0</div>
</div>
<div class="y_zlmap y_row js-hover" data-type="QualityProblem">
<div class="zgmap" id="zlmap"></div>
<div class="zgmap" id="ycmap"></div>
<div class="zgmap" id="hjmap"></div>
<div class="y_zlmap y_row js-hover">
<div class="zgmap y_row js-hover" id="zlmap" data-type="QualityProblem"></div>
<div class="zgmap y_row js-hover" id="ycmap" data-type="InspectionManagement"></div>
<div class="zgmap y_row js-hover" id="hjmap" data-type="WeldOneOK"></div>
</div>
</div>
</div>
@@ -403,7 +403,12 @@
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量问题数据
window.open("../DataShow/QualityProblem.aspx")
} else if (type == 'ManagerData') {
}else if (type == 'InspectionManagement') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量共检数据
window.open("../DataShow/InspectionManagement.aspx")
}
else if (type == 'ManagerData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
window.open("../DataShow/QualityPerson.aspx")
SGGL/FineUIPro.Web/common/main_new.aspx.cs
+15 -29
View File
@@ -84,18 +84,6 @@ namespace FineUIPro.Web.common
select x).Count();
divCqmsPxNum.InnerText = CqmsPxNum.ToString();
//质量问题
getZlwt();
//质量共检
getZlgj();
//焊接
getHj();
//关键事项
getGjsx();
//在建项目
allProjects = ProjectService.GetAllProjectDropDownList();
int acount = allProjects.Count();
@@ -112,6 +100,18 @@ namespace FineUIPro.Web.common
div_cjrsCount.InnerText = pcount2.ToString();
div_wdgcCount.InnerText = pcount3.ToString();
//质量问题
getZlwt();
//质量共检
getZlgj();
//焊接
getHj();
//关键事项
getGjsx();
//人员信息
getSitePerson();
@@ -571,28 +571,14 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
var ndtLists = from x in db.HJGL_FL_NdtList select x;
////一次检测合格焊口数
//int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
// join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
// join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
// join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
// where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
// select x.NDEItemID).Count();
////一次检测返修焊口数
//int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
// join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
// join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
// join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
// where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2"
// select x.NDEItemID).Count();
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New select x;
if (ndtLists.Count() > 0)
{
decimal a = 0, b = 0;
foreach (var item in ndtLists)
{
a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
//a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
//b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
}
if (b > 0)
{
SGGL/FineUIPro.Web/common/main_new1.aspx
+2 -2
View File
@@ -142,11 +142,11 @@
<div class="zl-number" style="color: #2BFAFF;"><%=getAllInspectionManagement() %></div>
</div>
<div class="y_image_default y_column" style="width: 2.7625rem;">
<div class="zl-label">-次合格数量</div>
<div class="zl-label">一次合格数量</div>
<div class="zl-number" style="color: #FF7474;"><%=getIsOnceInspectionManagement() %></div>
</div>
<div class="y_image_default y_column" style="width: 2.7625rem;">
<div class="zl-label">-次验收合格率</div>
<div class="zl-label">一次验收合格率</div>
<div class="zl-number" style="color: #FFA602;"><%=GetInspectionManagementZgl() %></div>
</div>
</div>
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+31 -18
View File
@@ -57,7 +57,8 @@ namespace FineUIPro.Web.common
unitId = thisUnit.UnitId;
}
int result = (from x in Funs.DB.Person_CompanyBranchPerson
where x.IsOnJob == true && x.UnitId == unitId
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.IsOnJob == true && x.UnitId == unitId && y.IsCQMS == true
select x).Count();
return result;
}
@@ -74,7 +75,8 @@ namespace FineUIPro.Web.common
unitId = thisUnit.UnitId;
}
int result = (from x in Funs.DB.Person_CompanyBranchPerson
where x.IsOnJob == true && x.UnitId != unitId
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.IsOnJob == true && x.UnitId != unitId && y.IsCQMS == true
select x).Count();
return result;
}
@@ -182,10 +184,12 @@ namespace FineUIPro.Web.common
int result = 0;
;
//统计所给时间段的全部数量
List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
result = managementListSunNumber.Count;
//List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
// BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
// null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
select x).Count();
result = num1;
//int result = (from x in Funs.DB.Check_CheckControl
// where x.CheckDate <= DateTime.Now && x.State == "7"
// select x).Count();
@@ -199,10 +203,13 @@ namespace FineUIPro.Web.common
{
int result = 0;
//统计所给时间段的合格数量
List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
result = managementListOneNumber.Count;
//List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
// BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
// null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true
select x).Count();
result = num2;
//int result = (from x in Funs.DB.Check_CheckControl
// where x.CheckDate <= DateTime.Now && x.State != "7"
@@ -422,17 +429,23 @@ namespace FineUIPro.Web.common
//获取专业
InspectionManagementZy += "'" + item.ProfessionalName + "',";
//根据专业获取总计
var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where y.CNProfessionalId == item.CNProfessionalId
select x).ToList().Count;
//var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
// where y.CNProfessionalId == item.CNProfessionalId
// select x).ToList().Count;
var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId
select x).Count();
InspectionManagementSumCount += "'"+ num1 + "',";
//根据专业获取合格数
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where y.CNProfessionalId == item.CNProfessionalId && y.IsOnceQualified==true
select x).ToList().Count;
//var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
// where y.CNProfessionalId == item.CNProfessionalId && y.IsOnceQualified==true
// select x).ToList().Count;
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
select x).Count();
InspectionManagementOkCount += "'" + num2 + "',";
//一次验收合格率