diff --git a/src/services/apiKeyService.js b/src/services/apiKeyService.js
index 8656c5e9..930fccc8 100644
--- a/src/services/apiKeyService.js
+++ b/src/services/apiKeyService.js
@@ -192,6 +192,7 @@ class ApiKeyService {
   async getAllApiKeys() {
     try {
       const apiKeys = await redis.getAllApiKeys();
+      const client = redis.getClientSafe();
       
       // 为每个key添加使用统计和当前并发数
       for (const key of apiKeys) {
@@ -207,6 +208,19 @@ class ApiKeyService {
         key.permissions = key.permissions || 'all'; // 兼容旧数据
         key.dailyCostLimit = parseFloat(key.dailyCostLimit || 0);
         key.dailyCost = await redis.getDailyCost(key.id) || 0;
+        
+        // 获取当前时间窗口的请求次数和Token使用量
+        if (key.rateLimitWindow > 0) {
+          const requestCountKey = `rate_limit:requests:${key.id}`;
+          const tokenCountKey = `rate_limit:tokens:${key.id}`;
+          
+          key.currentWindowRequests = parseInt(await client.get(requestCountKey) || '0');
+          key.currentWindowTokens = parseInt(await client.get(tokenCountKey) || '0');
+        } else {
+          key.currentWindowRequests = 0;
+          key.currentWindowTokens = 0;
+        }
+        
         try {
           key.restrictedModels = key.restrictedModels ? JSON.parse(key.restrictedModels) : [];
         } catch (e) {
diff --git a/web/admin-spa/src/components/apikeys/UsageDetailModal.vue b/web/admin-spa/src/components/apikeys/UsageDetailModal.vue
index 749f2550..f9c4b64d 100644
--- a/web/admin-spa/src/components/apikeys/UsageDetailModal.vue
+++ b/web/admin-spa/src/components/apikeys/UsageDetailModal.vue
@@ -46,10 +46,10 @@
                 <i class="fas fa-coins text-green-500" />
               </div>
               <div class="text-2xl font-bold text-gray-900">
-                {{ formatNumber(totalTokens) }}
+                {{ formatTokenCount(totalTokens) }}
               </div>
               <div class="text-xs text-gray-600 mt-1">
-                今日: {{ formatNumber(dailyTokens) }}
+                今日: {{ formatTokenCount(dailyTokens) }}
               </div>
             </div>
 
@@ -99,7 +99,7 @@
                   <span class="text-sm text-gray-600">输入 Token</span>
                 </div>
                 <span class="text-sm font-semibold text-gray-900">
-                  {{ formatNumber(inputTokens) }}
+                  {{ formatTokenCount(inputTokens) }}
                 </span>
               </div>
               <div class="flex items-center justify-between">
@@ -108,7 +108,7 @@
                   <span class="text-sm text-gray-600">输出 Token</span>
                 </div>
                 <span class="text-sm font-semibold text-gray-900">
-                  {{ formatNumber(outputTokens) }}
+                  {{ formatTokenCount(outputTokens) }}
                 </span>
               </div>
               <div
@@ -120,7 +120,7 @@
                   <span class="text-sm text-gray-600">缓存创建 Token</span>
                 </div>
                 <span class="text-sm font-semibold text-purple-600">
-                  {{ formatNumber(cacheCreateTokens) }}
+                  {{ formatTokenCount(cacheCreateTokens) }}
                 </span>
               </div>
               <div
@@ -132,7 +132,7 @@
                   <span class="text-sm text-gray-600">缓存读取 Token</span>
                 </div>
                 <span class="text-sm font-semibold text-purple-600">
-                  {{ formatNumber(cacheReadTokens) }}
+                  {{ formatTokenCount(cacheReadTokens) }}
                 </span>
               </div>
             </div>
diff --git a/web/admin-spa/src/views/ApiKeysView.vue b/web/admin-spa/src/views/ApiKeysView.vue
index 97e2accb..217180bd 100644
--- a/web/admin-spa/src/views/ApiKeysView.vue
+++ b/web/admin-spa/src/views/ApiKeysView.vue
@@ -546,7 +546,7 @@
                               <i class="fas fa-coins text-yellow-500 mr-1 text-xs" />
                               总Token:
                             </span>
-                            <span class="font-semibold text-gray-900">{{ formatNumber(stat.allTokens) }}</span>
+                            <span class="font-semibold text-gray-900">{{ formatTokenCount(stat.allTokens) }}</span>
                           </div>
                           <div class="flex justify-between items-center text-sm">
                             <span class="text-gray-600 flex items-center">
@@ -561,14 +561,14 @@
                                 <i class="fas fa-arrow-down text-green-500 mr-1" />
                                 输入:
                               </span>
-                              <span class="font-medium">{{ formatNumber(stat.inputTokens) }}</span>
+                              <span class="font-medium">{{ formatTokenCount(stat.inputTokens) }}</span>
                             </div>
                             <div class="flex justify-between items-center text-xs text-gray-500">
                               <span class="flex items-center">
                                 <i class="fas fa-arrow-up text-blue-500 mr-1" />
                                 输出:
                               </span>
-                              <span class="font-medium">{{ formatNumber(stat.outputTokens) }}</span>
+                              <span class="font-medium">{{ formatTokenCount(stat.outputTokens) }}</span>
                             </div>
                             <div
                               v-if="stat.cacheCreateTokens > 0"
@@ -578,7 +578,7 @@
                                 <i class="fas fa-save mr-1" />
                                 缓存创建:
                               </span>
-                              <span class="font-medium">{{ formatNumber(stat.cacheCreateTokens) }}</span>
+                              <span class="font-medium">{{ formatTokenCount(stat.cacheCreateTokens) }}</span>
                             </div>
                             <div
                               v-if="stat.cacheReadTokens > 0"
@@ -588,7 +588,7 @@
                                 <i class="fas fa-download mr-1" />
                                 缓存读取:
                               </span>
-                              <span class="font-medium">{{ formatNumber(stat.cacheReadTokens) }}</span>
+                              <span class="font-medium">{{ formatTokenCount(stat.cacheReadTokens) }}</span>
                             </div>
                           </div>
                         </div>
@@ -623,7 +623,7 @@
                             总请求: <span class="font-semibold text-gray-800">{{ apiKeyModelStats[key.id].reduce((sum, stat) => sum + stat.requests, 0) }}</span>
                           </span>
                           <span class="text-gray-600">
-                            总Token: <span class="font-semibold text-gray-800">{{ formatNumber(apiKeyModelStats[key.id].reduce((sum, stat) => sum + stat.allTokens, 0)) }}</span>
+                            总Token: <span class="font-semibold text-gray-800">{{ formatTokenCount(apiKeyModelStats[key.id].reduce((sum, stat) => sum + stat.allTokens, 0)) }}</span>
                           </span>
                         </div>
                       </div>