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-09-01 23:16:47 +08:00
commit 459becb1a9
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -974,7 +974,15 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
}
break;
case CableTypeEnum.信号:
rowCable.Cells[2].SetCellValue("I");//电缆类型，信号、电力、本安、动力、随机
if (cable.ObjectTypeName == "变频电缆")
{
//因为有些变频电缆的规格时N*N+N*N，会被算到信号里面，所以加个这个判断
rowCable.Cells[2].SetCellValue("VFD");//电缆类型，信号、电力、本安、动力、随机
}
else
{
rowCable.Cells[2].SetCellValue("I");//电缆类型，信号、电力、本安、动力、随机
}
break;
case CableTypeEnum.CAT6:
rowCable.Cells[2].SetCellValue("T");//电缆类型，信号、电力、本安、动力、随机
@ -1068,22 +1076,31 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
}
else
{
if (flg_fire == true)
if (cable.ObjectTypeName == "变频电缆")
{
rowCable.Cells[4].SetCellValue("CHJ86/NSC");//
}
else if (flg_IS == true)
{
rowCable.Cells[4].SetCellValue("CHJ86/SC.IS");//
}
else if (flg_PairShield == true)//也只有信号电缆2*2*1.5这种才有
{
rowCable.Cells[4].SetCellValue("CHJP86/SC");//
//因为有些变频电缆的规格时N*N+N*N，会被算到信号里面，所以加个这个判断
rowCable.Cells[4].SetCellValue("CJPF86/SC-VFD");
}
else
{
rowCable.Cells[4].SetCellValue("CHJ86/SC");
if (flg_fire == true)
{
rowCable.Cells[4].SetCellValue("CHJ86/NSC");//
}
else if (flg_IS == true)
{
rowCable.Cells[4].SetCellValue("CHJ86/SC.IS");//
}
else if (flg_PairShield == true)//也只有信号电缆2*2*1.5这种才有
{
rowCable.Cells[4].SetCellValue("CHJP86/SC");//
}
else
{
rowCable.Cells[4].SetCellValue("CHJ86/SC");
}
}
}
#endregion
xxx: