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-28 14:14:52 +08:00
parent fbc54e00b2
commit 176ae6433b
10 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx
+30 -12
View File
@@ -617,7 +617,7 @@
data: two2.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -635,7 +635,7 @@
data: two2.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -739,12 +739,30 @@
type: 'bar',
barGap: 0,
data: three.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['50%', '30%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '焊接一次拍片合格率',
type: 'bar',
data: three.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['50%', '30%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
barCategoryGap: 10,
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
}]
@@ -909,7 +927,7 @@
data: two.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -926,7 +944,7 @@
data: two.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -949,7 +967,7 @@
data: two2.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -966,7 +984,7 @@
data: two2.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -990,7 +1008,7 @@
data: two3.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -1007,7 +1025,7 @@
data: two3.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
position: ['40%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
@@ -1033,7 +1051,7 @@
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '施工资料同步率',
name: '焊接一次拍片合格率',
type: 'bar',
data: three.series[1].data,
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
@@ -1048,7 +1066,7 @@
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '施工资料同步率',
name: '焊接一次拍片合格率',
type: 'bar',
data: three2.series[1].data,
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
@@ -1065,7 +1083,7 @@
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '施工资料同步率',
name: '焊接一次拍片合格率',
type: 'bar',
data: four.series[1].data,
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
@@ -1079,7 +1097,7 @@
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '施工资料同步率',
name: '焊接一次拍片合格率',
type: 'bar',
data: four2.series[1].data,
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+14 -7
View File
@@ -24,8 +24,13 @@ namespace FineUIPro.Web
{
get
{
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailLists = SpotCheckDetailService.GetTotalAllSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
var db = new Model.SGGLDB(Funs.ConnString);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
double result = 0;
if (TotalCheckDetailOKLists.Count > 0 && TotalCheckDetailLists.Count > 0)
{
@@ -48,7 +53,7 @@ namespace FineUIPro.Web
if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
{
result = Convert.ToDouble(ndtList.TotalRate) / 100;
result = Convert.ToDouble(ndtList.TotalRate);
}
return JsonConvert.SerializeObject(result);
}
@@ -60,12 +65,14 @@ namespace FineUIPro.Web
{
get
{
List<Model.View_Check_JointCheckDetail> totalCheckLists = JointCheckDetailService.GetTotalJointCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
int a = totalCheckLists.Where(x => x.OK == 1).Count();
var checks = from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId == CurrUser.LoginProjectId
select x;
int a = checks.Where(x => x.State == "7").Count();
double result = 0;
if (a > 0 && totalCheckLists.Count > 0)
if (a > 0 && checks.Count() > 0)
{
var b = Convert.ToDouble(totalCheckLists.Count);
var b = Convert.ToDouble(checks.Count());
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
return JsonConvert.SerializeObject(result);
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+2 -1
View File
@@ -105,7 +105,8 @@ namespace FineUIPro.Web.common
divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
//施工审批量
int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == Const.CQMSConstructSolution_Complete).Count();
int sgspl = Funs.DB.Comprehensive_GeneralPlanApproval.Where(x => x.ProjectId == ProjectId && x.AuditMan != null && x.AuditMan != "" && x.ApprovalMan != null && x.ApprovalMan != "").Count()
+ Funs.DB.Comprehensive_MajorPlanApproval.Where(x => x.ProjectId == ProjectId && x.AuditMan != null && x.AuditMan != "" && x.ApprovalMan != null && x.ApprovalMan != "").Count();
div_sgfaSpl.InnerHtml = sgspl.ToString();
GetJD();
//质量共检
SGGL/FineUIPro.Web/common/main_new.aspx
+6 -1
View File
@@ -96,7 +96,7 @@
<div class="y_zlry_label">质量管理人员</div>
<div class="y_zlry_value" id="divCqmsManageNum" runat="server">0</div>
</div>
<div class="y_zlry y_row y_image_default js-hover" data-type="ManagerData" style="margin-top: .125rem;">
<div class="y_zlry y_row y_image_default js-hover" data-type="ManagerTrainData" style="margin-top: .125rem;">
<div class="y_zlry_label">质量培训累计人员</div>
<div class="y_zlry_value" id="divCqmsPxNum" runat="server">0</div>
</div>
@@ -439,6 +439,11 @@
window.open("../DataShow/QualityPerson.aspx")
title = '管理人员数据'
}else if (type == 'ManagerTrainData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityTraining.aspx') //质量培训人员数据
window.open("../DataShow/QualityTraining.aspx")
title = '质量培训人员数据'
} else if (type == 'ProjectData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
window.open("../DataShow/Project.aspx")