diff --git a/server/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs b/server/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs index 5b5d69e..0b76b63 100644 --- a/server/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs +++ b/server/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs @@ -126,8 +126,8 @@ namespace ZR.Admin.WebApi.Controllers.Business List framesList = new List(); var rack = response; - // 光交箱固定每侧12个端口 - var portsCount = modal.RackType == 1 ? 12 : parm.PortsCount; + // 光交箱用左右端口数,ODF用portsCount + var portsCount = modal.RackType == 1 ? parm.LeftPortsCount : parm.PortsCount; for (int i = 0; i < parm.FramesCount; i++) { @@ -158,12 +158,14 @@ namespace ZR.Admin.WebApi.Controllers.Business if (modal.RackType == 1) { - // 光交箱:每行生成24个端口(左12+右12) + // 光交箱:每行生成左+右端口 + var leftCount = parm.LeftPortsCount; + var rightCount = parm.RightPortsCount; for (int row = 0; row < parm.RowCount; row++) { string rowLetter = ((char)(65 + row)).ToString(); // A, B, C... // 左侧光交箱端子 PortSide=0 - for (int port = 0; port < 12; port++) + for (int port = 0; port < leftCount; port++) { ports.Add(new OdfPorts() { @@ -189,7 +191,7 @@ namespace ZR.Admin.WebApi.Controllers.Business }); } // 右侧ODF端子 PortSide=1 - for (int port = 0; port < 12; port++) + for (int port = 0; port < rightCount; port++) { ports.Add(new OdfPorts() { diff --git a/server/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs b/server/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs index 8664bd5..76668f7 100644 --- a/server/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs +++ b/server/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs @@ -298,8 +298,8 @@ namespace ZR.Admin.WebApi.Controllers.Business racksList.Add(t); } - // 光交箱固定每侧12个端口 - var portsCount = parm.RackType == 1 ? 12 : parm.PortsCount; + // 光交箱用左右端口数,ODF用portsCount + var portsCount = parm.RackType == 1 ? parm.LeftPortsCount : parm.PortsCount; if (parm.FramesCount > 0) { @@ -337,12 +337,14 @@ namespace ZR.Admin.WebApi.Controllers.Business if (parm.RackType == 1) { - // 光交箱:每行生成24个端口(左12+右12) + // 光交箱:每行生成左+右端口 + var leftCount = parm.LeftPortsCount; + var rightCount = parm.RightPortsCount; for (int row = 0; row < parm.RowCount; row++) { string rowLetter = ((char)(65 + row)).ToString(); // 左侧光交箱端子 - for (int port = 0; port < 12; port++) + for (int port = 0; port < leftCount; port++) { ports.Add(new OdfPorts() { @@ -368,7 +370,7 @@ namespace ZR.Admin.WebApi.Controllers.Business }); } // 右侧ODF端子 - for (int port = 0; port < 12; port++) + for (int port = 0; port < rightCount; port++) { ports.Add(new OdfPorts() { diff --git a/server/ZR.Model/Business/Dto/OdfRacksDto.cs b/server/ZR.Model/Business/Dto/OdfRacksDto.cs index 31955d5..7421073 100644 --- a/server/ZR.Model/Business/Dto/OdfRacksDto.cs +++ b/server/ZR.Model/Business/Dto/OdfRacksDto.cs @@ -67,10 +67,18 @@ namespace ZR.Model.Business.Dto /// public int RowCount { get; set; } /// - /// 端口数量(ODF机架用,光交箱固定12) + /// 端口数量(ODF机架用) /// public int PortsCount { get; set; } /// + /// 光交箱左侧端口数(光交箱端子) + /// + public int LeftPortsCount { get; set; } + /// + /// 光交箱右侧端口数(ODF端子) + /// + public int RightPortsCount { get; set; } + /// /// 默认连接状态 /// public int DefaultStatus { get; set; } diff --git a/server/ZR.Model/Business/Dto/OdfRoomsDto.cs b/server/ZR.Model/Business/Dto/OdfRoomsDto.cs index 57b8362..b92b763 100644 --- a/server/ZR.Model/Business/Dto/OdfRoomsDto.cs +++ b/server/ZR.Model/Business/Dto/OdfRoomsDto.cs @@ -172,10 +172,18 @@ namespace ZR.Model.Business.Dto /// public int RowCount { get; set; } /// - /// 端口数量(ODF机架用,光交箱固定12) + /// 端口数量(ODF机架用) /// public int PortsCount { get; set; } /// + /// 光交箱左侧端口数(光交箱端子) + /// + public int LeftPortsCount { get; set; } + /// + /// 光交箱右侧端口数(ODF端子) + /// + public int RightPortsCount { get; set; } + /// /// 默认连接状态 /// public int DefaultStatus { get; set; } diff --git a/server/ZR.Vue/src/components/business/OdfRackExpertForm.vue b/server/ZR.Vue/src/components/business/OdfRackExpertForm.vue index bd6c5e6..73f7763 100644 --- a/server/ZR.Vue/src/components/business/OdfRackExpertForm.vue +++ b/server/ZR.Vue/src/components/business/OdfRackExpertForm.vue @@ -40,9 +40,9 @@ - + -
每个ODF机架中机框数量
+
每个机架中机框数量
@@ -58,9 +58,15 @@ - - -
光交箱每行左右各12个端口,共24个
+ + +
每行光交箱侧端子数量
+
+
+ + + +
每行ODF侧端子数量
@@ -155,6 +161,8 @@ const form = ref({ framesCount: 9, rowCount: 6, portsCount: 12, + leftPortsCount: 12, + rightPortsCount: 12, defaultStatus: 0 }) @@ -168,9 +176,10 @@ const rules = { // 机架类型切换 function handleRackTypeChange(val) { + // 切换类型时重置端口数为默认值 if (val === 1) { - // 光交箱固定端口数12 - form.value.portsCount = 12 + form.value.leftPortsCount = 12 + form.value.rightPortsCount = 12 } } @@ -202,6 +211,8 @@ function resetForm() { framesCount: 9, rowCount: 6, portsCount: 12, + leftPortsCount: 12, + rightPortsCount: 12, defaultStatus: 0 } nextTick(() => { diff --git a/server/ZR.Vue/src/components/business/OdfRoomExpertForm.vue b/server/ZR.Vue/src/components/business/OdfRoomExpertForm.vue index 9ca9fa1..42d5e3a 100644 --- a/server/ZR.Vue/src/components/business/OdfRoomExpertForm.vue +++ b/server/ZR.Vue/src/components/business/OdfRoomExpertForm.vue @@ -58,15 +58,15 @@ - - + +
填写后会自动生成对应的机架
- + -
每个ODF机架中机框数量
+
每个机架中机框数量
@@ -82,9 +82,15 @@ - - -
光交箱每行左右各12个端口,共24个
+ + +
每行光交箱侧端子数量
+
+
+ + + +
每行ODF侧端子数量
@@ -191,6 +197,8 @@ const form = ref({ framesCount: 9, rowCount: 6, portsCount: 12, + leftPortsCount: 12, + rightPortsCount: 12, defaultStatus: 0, orderby: 0, rackType: 0 @@ -204,7 +212,8 @@ const rules = { // 机架类型切换 function handleRackTypeChange(val) { if (val === 1) { - form.value.portsCount = 12 + form.value.leftPortsCount = 12 + form.value.rightPortsCount = 12 } } @@ -231,6 +240,8 @@ function resetForm() { framesCount: 9, rowCount: 6, portsCount: 12, + leftPortsCount: 12, + rightPortsCount: 12, defaultStatus: 0, rackType: 0 }