@@ -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 @@
已使用真流量: {{ formatDataSize(scope.row.data_usage_mb || 0) }}已使用真流量: {{ formatDataSize(scope.row.real_used_mb || 0) }}
真流量总量: {{ formatDataSize(scope.row.data_limit_mb || 0) }}真流量总量: {{ formatDataSize(scope.row.real_total_mb || 0) }}
真流量剩余:
{{
formatDataSize(
- (scope.row.data_limit_mb || 0) - (scope.row.data_usage_mb || 0)
+ (scope.row.real_total_mb || 0) - (scope.row.real_used_mb || 0)
)
}}
@@ -78,11 +78,11 @@
@@ -91,15 +91,7 @@
>已使用虚流量: {{ formatDataSize(scope.row.virtual_used_mb || 0) }}
虚流量总量: {{ formatDataSize(scope.row.virtual_limit_mb || 0) }}
- 虚流量剩余:
- {{
- formatDataSize(
- (scope.row.virtual_limit_mb || 0) - (scope.row.virtual_used_mb || 0)
- )
- }}停机阈值: {{ formatDataSize(scope.row.virtual_total_mb || 0) }}
总量: {{ formatDataSize(scope.row.data_limit_mb || 0) }}总量: {{ formatDataSize(scope.row.real_total_mb || 0) }}
剩余:
{{
formatDataSize(
- (scope.row.data_limit_mb || 0) - (scope.row.data_usage_mb || 0)
+ (scope.row.real_total_mb || 0) - (scope.row.real_used_mb || 0)
)
}}
@@ -150,8 +142,8 @@
getUsageProgress(
scope.row.enable_virtual_data
? scope.row.virtual_used_mb || 0
- : scope.row.data_usage_mb || 0,
- scope.row.data_limit_mb || 0
+ : scope.row.real_used_mb || 0,
+ scope.row.real_total_mb || 0
)
"
:color="
@@ -159,8 +151,8 @@
getUsageProgress(
scope.row.enable_virtual_data
? scope.row.virtual_used_mb || 0
- : scope.row.data_usage_mb || 0,
- scope.row.data_limit_mb || 0
+ : scope.row.real_used_mb || 0,
+ scope.row.real_total_mb || 0
)
)
"
diff --git a/src/views/asset-management/asset-information/composables/useAssetInfo.ts b/src/views/asset-management/asset-information/composables/useAssetInfo.ts
index afc4d8c..c2a7787 100644
--- a/src/views/asset-management/asset-information/composables/useAssetInfo.ts
+++ b/src/views/asset-management/asset-information/composables/useAssetInfo.ts
@@ -105,12 +105,12 @@ export function useAssetInfo() {
// 流量/套餐信息
current_package: data.current_package || '',
packageSeries: data.series_name || '-',
- packageTotalFlow: formatDataSize(data.package_total_mb || 0),
- usedFlow: formatDataSize(data.package_used_mb || 0),
- remainFlow: formatDataSize((data.package_total_mb || 0) - (data.package_used_mb || 0)),
+ packageTotalFlow: formatDataSize(data.real_total_mb || 0),
+ usedFlow: formatDataSize(data.real_used_mb || 0),
+ remainFlow: formatDataSize((data.real_total_mb || 0) - (data.real_used_mb || 0)),
usedFlowPercentage:
- data.package_total_mb > 0
- ? `${((data.package_used_mb / data.package_total_mb) * 100).toFixed(2)}%`
+ data.real_total_mb > 0
+ ? `${((data.real_used_mb / data.real_total_mb) * 100).toFixed(2)}%`
: '0.00%',
packageList: [] // 套餐列表需要单独调用API获取
}
@@ -191,25 +191,20 @@ export function useAssetInfo() {
order_no: pkg.order_no || '',
package_name: pkg.package_name || '',
paid_amount: pkg.paid_amount || 0,
- package_total_data: pkg.data_limit_mb || 0,
- real_data_used: pkg.data_usage_mb || 0,
- real_data_remaining: (pkg.data_limit_mb || 0) - (pkg.data_usage_mb || 0),
- real_data_total: pkg.data_limit_mb || 0,
- virtual_data_used: pkg.virtual_used_mb || 0,
- virtual_data_remaining: pkg.virtual_remain_mb || 0,
- virtual_data_total: pkg.virtual_limit_mb || 0,
+ real_total_mb: pkg.real_total_mb || 0,
+ real_used_mb: pkg.real_used_mb || 0,
+ real_remaining_mb: (pkg.real_total_mb || 0) - (pkg.real_used_mb || 0),
+ virtual_total_mb: pkg.virtual_total_mb || 0,
+ virtual_used_mb: pkg.virtual_used_mb || 0,
+ virtual_remaining_mb: (pkg.virtual_total_mb || 0) - (pkg.virtual_used_mb || 0),
+ reduction_pct: pkg.reduction_pct || 0,
start_time: pkg.activated_at || '',
expire_time: pkg.expires_at || '',
status: pkg.status || 0,
status_name: pkg.status_name,
duration_days: undefined,
- virtual_ratio: pkg.virtual_ratio,
package_type: pkg.package_type,
enable_virtual_data: pkg.enable_virtual_data,
- data_limit_mb: pkg.data_limit_mb,
- virtual_limit_mb: pkg.virtual_limit_mb,
- virtual_remain_mb: pkg.virtual_remain_mb,
- data_usage_mb: pkg.data_usage_mb,
created_at: pkg.created_at || ''
}
@@ -217,18 +212,18 @@ export function useAssetInfo() {
const useVirtual = pkg.enable_virtual_data
cardInfo.value.current_package = pkg.package_name
cardInfo.value.packageTotalFlow = formatDataSize(
- useVirtual ? pkg.virtual_limit_mb || 0 : pkg.data_limit_mb || 0
+ useVirtual ? pkg.virtual_total_mb || 0 : pkg.real_total_mb || 0
)
cardInfo.value.usedFlow = formatDataSize(
- useVirtual ? pkg.virtual_used_mb || 0 : pkg.data_usage_mb || 0
+ useVirtual ? pkg.virtual_used_mb || 0 : pkg.real_used_mb || 0
)
cardInfo.value.remainFlow = formatDataSize(
useVirtual
- ? pkg.virtual_remain_mb || 0
- : (pkg.data_limit_mb || 0) - (pkg.data_usage_mb || 0)
+ ? (pkg.virtual_total_mb || 0) - (pkg.virtual_used_mb || 0)
+ : (pkg.real_total_mb || 0) - (pkg.real_used_mb || 0)
)
- const totalMb = useVirtual ? pkg.virtual_limit_mb || 0 : pkg.data_limit_mb || 0
- const usedMb = useVirtual ? pkg.virtual_used_mb || 0 : pkg.data_usage_mb || 0
+ const totalMb = useVirtual ? pkg.virtual_total_mb || 0 : pkg.real_total_mb || 0
+ const usedMb = useVirtual ? pkg.virtual_used_mb || 0 : pkg.real_used_mb || 0
cardInfo.value.usedFlowPercentage =
totalMb > 0 ? `${((usedMb / totalMb) * 100).toFixed(2)}%` : '0.00%'
} else {
diff --git a/src/views/asset-management/asset-information/types.ts b/src/views/asset-management/asset-information/types.ts
index 77bb6d0..6dc71c1 100644
--- a/src/views/asset-management/asset-information/types.ts
+++ b/src/views/asset-management/asset-information/types.ts
@@ -76,25 +76,20 @@ export interface PackageInfo {
package_id: number
package_name: string
package_price: number
- package_total_data: number
- real_data_used: number
- real_data_remaining: number
- real_data_total: number
- virtual_data_used: number
- virtual_data_remaining: number
- virtual_data_total: number
+ real_total_mb: number
+ real_used_mb: number
+ real_remaining_mb: number
+ virtual_total_mb: number
+ virtual_used_mb: number
+ virtual_remaining_mb: number
start_time: string
expire_time: string
status: number
status_name?: string
duration_days?: number
- virtual_ratio?: number // 虚流量比例
+ reduction_pct?: number // 展示增幅比例
package_type?: string // 套餐类型: formal(正式套餐)/ addon(加油包)
enable_virtual_data?: boolean // 是否启用虚流量
- data_limit_mb?: number // 总量
- virtual_limit_mb?: number // 虚流量上限
- virtual_remain_mb?: number // 虚流量剩余
- data_usage_mb?: number // 已用流量
order_no?: string // 订单号
}