From 3caf1bb051c53dd75bd7f3b9f478dd4233e49d45 Mon Sep 17 00:00:00 2001 From: 3octaves <873551943@qq.com> Date: Mon, 23 Dec 2024 18:17:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E4=BF=AE=E5=A4=8Drediscluster?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=E5=AE=B9=E9=87=8F=E5=8F=98=E6=9B=B4=E5=92=8C?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=E7=B1=BB=E5=9E=8B=E5=8F=98=E6=9B=B4bug=20#87?= =?UTF-8?q?81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/page1/components/ClusterDeployPlan.vue | 3 ++- .../views/db-manage/redis/common/cluster-deploy-plan/Index.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dbm-ui/frontend/src/views/db-manage/redis/capacity-change/pages/page1/components/ClusterDeployPlan.vue b/dbm-ui/frontend/src/views/db-manage/redis/capacity-change/pages/page1/components/ClusterDeployPlan.vue index 2db04c84e8..162300f226 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/capacity-change/pages/page1/components/ClusterDeployPlan.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/capacity-change/pages/page1/components/ClusterDeployPlan.vue @@ -590,9 +590,10 @@ if (capacityNeed.value > 0) { isTableLoading.value = true; const clusterType = props.data?.clusterType ?? ClusterTypes.TWEMPROXY_REDIS_INSTANCE; + const machineType = clusterType === ClusterTypes.PREDIXY_REDIS_CLUSTER ? ClusterTypes.PREDIXY_REDIS_CLUSTER : specClusterMachineMap[clusterType]; const params = { spec_cluster_type: 'redis', - spec_machine_type: specClusterMachineMap[clusterType], + spec_machine_type: machineType, shard_num: props.data.shardNum === 0 ? undefined : props.data.shardNum, capacity: capacityNeed.value, future_capacity: capacityNeed.value, diff --git a/dbm-ui/frontend/src/views/db-manage/redis/common/cluster-deploy-plan/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/common/cluster-deploy-plan/Index.vue index 0a01188723..6625aafbee 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/common/cluster-deploy-plan/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/common/cluster-deploy-plan/Index.vue @@ -426,9 +426,10 @@ if (specInfo.capacityNeed > 0 && specInfo.capacityFutureNeed > 0) { isTableLoading.value = true; const clusterType = props.data?.clusterType ?? ClusterTypes.TWEMPROXY_REDIS_INSTANCE; + const machineType = clusterType === ClusterTypes.PREDIXY_REDIS_CLUSTER ? ClusterTypes.PREDIXY_REDIS_CLUSTER : specClusterMachineMap[clusterType]; const params = { spec_cluster_type: 'redis', - spec_machine_type: specClusterMachineMap[clusterType], + spec_machine_type: machineType, shard_num: props.data.shardNum === 0 ? undefined : props.data.shardNum, capacity: specInfo.capacityNeed, future_capacity: specInfo.capacityNeed <= specInfo.capacityFutureNeed ? specInfo.capacityFutureNeed : specInfo.capacityNeed,