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

提交试车代码

Browse Source
This commit is contained in:
高飞
2023-12-25 14:19:31 +08:00
parent 1f08356eb1
commit 726c5116f4
51 changed files with 3545 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
+18 -2
View File
@@ -18,6 +18,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
if (!IsPostBack)
{
Toolbar3.Hidden = true;
this.InitTreeMenu();//加载树
PageInit();
}
@@ -42,6 +43,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId
join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId
where a.ProjectId == this.CurrUser.LoginProjectId
orderby a.Sort, a.PreRunLevel ascending
select new { a.PreRunId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode };
if (list.Count() > 0)
@@ -50,7 +52,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var workPackIds = list.Select(x => x.WorkPackId).ToList();
var selectlist = YscInspectItems(workPackIds, subSystemIds);
var systemIds = list.Select(x => x.SystemId).ToList();
var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId));
var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel);
foreach (var itemSys in syslist)
{
TreeNode rootFirstNode = new TreeNode();//定义根节点
@@ -183,6 +185,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
}
var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId);
if (workPage.SpecialWorkPack == 0)
{
Toolbar3.Hidden = true;
}
else
{
Toolbar3.Hidden = false;
}
if (typechange)
{
var propertyTechnologyIds = string.Empty;
@@ -201,7 +212,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (inspectItems.Count > 0) propertyTechnologyIds = string.Join(",", inspectItems.ConvertAll(x => x.PropertyTechnologyId));
var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId);
if (workPage != null)
{
//加载类型
@@ -817,6 +827,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
else
{
ddbSysPiping.Values = null;
ddbSysPiping.Texts = null;
cbSysPiping.Items.Clear();
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));
}
@@ -871,6 +883,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
else
{
ddbSysPiping.Values = null;
ddbSysPiping.Texts = null;
cbSysPiping.Items.Clear();
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));
}
@@ -925,6 +939,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
else
{
ddbSysPiping.Values = null;
ddbSysPiping.Texts = null;
cbSysPiping.Items.Clear();
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));
}