fix(admin/host): 硬盘IO限制带宽字段改为动态单位选择(B/s~GB/s), 带宽与IOPS分组渲染修复标签溢出 -- 缘由: 带宽字段直接展示bytes原始值且标签过长导致换行错乱 -- 预期: 带宽字段参照内存/磁盘方式通过下拉选择单位(默认MB/s), IOPS独立分组, 标签简化为读取/写入/突发读取/突发写入

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-14 13:20:32 +08:00
parent dc63020943
commit 98678859cb
3 changed files with 206 additions and 72 deletions
@@ -137,11 +137,24 @@
            <el-icon class="section-arrow" :class="{ expanded: showTokenDiskIo }"><ArrowRight /></el-icon>
            <span class="section-hint">可选，不展开则使用默认值</span>
          </div>
-          <div v-show="showTokenDiskIo" class="tk-resource-grid">
-            <el-form-item v-for="f in diskIoFields" :key="f.key" :label="f.label" class="tk-res-item">
-              <el-input-number v-model="tokenForm[f.key]" :min="0" controls-position="right" />
-              <span class="tk-res-unit">{{ f.unit }}</span>
-            </el-form-item>
+          <div v-show="showTokenDiskIo">
+            <div class="io-sub-title">
+              带宽限制
+              <el-select v-model="tokenIoBwUnit" class="tk-unit-select" style="width: 90px; margin-left: 8px">
+                <el-option v-for="u in ioBwUnitOptions" :key="u.label" :label="u.label" :value="u.label" />
+              </el-select>
+            </div>
+            <div class="tk-resource-grid">
+              <el-form-item v-for="f in diskIoBwFields" :key="f.key" :label="f.label" class="tk-res-item">
+                <el-input-number :model-value="+(tokenForm[f.key] / getTokenIoBwFactor()).toFixed(2)" @update:model-value="v => tokenForm[f.key] = Math.round((v || 0) * getTokenIoBwFactor())" :min="0" controls-position="right" />
+              </el-form-item>
+            </div>
+            <div class="io-sub-title">IOPS 限制</div>
+            <div class="tk-resource-grid">
+              <el-form-item v-for="f in diskIoIopsFields" :key="f.key" :label="f.label" class="tk-res-item">
+                <el-input-number v-model="tokenForm[f.key]" :min="0" controls-position="right" />
+              </el-form-item>
+            </div>
          </div>
        </div>
        <div class="tk-section">
@@ -345,11 +358,24 @@
            <el-icon class="section-arrow" :class="{ expanded: showHostDiskIo }"><ArrowRight /></el-icon>
            <span class="section-hint">可选，不展开则使用默认值</span>
          </div>
-          <div v-show="showHostDiskIo" class="tk-resource-grid">
-            <el-form-item v-for="f in diskIoFields" :key="f.key" :label="f.label">
-              <el-input-number v-model="hostForm[f.key]" :min="0" controls-position="right" />
-              <span class="tk-res-unit">{{ f.unit }}</span>
-            </el-form-item>
+          <div v-show="showHostDiskIo">
+            <div class="io-sub-title">
+              带宽限制
+              <el-select v-model="hostIoBwUnit" class="tk-unit-select" style="width: 90px; margin-left: 8px">
+                <el-option v-for="u in ioBwUnitOptions" :key="u.label" :label="u.label" :value="u.label" />
+              </el-select>
+            </div>
+            <div class="tk-resource-grid">
+              <el-form-item v-for="f in diskIoBwFields" :key="f.key" :label="f.label">
+                <el-input-number :model-value="+(hostForm[f.key] / getHostIoBwFactor()).toFixed(2)" @update:model-value="v => hostForm[f.key] = Math.round((v || 0) * getHostIoBwFactor())" :min="0" controls-position="right" />
+              </el-form-item>
+            </div>
+            <div class="io-sub-title">IOPS 限制</div>
+            <div class="tk-resource-grid">
+              <el-form-item v-for="f in diskIoIopsFields" :key="f.key" :label="f.label">
+                <el-input-number v-model="hostForm[f.key]" :min="0" controls-position="right" />
+              </el-form-item>
+            </div>
          </div>
        </div>
        <div class="tk-section">
@@ -657,16 +683,33 @@ const diskIoDefaults = {
  read_bytes_sec_max: 314572800, write_bytes_sec_max: 314572800,
  read_iops_sec_max: 1000, write_iops_sec_max: 1000
 }
-const diskIoFields = [
-  { key: 'read_bytes_sec', label: '读取带宽', unit: 'B/s', isBandwidth: true },
-  { key: 'write_bytes_sec', label: '写入带宽', unit: 'B/s', isBandwidth: true },
-  { key: 'read_iops_sec', label: '读取 IOPS', unit: 'IOPS', isBandwidth: false },
-  { key: 'write_iops_sec', label: '写入 IOPS', unit: 'IOPS', isBandwidth: false },
-  { key: 'read_bytes_sec_max', label: '突发读取带宽', unit: 'B/s', isBandwidth: true },
-  { key: 'write_bytes_sec_max', label: '突发写入带宽', unit: 'B/s', isBandwidth: true },
-  { key: 'read_iops_sec_max', label: '突发读取 IOPS', unit: 'IOPS', isBandwidth: false },
-  { key: 'write_iops_sec_max', label: '突发写入 IOPS', unit: 'IOPS', isBandwidth: false }
+const diskIoBwFields = [
+  { key: 'read_bytes_sec', label: '读取' },
+  { key: 'write_bytes_sec', label: '写入' },
+  { key: 'read_bytes_sec_max', label: '突发读取' },
+  { key: 'write_bytes_sec_max', label: '突发写入' }
 ]
+const diskIoIopsFields = [
+  { key: 'read_iops_sec', label: '读取' },
+  { key: 'write_iops_sec', label: '写入' },
+  { key: 'read_iops_sec_max', label: '突发读取' },
+  { key: 'write_iops_sec_max', label: '突发写入' }
+]
+const diskIoFields = [
+  ...diskIoBwFields.map(f => ({ ...f, isBandwidth: true })),
+  ...diskIoIopsFields.map(f => ({ ...f, isBandwidth: false }))
+]
+const ioBwUnitOptions = [
+  { label: 'B/s', factor: 1 },
+  { label: 'KB/s', factor: 1024 },
+  { label: 'MB/s', factor: 1048576 },
+  { label: 'GB/s', factor: 1073741824 }
+]
+const hostIoBwUnit = ref('MB/s')
+const tokenIoBwUnit = ref('MB/s')
+const getHostIoBwFactor = () => ioBwUnitOptions.find(u => u.label === hostIoBwUnit.value)?.factor || 1048576
+const getTokenIoBwFactor = () => ioBwUnitOptions.find(u => u.label === tokenIoBwUnit.value)?.factor || 1048576
+
 const showHostDiskIo = ref(false)
 const showTokenDiskIo = ref(false)

@@ -690,6 +733,7 @@ const handleAddHost = () => {
  hostDialogType.value = 'add'
  Object.assign(hostForm, { id: undefined, name: '', base_url: '', ip: '', token: '', port: 22, user: '', password: '', private_key: '', max_cpu: 0, max_memory: 0, max_disk: 0, rx_bandwidth: 0, tx_bandwidth: 0, host_group_id: 0, description: '', ...diskIoDefaults })
  showHostDiskIo.value = false
+  hostIoBwUnit.value = 'MB/s'
  hostDialogVisible.value = true
 }

@@ -697,6 +741,7 @@ const handleAddHostToGroup = (group) => {
  hostDialogType.value = 'add'
  Object.assign(hostForm, { id: undefined, name: '', base_url: '', ip: '', token: '', port: 22, user: '', password: '', private_key: '', max_cpu: 0, max_memory: 0, max_disk: 0, rx_bandwidth: 0, tx_bandwidth: 0, host_group_id: group.id, description: '', ...diskIoDefaults })
  showHostDiskIo.value = false
+  hostIoBwUnit.value = 'MB/s'
  hostDialogVisible.value = true
 }

@@ -809,6 +854,7 @@ const openTokenDialog = () => {
  tokenMemUnit.value = 'GB'
  tokenDiskUnit.value = 'GB'
  showTokenDiskIo.value = false
+  tokenIoBwUnit.value = 'MB/s'
  tokenDialogVisible.value = true
 }

@@ -899,4 +945,5 @@ onMounted(() => { if (serviceId.value) loadTreeData() })
 .section-arrow { transition: transform 0.2s; font-size: 14px; }
 .section-arrow.expanded { transform: rotate(90deg); }
 .section-hint { font-size: 12px; color: #909399; font-weight: 400; }
+.io-sub-title { font-size: 13px; font-weight: 500; color: #606266; margin: 12px 0 8px; display: flex; align-items: center; }
 </style>