From a4e6da603e7c64978c0565d5190cad153bf1f5ed Mon Sep 17 00:00:00 2001 From: wangqifan Date: Fri, 29 Aug 2025 18:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E4=BE=8B=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=B0=83=E6=95=B4CPU?= =?UTF-8?q?=E6=A0=B8=E5=BF=83=E6=95=B0=E5=92=8C=E5=86=85=E5=AD=98=E5=AE=B9?= =?UTF-8?q?=E9=87=8F=E7=9A=84=E6=9C=80=E5=A4=A7=E5=80=BC=EF=BC=8C=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E8=BE=93=E5=85=A5=E6=9B=B4=E7=81=B5=E6=B4=BB=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E9=99=90=E5=88=B6=E8=BF=94=E5=9B=9E=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=95=B0=E9=87=8F=E8=87=B340=E6=9D=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/services/aws/pricing_v2.py | 7 +++++-- frontend/src/views/InstanceSearch.vue | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/backend/app/services/aws/pricing_v2.py b/backend/app/services/aws/pricing_v2.py index fa0bdb8..2038d6e 100644 --- a/backend/app/services/aws/pricing_v2.py +++ b/backend/app/services/aws/pricing_v2.py @@ -71,11 +71,11 @@ async def search_instances_v2( query += " AND area_en = %s" params.append(region_name) - if cpu_cores: + if cpu_cores > 0: query += " AND vcpu = %s" params.append(cpu_cores) - if memory_gb: + if memory_gb > 0: query += " AND memory = %s" params.append(memory_gb) @@ -87,6 +87,9 @@ async def search_instances_v2( # 执行查询 cursor.execute(query, params) results = cursor.fetchall() + + if len(results) >= 40: + results = results[0:40] # 处理结果 instances = [] diff --git a/frontend/src/views/InstanceSearch.vue b/frontend/src/views/InstanceSearch.vue index 8464a37..cb77d7e 100644 --- a/frontend/src/views/InstanceSearch.vue +++ b/frontend/src/views/InstanceSearch.vue @@ -16,7 +16,7 @@ @@ -29,7 +29,7 @@ @@ -388,8 +388,8 @@ export default { data() { return { form: { - cpu_cores: null, - memory_gb: null, + cpu_cores: 0, + memory_gb: 0, disk_gb: 30, // 默认30GB region: 'us-east-1', disk_type: 'gp3',