yuxingheng/009_DI-Elec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec

Browse Source
This commit is contained in:
xingheng 2025-08-29 15:16:11 +08:00
commit dccff57aaa
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Learun.Application.Web/Areas/ZZDT_EC/Controllers/ec_report_fileController.cs
View File

@ -844,6 +844,7 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
#region 所属系统
var TagProp = TagProps.Where(x => x.PropertyName == GlobalObject.propName_System && !string.IsNullOrEmpty(x.PropertyValue)).ToList();
PropValue = TagProp.Count() == 0 ? "" : TagProp.Last()?.PropertyValue;
PropValue=GetNameBeforeDoublePipe(PropValue);//双||的事情
if (!TagInRange(model, PropValue, cable, validSystemIds, ref pixels, ref allDwgs, ref allSystems))
{
@ -1028,6 +1029,10 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
rowCable.Cells[4].SetCellValue("CJ86/SC");
}
}
else if (CableType == CableTypeEnum.CAT6)
{
rowCable.Cells[4].SetCellValue("");
}
else
{
if (flg_fire == true)
@ -1939,6 +1944,18 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
}
}
public static string GetNameBeforeDoublePipe(string DetailName)
{
if (string.IsNullOrEmpty(DetailName))
return string.Empty;
int index = DetailName.IndexOf(GlobalObject.enum_separator);
if (index == -1)
return DetailName; // 如果找不到 ||，就返回原字符串
return DetailName.Substring(0, index);
}
#endregion
}
}