diff --git a/src/types/api/asset.ts b/src/types/api/asset.ts index dbdd3a4..2ed54bb 100644 --- a/src/types/api/asset.ts +++ b/src/types/api/asset.ts @@ -59,9 +59,12 @@ export interface AssetResolveResponse { realname_policy?: string // 实名认证策略 (none:无需实名, before_order:先实名后充值/购买, after_order:先充值/购买后实名) network_status?: NetworkStatus // 网络状态:0 停机 / 1 开机(仅 card) current_package: string // 当前套餐名称(无则空) - package_total_mb: number // 当前套餐总虚流量 MB - package_used_mb: number // 已用虚流量 MB - package_remain_mb: number // 剩余虚流量 MB + current_package_usage_id: number | null // 当前主套餐对应的套餐使用记录 ID,无主套餐时为 null + real_total_mb: number // 真流量总量 + real_used_mb: number // 真流量已用 + virtual_total_mb: number // 业务停机阈值(展示用) + virtual_used_mb: number // 展示已用量 + reduction_pct: number // 展示增幅比例(小数,如 0.428571) device_protect_status?: DeviceProtectStatus // 保护期状态:none / stop / start(仅 device) activated_at: string // 激活时间 created_at: string // 创建时间 @@ -140,9 +143,6 @@ export interface DeviceGatewayInfo { wan_ip?: string // 基站分配 IPv4 lan_ip?: string // 局域网网关 IP mac_address?: string // MAC 地址 - daily_usage?: string // 日使用流量(字节) - dl_stats?: string // 本次开机下载(字节) - ul_stats?: string // 本次开机上传(字节) limit_speed?: number // 限速(KB/s),0=不限 current_iccid?: string // 当前使用卡 ICCID max_clients?: number // 最大连接客户端数 @@ -202,12 +202,12 @@ export interface AssetPackageUsageRecord { usage_type?: UsageType // 使用类型:single_card/device status?: PackageUsageStatus // 0 待生效 / 1 生效中 / 2 已用完 / 3 已过期 / 4 已失效 status_name?: string // 状态中文名 - data_limit_mb?: number // 真流量总量 MB - virtual_limit_mb?: number // 虚流量总量 MB(已按 virtual_ratio 换算) - data_usage_mb?: number // 已用真流量 MB - virtual_used_mb?: number // 已用虚流量 MB - virtual_remain_mb?: number // 剩余虚流量 MB + real_total_mb?: number // 真流量总量(百分比以此为基准) + real_used_mb?: number // 真流量已用 + virtual_total_mb?: number // 业务停机阈值 + virtual_used_mb?: number // 展示已用量 virtual_ratio?: number // 虚流量比例(real/virtual) + reduction_pct?: number // 展示增幅比例(小数,如 0.428571) enable_virtual_data?: boolean // 是否启用虚流量 paid_amount?: number // 实际支付金额(分) package_price?: number // 套餐价格(分) diff --git a/src/views/asset-management/asset-information/components/BasicInfoCard.vue b/src/views/asset-management/asset-information/components/BasicInfoCard.vue index c3847f5..bd3890a 100644 --- a/src/views/asset-management/asset-information/components/BasicInfoCard.vue +++ b/src/views/asset-management/asset-information/components/BasicInfoCard.vue @@ -330,17 +330,6 @@ {{ deviceRealtime.imsi || '-' }} - - - {{ formatDataSize(Number(deviceRealtime.daily_usage || 0) / (1024 * 1024)) }} - - - {{ formatDataSize(Number(deviceRealtime.dl_stats || 0) / (1024 * 1024)) }} - - - {{ formatDataSize(Number(deviceRealtime.ul_stats || 0) / (1024 * 1024)) }} - - {{ deviceRealtime.limit_speed ? `${deviceRealtime.limit_speed} KB/s` : '不限速' }} @@ -538,9 +527,6 @@ mac_address?: string imei?: string imsi?: string - daily_usage?: string - dl_stats?: string - ul_stats?: string limit_speed?: number software_version?: string switch_mode?: string diff --git a/src/views/asset-management/asset-information/components/CurrentPackageCard.vue b/src/views/asset-management/asset-information/components/CurrentPackageCard.vue index f1bad06..ba8218b 100644 --- a/src/views/asset-management/asset-information/components/CurrentPackageCard.vue +++ b/src/views/asset-management/asset-information/components/CurrentPackageCard.vue @@ -42,20 +42,20 @@ 已使用 {{ - formatDataSize(currentPackage.data_usage_mb || 0) + formatDataSize(currentPackage.real_used_mb || 0) }} 总量 {{ - formatDataSize(currentPackage.data_limit_mb || 0) + formatDataSize(currentPackage.real_total_mb || 0) }} 剩余 {{ formatDataSize( - (currentPackage.data_limit_mb || 0) - (currentPackage.data_usage_mb || 0) + (currentPackage.real_total_mb || 0) - (currentPackage.real_used_mb || 0) ) }} @@ -63,15 +63,15 @@ 已使用 {{ - formatDataSize(currentPackage.virtual_data_used || 0) + formatDataSize(currentPackage.virtual_used_mb || 0) }} - 总量 + 停机阈值 {{ - formatDataSize(currentPackage.virtual_limit_mb || 0) - }} - - - 剩余 - {{ - formatDataSize( - (currentPackage.virtual_limit_mb || 0) - (currentPackage.virtual_data_used || 0) - ) + formatDataSize(currentPackage.virtual_total_mb || 0) }} @@ -142,7 +134,7 @@
总量 - {{ formatDataSize(currentPackage.data_limit_mb || 0) }} + {{ formatDataSize(currentPackage.real_total_mb || 0) }}
@@ -150,7 +142,7 @@ {{ formatDataSize( - (currentPackage.data_limit_mb || 0) - (currentPackage.data_usage_mb || 0) + (currentPackage.real_total_mb || 0) - (currentPackage.real_used_mb || 0) ) }} @@ -161,18 +153,18 @@ :percentage=" getUsageProgress( currentPackage.enable_virtual_data - ? currentPackage.virtual_data_used || 0 - : currentPackage.data_usage_mb || 0, - currentPackage.data_limit_mb || 0 + ? currentPackage.virtual_used_mb || 0 + : currentPackage.real_used_mb || 0, + currentPackage.real_total_mb || 0 ) " :color=" getProgressColorByPercentage( getUsageProgress( currentPackage.enable_virtual_data - ? currentPackage.virtual_data_used || 0 - : currentPackage.data_usage_mb || 0, - currentPackage.data_limit_mb || 0 + ? currentPackage.virtual_used_mb || 0 + : currentPackage.real_used_mb || 0, + currentPackage.real_total_mb || 0 ) ) " diff --git a/src/views/asset-management/asset-information/components/PackageListCard.vue b/src/views/asset-management/asset-information/components/PackageListCard.vue index 95a9487..228994e 100644 --- a/src/views/asset-management/asset-information/components/PackageListCard.vue +++ b/src/views/asset-management/asset-information/components/PackageListCard.vue @@ -61,16 +61,16 @@