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

提交代码

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SGGL/FineUIPro.Web/DataShow/GJSX.aspx
View File

@ -53,11 +53,21 @@
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="数量" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="总数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="已完成数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="未完成数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

28
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
View File

@ -188,14 +188,14 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State == "0");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.InspectionDate >= datetime1);
getT = getT.Where(x => x.CreateDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.InspectionDate <= datetime2);
getT = getT.Where(x => x.CreateDate <= datetime2);
}
cout1 = getT.Count();
@ -203,32 +203,26 @@ namespace FineUIPro.Web.DataShow
return cout1;
}
protected string Count4(object projectId)
protected int Count3(object projectId)
{
string rate = string.Empty;
int cout1 = 0;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0");
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
getT = getT.Where(x => x.CreateDate >= datetime1);
}
if (datetime2.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
int coutall = getALL.Count();
int cout0 = getT.Count();
if (coutall > 0)
{
rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
getT = getT.Where(x => x.CreateDate <= datetime2);
}
cout1 = getT.Count();
}
return rate;
return cout1;
}
}
}

18
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs generated
View File

@ -120,6 +120,24 @@ namespace FineUIPro.Web.DataShow {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

4
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
View File

@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.IsOnJob,Person.Remark, '' as ProjectName "
+ @" FROM Person_CompanyBranchPerson AS Person "
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsOnJob=1 and WorkPost.IsCQMS=1 ";
string UnitId = BLL.Const.UnitId_CWCEC;
if (this.rbCom.SelectedValue == "1")
{
@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
FROM SitePerson_Person AS Person
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 ";
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

42
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx
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)' } }

21
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
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);

3
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
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();
//质量共检

7
SGGL/FineUIPro.Web/common/main_new.aspx
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")

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />