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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
高飞 2024-06-26 09:08:38 +08:00
parent 744f1293ed fa6fd2d947
commit b5ede0cda8
11 changed files with 330 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
DataBase/版本日志/SGGLDB_WH_2024-06-26-wq.sql Normal file
View File

@ -0,0 +1,33 @@
--删除字段
alter table Running_Operation drop column RunningId;
alter table Running_Operation drop column InstallationId;
alter table Running_Operation drop column ProcessesId;
alter table Running_Operation drop column SystemId;
alter table Running_Maintenance drop column RunningId;
alter table Running_Maintenance drop column InstallationId;
alter table Running_Maintenance drop column ProcessesId;
alter table Running_Maintenance drop column SystemId;
--添加附属字段
alter table Running_LogManagement add MainId varchar(50) null;
alter table Running_Operation add MainId varchar(50) null;
alter table Running_Maintenance add MainId varchar(50) null;
if object_id(N'Running_LogMain',N'U') is not null
drop table dbo.Running_LogMain
CREATE TABLE dbo.Running_LogMain(
MainId varchar(50) NOT NULL,--主键
ProjectId varchar(50) NULL,--项目主键
JobNo varchar(50) NULL,--文件号
ShiftType varchar(50) NULL,--轮班类型1:白班2:夜班
StartData datetime NULL,--开始日期
EndData datetime NULL,--结束日期
AddUser varchar(50) NULL,--添加人
AddTime datetime NULL,--添加日期
CONSTRAINT PK_Running_LogMain PRIMARY KEY CLUSTERED
(
MainId ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO

18
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -1365,12 +1365,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
c.ProjectId,
u.UnitId,
u.UnitName,
c.CompileDate
c.InspectionDate
};
var AllList = query.ToList();
var monethCount = query
.Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
.Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
@ -1517,8 +1517,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
CheckLotBindStatisc("PP");//检验批统计:管道
CheckLotBindStatisc("EL");//检验批统计:电气
CheckLotBindStatisc("IN");//检验批统计:仪表
CheckLotBindStatisc("FF");//检验批统计:反腐
CheckLotBindStatisc("XF");//检验批统计:消防
CheckLotBindStatisc("AC");//检验批统计:反腐
CheckLotBindStatisc("FF");//检验批统计:消防
#region 现场质量共检数据合计
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
@ -1548,7 +1548,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
from u in unitJoin.DefaultIfEmpty()
select new
{
c.CheckDate,
c.InspectionDate,
c.ProjectId,
u.UnitId,
u.UnitName,
@ -1560,7 +1560,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
x.CheckDate,
x.InspectionDate,
x.ProjectId,
x.UnitId,
x.UnitName,
@ -1568,7 +1568,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
};
var AllList = query.ToList();
var monethCount = query
.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
.Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
@ -1841,7 +1841,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
GvYb.SummaryData = summary;
}
//检验批统计:防腐
if (cNProfessionalCode == "FF")
if (cNProfessionalCode == "AC")
{
this.GvFf.DataSource = StatisticsList;
this.GvFf.DataBind();
@ -1860,7 +1860,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
GvFf.SummaryData = summary;
}
//检验批统计:消防
if (cNProfessionalCode == "XF")
if (cNProfessionalCode == "FF")
{
this.GvXf.DataSource = StatisticsList;
this.GvXf.DataBind();

12
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
View File

@ -69,15 +69,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl
strSql += " AND P.CNProfessionalId=@CNProfessionalId";
listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
if (!string.IsNullOrEmpty(txtStarTime.Text))
{
strSql += " AND P.InspectionDate >= @InspectionDate";
listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
strSql += " AND P.InspectionDate >= @startTime";
listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text)));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
if (!string.IsNullOrEmpty(txtEndTime.Text))
{
strSql += " AND P.InspectionDate <= @InspectionDate";
listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
strSql += " AND P.InspectionDate <= @endTime";
listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text)));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

8
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
View File

@ -71,13 +71,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND P.InspectionDate >= @InspectionDate";
listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
strSql += " AND P.InspectionDate >= @startTime";
listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND P.InspectionDate <= @InspectionDate";
listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
strSql += " AND P.InspectionDate <= @endTime";
listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

30
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1,30 +0,0 @@
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 BLL.APIGetHttpService.Http(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 62
在 BLL.CNCECHSSEWebService.UpCheck_CheckRectify(String checkRectifyId, Sys_User CurrUser) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1302
出错时间:06/21/2024 15:57:07
出错时间:06/21/2024 15:57:07
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 BLL.APIGetHttpService.Http(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 62
在 BLL.CNCECHSSEWebService.UpCheck_CheckRectify(String checkRectifyId, Sys_User CurrUser) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1302
出错时间:06/21/2024 16:03:12
出错时间:06/21/2024 16:03:12
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 BLL.APIGetHttpService.Http(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 62
在 BLL.CNCECHSSEWebService.UpCheck_CheckRectify(String checkRectifyId, Sys_User CurrUser) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1302
出错时间:06/21/2024 16:04:10
出错时间:06/21/2024 16:04:10

4
SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx
View File

@ -173,7 +173,7 @@
<Items>
<f:Grid ID="gvOperation" ShowBorder="true" ShowHeader="false" runat="server" Height="400px"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="OperationId" ForceFit="true"
DataKeyNames="OperationId,RunningId,InstallationId,ProcessesId,SystemId" EnableMultiSelect="false" ShowGridHeader="true"
DataKeyNames="OperationId,MainId" EnableMultiSelect="false" ShowGridHeader="true"
EnableColumnLines="true" OnRowCommand="gvOperation_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar2" runat="server">
@ -219,7 +219,7 @@
<Items>
<f:Grid ID="gvMaintenance" ShowBorder="true" ShowHeader="false" runat="server" Height="400px"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="MaintenanceId" ForceFit="true"
DataKeyNames="MaintenanceId,RunningId,InstallationId,ProcessesId,SystemId" EnableMultiSelect="false" ShowGridHeader="true"
DataKeyNames="MaintenanceId,MainId" EnableMultiSelect="false" ShowGridHeader="true"
EnableColumnLines="true" OnRowCommand="gvMaintenance_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar3" runat="server">

303
SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementEdit.aspx.cs
View File

@ -1,6 +1,7 @@
using BLL;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.ProjectData;
using Microsoft.Office.Interop.Word;
using Model;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
@ -20,13 +21,13 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// <summary>
/// 日志
/// </summary>
public string RunningId { get { return (string)ViewState["RunningId"]; } set { ViewState["RunningId"] = value; } }
public string MainId { get { return (string)ViewState["MainId"]; } set { ViewState["MainId"] = value; } }
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.RunningId = Request["RunningId"];
this.MainId = Request["MainId"];
PageBase();
}
}
@ -101,28 +102,25 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
ddlSuccessionUser.DataSource = users;
ddlSuccessionUser.DataBind();
ddlSuccessionUser.SelectedValue = this.CurrUser.UserId;
List<string> options = new List<string>();
var model = Funs.DB.Running_LogManagement.FirstOrDefault(x => x.RunningId == this.RunningId);
if (model != null)
var mainModel = Funs.DB.Running_LogMain.FirstOrDefault(x => x.MainId == this.MainId);
if (mainModel != null)
{
options.Add(model.SystemId);
txtJobNo.Text = model.JobNo;
ddlShiftUser.SelectedValue = model.ShiftUser;
ddlSuccessionUser.SelectedValue = model.SuccessionUser;
txtStartData.Text = model.StartData.Value.ToString("yyyy-MM-dd HH:mm:ss");
txtEndData.Text = model.EndData.Value.ToString("yyyy-MM-dd HH:mm:ss");
txtHandoverCare.Text = model.HandoverCare;
var dataInstall = alllist.FirstOrDefault(x => x.PreRunId == model.InstallationId);
if (dataInstall.PreRunName == "公用工程")
{
rdbEngineeringOperation.SelectedValueArray = options.ToArray();
EngineeringDataBrid();
}
if (dataInstall.PreRunName == "工艺装置")
{
rdbDeviceOption.SelectedValueArray = options.ToArray();
DriveDataBrid();
}
var managements = Funs.DB.Running_LogManagement.Where(x => x.MainId == this.MainId).ToList();
var manaModel = managements.FirstOrDefault();
var options = managements.ConvertAll(x => x.SystemId);
txtJobNo.Text = mainModel.JobNo;
ddlShiftUser.SelectedValue = manaModel.ShiftUser;
ddlSuccessionUser.SelectedValue = manaModel.SuccessionUser;
txtStartData.Text = mainModel.StartData.Value.ToString("yyyy-MM-dd HH:mm:ss");
txtEndData.Text = mainModel.EndData.Value.ToString("yyyy-MM-dd HH:mm:ss");
txtHandoverCare.Text = manaModel.HandoverCare;
rdbEngineeringOperation.SelectedValueArray = options.ToArray();
EngineeringDataBrid();
rdbDeviceOption.SelectedValueArray = options.ToArray();
DriveDataBrid();
gvOperationBrid();
gvMaintenanceBrid();
}
@ -241,25 +239,39 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
ShowNotify("请添加维护问题!", MessageBoxIcon.Warning);
return;
}
var main = Funs.DB.Running_LogMain.FirstOrDefault(x => x.MainId == this.MainId);
var addlist = new List<Running_LogManagement>();
var addoptionlist = new List<Running_Operation>();
var addmaintenancelist = new List<Running_Maintenance>();
var ids = list.ConvertAll(x => x.RunningId);
var existlist = Funs.DB.Running_LogManagement.Where(x => ids.Contains(x.RunningId)).ToList();
//删除系统日志记录
var deleteRunnings = Funs.DB.Running_LogManagement.Where(x => x.MainId == this.MainId);
if (deleteRunnings.Count() > 0)
{
Funs.DB.Running_LogManagement.DeleteAllOnSubmit(deleteRunnings);
Funs.DB.SubmitChanges();
}
bool add = false;
if (main == null)
{
add = true;
main = new Running_LogMain();
main.MainId = Guid.NewGuid().ToString();
main.AddUser = this.CurrUser.UserId;
main.AddTime = DateTime.Now;
}
main.ProjectId = this.CurrUser.LoginProjectId;
main.JobNo = txtJobNo.Text;
main.ShiftType = ddlShiftType.SelectedValue;
main.StartData = DateTime.Parse(txtStartData.Text);
main.EndData = DateTime.Parse(txtEndData.Text);
if (add) Funs.DB.Running_LogMain.InsertOnSubmit(main);
//子系统
foreach (var item in list)
{
bool add = false;
var model = existlist.FirstOrDefault(x => x.RunningId == this.RunningId);
if (model == null)
{
add = true;
model = new Running_LogManagement();
model.RunningId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.AddUser = this.CurrUser.UserId;
model.AddTime = DateTime.Now;
}
var model = new Running_LogManagement();
model.RunningId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.MainId = main.MainId;
model.InstallationId = item.InstallationId;
model.ProcessesId = item.ProcessesId;
model.SystemId = item.SystemId;
@ -272,58 +284,50 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
model.EndData = DateTime.Parse(txtEndData.Text);
model.Situation = item.Situation;
model.Remarks = item.Remarks;
foreach (var itemoption in optionlist)
{
addoptionlist.Add(new Running_Operation()
{
OperationId = Guid.NewGuid().ToString(),
RunningId = model.RunningId,
InstallationId = item.InstallationId,
ProcessesId = item.ProcessesId,
SystemId = item.SystemId,
OperationReason = itemoption.OperationReason,
OperationHandle = itemoption.OperationHandle,
ProjectId = this.CurrUser.LoginProjectId,
AddUser = this.CurrUser.UserId,
AddTime = DateTime.Now,
});
}
foreach (var itemmain in maintenancelist)
{
addmaintenancelist.Add(new Running_Maintenance()
{
MaintenanceId = Guid.NewGuid().ToString(),
RunningId = model.RunningId,
InstallationId = item.InstallationId,
ProcessesId = item.ProcessesId,
SystemId = item.SystemId,
MaintenanceReason = itemmain.MaintenanceReason,
MaintenanceHandle = itemmain.MaintenanceHandle,
ProjectId = this.CurrUser.LoginProjectId,
AddUser = this.CurrUser.UserId,
AddTime = DateTime.Now,
});
}
if (add)
{
Funs.DB.SubmitChanges();
addlist.Add(model);
}
else
{
Funs.DB.SubmitChanges();
}
model.AddUser = this.CurrUser.UserId;
model.AddTime = DateTime.Now;
model.Sort = item.Sort;
addlist.Add(model);
}
//操作问题
foreach (var itemoption in optionlist)
{
addoptionlist.Add(new Running_Operation()
{
OperationId = Guid.NewGuid().ToString(),
MainId = main.MainId,
OperationReason = itemoption.OperationReason,
OperationHandle = itemoption.OperationHandle,
ProjectId = this.CurrUser.LoginProjectId,
AddUser = this.CurrUser.UserId,
AddTime = DateTime.Now,
});
}
//维护问题
foreach (var itemmain in maintenancelist)
{
addmaintenancelist.Add(new Running_Maintenance()
{
MaintenanceId = Guid.NewGuid().ToString(),
MainId = main.MainId,
MaintenanceReason = itemmain.MaintenanceReason,
MaintenanceHandle = itemmain.MaintenanceHandle,
ProjectId = this.CurrUser.LoginProjectId,
AddUser = this.CurrUser.UserId,
AddTime = DateTime.Now,
});
}
if (addlist.Count > 0) Funs.DB.Running_LogManagement.InsertAllOnSubmit(addlist);
var runIds = list.ConvertAll(x => x.RunningId);
var deleteOperas = Funs.DB.Running_Operation.Where(x => runIds.Contains(x.RunningId)).ToList();
var deleteOperas = Funs.DB.Running_Operation.Where(x => x.MainId == this.MainId).ToList();
if (deleteOperas.Count > 0)
{
Funs.DB.Running_Operation.DeleteAllOnSubmit(deleteOperas);
Funs.DB.SubmitChanges();
}
var deleteMaints = Funs.DB.Running_Maintenance.Where(x => runIds.Contains(x.RunningId)).ToList();
var deleteMaints = Funs.DB.Running_Maintenance.Where(x => x.MainId == this.MainId).ToList();
if (deleteMaints.Count > 0)
{
Funs.DB.Running_Maintenance.DeleteAllOnSubmit(deleteMaints);
@ -342,40 +346,45 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// </summary>
public void EngineeringDataBrid(List<Running_LogManagementDto> list = null)
{
if (list == null) list = new List<Running_LogManagementDto>();
var engineeringModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && x.PreRunName.Trim() == "公用工程");
if (engineeringModel == null)
{
list = new List<Running_LogManagementDto>();
gvEngineeringOption.DataSource = list;
gvEngineeringOption.DataBind();
return;
}
var query = from a in Funs.DB.Running_LogManagement
join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId
where a.RunningId == this.RunningId && a.InstallationId == engineeringModel.PreRunId
select new Running_LogManagementDto
{
RunningId = a.RunningId,
ProjectId = a.ProjectId,
InstallationId = a.InstallationId,
ProcessesId = a.ProcessesId,
SystemId = a.SystemId,
SystemName = b.PreRunName,
JobNo = a.JobNo,
ShiftType = a.ShiftType,
ShiftUser = a.ShiftUser,
SuccessionUser = a.SuccessionUser,
StartData = a.StartData,
EndData = a.EndData,
Situation = a.Situation,
Remarks = a.Remarks,
HandoverCare = a.HandoverCare,
AddUser = a.AddUser,
AddTime = a.AddTime
};
if (list == null)
{
list = new List<Running_LogManagementDto>();
var query = from a in Funs.DB.Running_LogManagement
join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId
where a.MainId == this.MainId && a.InstallationId == engineeringModel.PreRunId
orderby a.Sort ascending
select new Running_LogManagementDto
{
RunningId = a.RunningId,
ProjectId = a.ProjectId,
InstallationId = a.InstallationId,
ProcessesId = a.ProcessesId,
SystemId = a.SystemId,
SystemName = b.PreRunName,
JobNo = a.JobNo,
ShiftType = a.ShiftType,
ShiftUser = a.ShiftUser,
SuccessionUser = a.SuccessionUser,
StartData = a.StartData,
EndData = a.EndData,
Situation = a.Situation,
Remarks = a.Remarks,
HandoverCare = a.HandoverCare,
AddUser = a.AddUser,
AddTime = a.AddTime
};
var data = query.ToList();
if (data.Count > 0) list.AddRange(data);
var data = query.ToList();
if (data.Count > 0) list.AddRange(data);
}
gvEngineeringOption.DataSource = list;
gvEngineeringOption.DataBind();
}
@ -404,6 +413,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
Remarks = values.Value<string>("Remarks"),
AddUser = CurrUser.UserId,
AddTime = DateTime.Now,
Sort = i + 1
});
}
return massQuestionLs;
@ -414,40 +424,46 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// </summary>
public void DriveDataBrid(List<Running_LogManagementDto> list = null)
{
if (list == null) list = new List<Running_LogManagementDto>();
var deviceModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && x.PreRunName.Trim() == "工艺装置");
if (deviceModel == null)
{
list = new List<Running_LogManagementDto>();
gvDeviceOption.DataSource = list;
gvDeviceOption.DataBind();
return;
}
var query = from a in Funs.DB.Running_LogManagement
join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId
where a.RunningId == this.RunningId && a.InstallationId == deviceModel.PreRunId
select new Running_LogManagementDto
{
RunningId = a.RunningId,
ProjectId = a.ProjectId,
InstallationId = a.InstallationId,
ProcessesId = a.ProcessesId,
SystemId = a.SystemId,
SystemName = b.PreRunName,
JobNo = a.JobNo,
ShiftType = a.ShiftType,
ShiftUser = a.ShiftUser,
SuccessionUser = a.SuccessionUser,
StartData = a.StartData,
EndData = a.EndData,
Situation = a.Situation,
Remarks = a.Remarks,
HandoverCare = a.HandoverCare,
AddUser = a.AddUser,
AddTime = a.AddTime
};
if (list == null)
{
list = new List<Running_LogManagementDto>();
var query = from a in Funs.DB.Running_LogManagement
join b in Funs.DB.PreRun_SysDevice on a.SystemId equals b.PreRunId
where a.MainId == this.MainId && a.InstallationId == deviceModel.PreRunId
orderby a.Sort ascending
select new Running_LogManagementDto
{
RunningId = a.RunningId,
ProjectId = a.ProjectId,
InstallationId = a.InstallationId,
ProcessesId = a.ProcessesId,
SystemId = a.SystemId,
SystemName = b.PreRunName,
JobNo = a.JobNo,
ShiftType = a.ShiftType,
ShiftUser = a.ShiftUser,
SuccessionUser = a.SuccessionUser,
StartData = a.StartData,
EndData = a.EndData,
Situation = a.Situation,
Remarks = a.Remarks,
HandoverCare = a.HandoverCare,
AddUser = a.AddUser,
AddTime = a.AddTime,
Sort = a.Sort
};
var data = query.ToList();
if (data.Count > 0) list.AddRange(data);
var data = query.ToList();
if (data.Count > 0) list.AddRange(data);
}
gvDeviceOption.DataSource = list;
gvDeviceOption.DataBind();
}
@ -476,6 +492,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
Remarks = values.Value<string>("Remarks"),
AddUser = CurrUser.UserId,
AddTime = DateTime.Now,
Sort = i + 1
});
}
return massQuestionLs;
@ -493,7 +510,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// </summary>
public void gvOperationBrid()
{
var list = Funs.DB.Running_Operation.Where(x => x.RunningId == this.RunningId).ToList();
var query = from a in Funs.DB.Running_Operation join b in Funs.DB.Running_LogMain on a.MainId equals b.MainId select a;
var list = query.ToList();
gvOperation.DataSource = list;
gvOperation.DataBind();
}
@ -513,11 +531,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
massQuestionLs.Add(new Running_Operation
{
OperationId = IsStrVal(this.gvOperation.Rows[i].DataKeys[0]),
RunningId = IsStrVal(this.gvOperation.Rows[i].DataKeys[1]),
ProjectId = this.CurrUser.LoginProjectId,
InstallationId = IsStrVal(this.gvOperation.Rows[i].DataKeys[2]),
ProcessesId = IsStrVal(this.gvOperation.Rows[i].DataKeys[3]),
SystemId = IsStrVal(this.gvOperation.Rows[i].DataKeys[4]),
MainId = IsStrVal(this.gvOperation.Rows[i].DataKeys[1]),
ProjectId = this.CurrUser.LoginProjectId,
OperationReason = values.Value<string>("OperationReason"),
OperationHandle = values.Value<string>("OperationHandle"),
AddUser = CurrUser.UserId,
@ -581,7 +596,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// </summary>
public void gvMaintenanceBrid()
{
var list = Funs.DB.Running_Maintenance.Where(x => x.RunningId == this.RunningId).ToList();
var query = from a in Funs.DB.Running_Maintenance join b in Funs.DB.Running_LogMain on a.MainId equals b.MainId select a;
var list = query.ToList();
gvMaintenance.DataSource = list;
gvMaintenance.DataBind();
}
@ -601,11 +617,8 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
massQuestionLs.Add(new Running_Maintenance
{
MaintenanceId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[0]),
RunningId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[1]),
MainId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[1]),
ProjectId = this.CurrUser.LoginProjectId,
InstallationId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[2]),
ProcessesId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[3]),
SystemId = IsStrVal(this.gvMaintenance.Rows[i].DataKeys[4]),
MaintenanceReason = values.Value<string>("MaintenanceReason"),
MaintenanceHandle = values.Value<string>("MaintenanceHandle"),
AddUser = CurrUser.UserId,

17
SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx
View File

@ -68,7 +68,7 @@
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="运行日志管理" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="RunningId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="RunningId" AllowSorting="true" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true" EnableTextSelection="True" EnableMultiSelect="false" EnableCheckBoxSelect="true">
runat="server" BoxFlex="1" DataKeyNames="MainId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="MainId" AllowSorting="true" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true" EnableTextSelection="True" EnableMultiSelect="false" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@ -103,19 +103,9 @@
<f:RowNumberField />
<f:RenderField ColumnID="ProjectName" DataField="ProjectName" HeaderText="项目名称" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="InstallationName" DataField="InstallationName" HeaderText="装置名称" HeaderTextAlign="Center">
<f:RenderField ColumnID="JobNo" DataField="JobNo" HeaderText="工作编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ProcessesName" DataField="ProcessesName" HeaderText="工序名称" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SystemName" DataField="SystemName" HeaderText="系统名称" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="JobNo" DataField="JobNo" HeaderText="工作编号" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ShiftTypeName" DataField="ShiftTypeName" HeaderText="轮班类型" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ShiftUserName" DataField="ShiftUserName" HeaderText="轮班职工" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SuccessionUserName" DataField="SuccessionUserName" HeaderText="继任职工" HeaderTextAlign="Center">
<f:RenderField ColumnID="ShiftTypeName" DataField="ShiftTypeName" HeaderText="轮班类型" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:BoundField DataField="StartData" DataFormatString="{0:yyyy-MM-dd HH:MM:ss}" HeaderText="开始时间" />
<f:BoundField DataField="EndData" DataFormatString="{0:yyyy-MM-dd HH:MM:ss}" HeaderText="结束时间" />
@ -138,7 +128,6 @@
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
</Items>

105
SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs
View File

@ -14,6 +14,7 @@ using NPOI.SS.Util;
using NPOI.XSSF.UserModel;
using Model;
using NPOI.SS.Formula.Functions;
using FineUIPro.Web.ProjectData;
namespace FineUIPro.Web.TestRun.ProduceTestRun
{
@ -80,17 +81,17 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
public void BindGrid()
{
var years = DateTime.Now.Year;
string strSql = @"select a.RunningId,a.ProjectId,project.ProjectName as ProjectName,a.InstallationId,a.ProcessesId,a.SystemId,inst.PreRunName as InstallationName,proce.PreRunName as ProcessesName,syst.PreRunName as SystemName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.ShiftUser,shiftuser.UserName as ShiftUserName,a.SuccessionUser,successuser.UserName as SuccessionUserName,a.StartData,a.EndData,a.AddUser,a.AddTime,a.Sort from Running_LogManagement as a inner join Sys_User as shiftuser on shiftuser.UserId=a.ShiftUser inner join Sys_User as successuser on successuser.UserId=a.SuccessionUser inner join Base_Project as project on project.ProjectId=a.ProjectId inner join PreRun_SysDevice as inst on inst.PreRunId=a.InstallationId inner join PreRun_SysDevice as proce on proce.PreRunId=a.ProcessesId inner join PreRun_SysDevice as syst on syst.PreRunId=a.SystemId where a.ProjectId=@ProjectId ";
string strSql = @"select a.MainId,a.ProjectId,project.ProjectName as ProjectName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.StartData,a.EndData,a.AddUser,a.AddTime from Running_LogMain as a inner join Base_Project as project on project.ProjectId=a.ProjectId where a.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID))
{
if (this.tvControlItem.SelectedNodeID != "0" && !string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID))
{
strSql += " and a.InstallationId=@InstallationId";
listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID));
}
}
//if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID))
//{
// if (this.tvControlItem.SelectedNodeID != "0" && !string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID))
// {
// strSql += " and a.InstallationId=@InstallationId";
// listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID));
// }
//}
if (!string.IsNullOrWhiteSpace(txtStartData.Text))
{
strSql += " and a.StartData>=@StartData";
@ -107,16 +108,16 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
strSql += " and a.ShiftType=@ShiftType";
listStr.Add(new SqlParameter("@ShiftType", ddlShiftType.SelectedValue));
}
strSql += " order by inst.PreRunLevel,inst.Sort,proce.Sort,syst.Sort asc";
strSql += " order by a.StartData asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
if (Funs.DB.Running_LogManagement.Count(x => x.StartData.Value.Year == years) > 0)
if (Funs.DB.Running_LogMain.Count(x => x.StartData.Value.Year == years) > 0)
{
var minTime = Funs.DB.Running_LogManagement.Where(x => x.StartData.Value.Year == years).Min(m => m.StartData);
var minTime = Funs.DB.Running_LogMain.Where(x => x.StartData.Value.Year == years).Min(m => m.StartData);
lblminTime.Text = $"{years}年日志最小日期：{minTime.Value.ToString("yyyy-MM-dd")}";
}
else
@ -184,7 +185,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// </summary>
protected void btnAdd_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId=", "新增 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?MainId=", "新增 - ")));
}
/// <summary>
@ -197,7 +198,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?RunningId={0}", Grid1.SelectedRowID, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RunningLogManagementEdit.aspx?MainId={0}", Grid1.SelectedRowID, "编辑 - ")));
}
/// <summary>
@ -211,10 +212,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
return;
}
var ids = Grid1.SelectedRowIDArray.ToList();
var list = Funs.DB.Running_LogManagement.Where(x => ids.Contains(x.RunningId)).ToList();
var list = Funs.DB.Running_LogMain.Where(x => ids.Contains(x.MainId)).ToList();
if (list.Count > 0)
{
Funs.DB.Running_LogManagement.DeleteAllOnSubmit(list);
Funs.DB.Running_LogMain.DeleteAllOnSubmit(list);
Funs.DB.SubmitChanges();
BindGrid();
Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
@ -231,7 +232,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
Alert.ShowInTop("请至少选择记录，最大只可选择一条！", MessageBoxIcon.Warning);
return;
}
var runningId = this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[0].ToString();
var mainId = this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[0].ToString();
string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
//导出文件
@ -245,14 +246,20 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId
join c in Funs.DB.Sys_User on a.ShiftUser equals c.UserId
join d in Funs.DB.Sys_User on a.SuccessionUser equals d.UserId
where a.RunningId == runningId
join init in Funs.DB.PreRun_SysDevice on a.InstallationId equals init.PreRunId
join sys in Funs.DB.PreRun_SysDevice on a.SystemId equals sys.PreRunId
where a.MainId == mainId
orderby a.Sort ascending
select new
{
a.RunningId,
a.MainId,
a.ProjectId,
a.InstallationId,
InstallationName = init.PreRunName,
a.ProcessesId,
a.SystemId,
SystemName = sys.PreRunName,
a.JobNo,
a.ShiftType,
ShiftTypeName = a.ShiftType == "1" ? "白班" : "夜班",
@ -269,17 +276,18 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
a.AddTime,
a.Sort
};
var model = data.FirstOrDefault();
if (model != null)
var list = data.ToList();
if (list.Count > 0)
{
var firstModel = list.FirstOrDefault();
//操作问题
var operations = Funs.DB.Running_Operation.Where(x => x.RunningId == model.RunningId).ToList();
var operations = Funs.DB.Running_Operation.Where(x => x.MainId == mainId).ToList();
//维护问题
var maintes = Funs.DB.Running_Maintenance.Where(x => x.RunningId == model.RunningId).ToList();
string ReportFileName = $"{filePath}Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName}).xlsx";
var maintes = Funs.DB.Running_Maintenance.Where(x => x.MainId == mainId).ToList();
string ReportFileName = $"{filePath}Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {firstModel.ShiftUserName}).xlsx";
int rowIndex = 0;
XSSFWorkbook hssfworkbook = new XSSFWorkbook();
XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName})");
XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {firstModel.ShiftUserName})");
#region 列宽
@ -341,7 +349,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
//行5
region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 0, 5);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 4).GetCell(0).SetCellValue($"Shift：（{model.ShiftUserName}） Succession：（{model.SuccessionUserName}） {model.StartData.Value.ToString("yyyy-MM-dd")}— {model.EndData.Value.ToString("yyyy-MM-dd")}");
ws.GetRow(rowIndex + 4).GetCell(0).SetCellValue($"Shift：（{firstModel.ShiftUserName}） Succession：（{firstModel.SuccessionUserName}） {firstModel.StartData.Value.ToString("yyyy-MM-dd")}— {firstModel.EndData.Value.ToString("yyyy-MM-dd")}");
ws.GetRow(rowIndex + 4).GetCell(0).CellStyle = styleBold;
//行6
region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 0, 3);
@ -359,25 +367,29 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
var dataIndex = 5;
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue("DW Station 脱盐水");
ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.Situation);
ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(model.Remarks);
ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
dataIndex += 2;
foreach (var item in list)
{
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 3);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 1).GetCell(0).SetCellValue(item.SystemName);
ws.GetRow(dataIndex + 1).GetCell(0).CellStyle = styleLeftBold;
region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 4, 5);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 1).GetCell(4).SetCellValue("");
ws.GetRow(dataIndex + 1).GetCell(4).CellStyle = leftStyle;
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 90);
region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 3);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(item.Situation);
ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 4, 5);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 2).GetCell(4).SetCellValue(item.Remarks);
ws.GetRow(dataIndex + 2).GetCell(4).CellStyle = leftStyle;
dataIndex += 2;
}
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
@ -387,11 +399,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 2, dataIndex + 2, 0, 5, 30);
region = new CellRangeAddress(dataIndex + 2, dataIndex + 2, 0, 5);
ws.AddMergedRegion(region);
ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(model.HandoverCare);
ws.GetRow(dataIndex + 2).GetCell(0).SetCellValue(firstModel.HandoverCare);
ws.GetRow(dataIndex + 2).GetCell(0).CellStyle = leftStyle;
dataIndex += 2;
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, dataIndex + 1, dataIndex + 1, 0, 5);
region = new CellRangeAddress(dataIndex + 1, dataIndex + 1, 0, 5);
ws.AddMergedRegion(region);
@ -449,7 +460,7 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
Response.Charset = "GB2312";
Response.ContentEncoding = System.Text.Encoding.UTF8;
// 添加头信息，为"文件下载/另存为"对话框指定默认文件名
Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {model.ShiftUserName}).xlsx"));
Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode($"Production report（{DateTime.Now.ToString("yyyy-MM-dd")} {firstModel.ShiftUserName}).xlsx"));
// 添加头信息，指定文件大小，让浏览器能够显示下载进度
Response.AddHeader("Content-Length", filet.Length.ToString());
// 指定返回的是一个不能被客户端读取的流，必须被下载

2
SGGL/FineUIPro.Web/Web.config
View File

@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

83
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
View File

@ -109,6 +109,11 @@
<div class="item">
<div class="bw-b-bottom ptop6">
<div class="bw-b-bottom-up">
<div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">投料试车进度</div>
</div>
</div>
<div class="tab-wrap">
<div class="tab" data-value="1">
<div class="t-item" style="background-color: #B3764D">未投料</div>
@ -131,13 +136,18 @@
<div class="item">
<div class="bw-b-bottom ptop6">
<div class="bw-b-bottom-up">
<div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">试运行进度</div>
</div>
</div>
<div class="tab-wrap">
<div class="tab" data-value="1">
<div class="t-item" style="background-color: #3939E9">未运行</div>
<div class="t-item" style="background-color: #B3764D">未运行</div>
<div class="spline"></div>
<div class="t-item" style="background-color: #A5F82A">运行中</div>
<div class="t-item" style="background-color: #DD226D">运行中</div>
<div class="spline"></div>
<div class="t-item" style="background-color: #E95B39">停车检修</div>
<div class="t-item" style="background-color: #57C43C">停车检修</div>
</div>
</div>
<div class="bw-item-content">
@ -149,16 +159,21 @@
<div class="item">
<div class="bw-b-bottom ptop6">
<div class="bw-b-bottom-up">
<div class="tab-wrap">
<div class="tab" data-value="1">
<div class="t-item" style="background-color: #6D5F5F">考核未开始</div>
<div class="spline"></div>
<div class="t-item" style="background-color: #3E1DC0">考核进行中</div>
<div class="spline"></div>
<div class="t-item" style="background-color: #20CE43">考核已完成</div>
<div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">性能考核进度</div>
</div>
</div>
<div class="bw-item-content">
<div class="tab-wrap">
<div class="tab" data-value="1">
<div class="t-item" style="background-color: #B3764D">考核未开始</div>
<div class="spline"></div>
<div class="t-item" style="background-color: #DD226D">考核进行中</div>
<div class="spline"></div>
<div class="t-item" style="background-color: #57C43C">考核已完成</div>
</div>
</div>
<div class="bw-item-content">
<div id='six' style="width: 100%; height: 100%;"></div>
</div>
</div>
@ -494,12 +509,19 @@
//图6
var sixStr = '<%=runProductionStr%>';
var sixData = JSON.parse(sixStr);
var colorData = ["#988989", "#6D5F5F", "#524747"];
//var colorData = ["#988989", "#6D5F5F", "#524747"];
//if (sixData.States == 2) {
// colorData = ["#2B1485", "#3E1DC0", "#603FE2"];
//}
//if (sixData.States == 3) {
// colorData = ["#106722", "#20CE43", "#5DE679"];
//}
var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
if (sixData.States == 2) {
colorData = ["#2B1485", "#3E1DC0", "#603FE2"];
colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
}
if (sixData.States == 3) {
colorData = ["#106722", "#20CE43", "#5DE679"];
colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
}
var chart = echarts.init(document.getElementById('six'));
var value = 100;
@ -787,12 +809,19 @@
$.each(fourData, function (index, item) {
var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"];
//var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"];
//if (item.RunType == 2) {
// colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"];
//}
//if (item.RunType == 3) {
// colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"];
//}
var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
if (item.RunType == 2) {
colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"];
colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
}
if (item.RunType == 3) {
colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"];
colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
}
var chart = echarts.init(document.getElementById('four' + index));
var value = 100;
@ -805,13 +834,13 @@
top: '45%', //top待调整
textStyle: {
color: '#fff',
fontSize: 9,
fontFamily: 'DINAlternate-Bold',
fontSize: 10,
fontFamily: 'Microsoft YaHei',
},
subtextStyle: {
color: '#ff',
fontSize: 9,
fontFamily: 'PingFangSC-Regular',
color: '#fff',
fontSize: 10,
fontFamily: 'Microsoft YaHei',
top: 'center'
},
itemGap: 10 //主副标题间距
@ -890,10 +919,10 @@
var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
if (item.RunType == 2) {
colorData = ["#A5F82A", "#2AF853", "#31F0F0", "#3FC1E2"];
colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
}
if (item.RunType == 3) {
colorData = ["#F82AF8", "#F0A431", "#E95B39", "#F82A2A"];
colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
}
var chart = echarts.init(document.getElementById('five' + index));
var value = 100;
@ -906,13 +935,13 @@
top: '45%', //top待调整
textStyle: {
color: '#fff',
fontSize: 9,
fontFamily: 'DINAlternate-Bold',
fontSize: 10,
fontFamily: 'Microsoft YaHei',
},
subtextStyle: {
color: '#ff',
fontSize: 9,
fontFamily: 'PingFangSC-Regular',
fontFamily: 'Microsoft YaHei',
top: 'center'
},
itemGap: 10 //主副标题间距