21

2026-04-04 11:53:57 +08:00 · 2026-04-04 11:53:57 +08:00 · fdf2388b3a
commit fdf2388b3a
parent b36d3eb8ed
6 changed files with 69 additions and 27 deletions
--- 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<OdfFrames> framesList = new List<OdfFrames>();
                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()
                                    {
--- 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()
                                        {
--- 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
        /// </summary>
        public int RowCount { get; set; }
        /// <summary>
-        /// 端口数量（ODF机架用，光交箱固定12）
+        /// 端口数量（ODF机架用）
        /// </summary>
        public int PortsCount { get; set; }
        /// <summary>
+        /// 光交箱左侧端口数（光交箱端子）
+        /// </summary>
+        public int LeftPortsCount { get; set; }
+        /// <summary>
+        /// 光交箱右侧端口数（ODF端子）
+        /// </summary>
+        public int RightPortsCount { get; set; }
+        /// <summary>
        /// 默认连接状态
        /// </summary>
        public int DefaultStatus { get; set; }
--- 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
        /// </summary>
        public int RowCount { get; set; }
        /// <summary>
-        /// 端口数量（ODF机架用，光交箱固定12）
+        /// 端口数量（ODF机架用）
        /// </summary>
        public int PortsCount { get; set; }
        /// <summary>
+        /// 光交箱左侧端口数（光交箱端子）
+        /// </summary>
+        public int LeftPortsCount { get; set; }
+        /// <summary>
+        /// 光交箱右侧端口数（ODF端子）
+        /// </summary>
+        public int RightPortsCount { get; set; }
+        /// <summary>
        /// 默认连接状态
        /// </summary>
        public int DefaultStatus { get; set; }
--- a/server/ZR.Vue/src/components/business/OdfRackExpertForm.vue
+++ b/server/ZR.Vue/src/components/business/OdfRackExpertForm.vue
@ -40,9 +40,9 @@
        </el-col>

        <el-col v-if="isAdd" :lg="12">
-          <el-form-item label="ODF机框数量" prop="framesCount">
+          <el-form-item label="机框数量" prop="framesCount">
            <el-input v-model.number="form.framesCount" :disabled="isView" placeholder="请输入机框数量" />
-            <div class="form-tip">每个ODF机架中机框数量</div>
+            <div class="form-tip">每个机架中机框数量</div>
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd" :lg="12">
@ -58,9 +58,15 @@
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd && form.rackType === 1" :lg="12">
-          <el-form-item label="端口数">
-            <el-input :model-value="'每侧12个（固定）'" disabled />
-            <div class="form-tip">光交箱每行左右各12个端口，共24个</div>
+          <el-form-item label="左侧端口数" prop="leftPortsCount">
+            <el-input v-model.number="form.leftPortsCount" :disabled="isView" placeholder="请输入左侧端口数" />
+            <div class="form-tip">每行光交箱侧端子数量</div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="isAdd && form.rackType === 1" :lg="12">
+          <el-form-item label="右侧端口数" prop="rightPortsCount">
+            <el-input v-model.number="form.rightPortsCount" :disabled="isView" placeholder="请输入右侧端口数" />
+            <div class="form-tip">每行ODF侧端子数量</div>
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd" :lg="12">
@ -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(() => {
--- a/server/ZR.Vue/src/components/business/OdfRoomExpertForm.vue
+++ b/server/ZR.Vue/src/components/business/OdfRoomExpertForm.vue
@ -58,15 +58,15 @@
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd" :lg="12">
-          <el-form-item label="ODF机架数量" prop="racksCount">
-            <el-input v-model.number="form.racksCount" :disabled="isView" placeholder="请输入ODF机架数量" />
+          <el-form-item label="机架数量" prop="racksCount">
+            <el-input v-model.number="form.racksCount" :disabled="isView" placeholder="请输入机架数量" />
            <div class="form-tip">填写后会自动生成对应的机架</div>
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd" :lg="12">
-          <el-form-item label="ODF机框数量" prop="framesCount">
+          <el-form-item label="机框数量" prop="framesCount">
            <el-input v-model.number="form.framesCount" :disabled="isView" placeholder="请输入机框数量" />
-            <div class="form-tip">每个ODF机架中机框数量</div>
+            <div class="form-tip">每个机架中机框数量</div>
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd" :lg="12">
@ -82,9 +82,15 @@
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd && form.rackType === 1" :lg="12">
-          <el-form-item label="端口数">
-            <el-input :model-value="'每侧12个（固定）'" disabled />
-            <div class="form-tip">光交箱每行左右各12个端口，共24个</div>
+          <el-form-item label="左侧端口数" prop="leftPortsCount">
+            <el-input v-model.number="form.leftPortsCount" :disabled="isView" placeholder="请输入左侧端口数" />
+            <div class="form-tip">每行光交箱侧端子数量</div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="isAdd && form.rackType === 1" :lg="12">
+          <el-form-item label="右侧端口数" prop="rightPortsCount">
+            <el-input v-model.number="form.rightPortsCount" :disabled="isView" placeholder="请输入右侧端口数" />
+            <div class="form-tip">每行ODF侧端子数量</div>
          </el-form-item>
        </el-col>
        <el-col v-if="isAdd" :lg="12">
@ -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
  }