From b638b5ba5b3e5328fa3d51771bf63c475e516693 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Thu, 5 Dec 2024 21:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BD=93=E9=AA=8C=20=E7=82=B9=E5=87=BBIP=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=ACip138=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=9F=A5=E8=AF=A2,=20=E4=BC=98=E5=8C=96=E9=9D=9E?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=A4=A7=E5=B0=8F=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TaskManagement.vue   | 51 ++++++++++++++++++++++++++++++++--
 src/views/UserEvents.vue       | 12 +++++++-
 src/views/visitor/TaskList.vue | 35 +++++++++++++++++------
 3 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/src/views/TaskManagement.vue b/src/views/TaskManagement.vue
index a0dbc1f..9d12198 100644
--- a/src/views/TaskManagement.vue
+++ b/src/views/TaskManagement.vue
@@ -34,7 +34,17 @@
         :header-cell-style="{ background: '#f5f7fa' }"
         border>
         <el-table-column prop="tid" label="任务UUID" width="350" />
-        <el-table-column prop="client_ip" label="客户端IP" width="140" />
+        <el-table-column prop="client_ip" label="客户端IP" width="140">
+          <template #default="{ row }">
+            <el-link 
+              type="primary" 
+              :href="`https://ip138.com/iplookup.php?ip=${row.client_ip}`"
+              target="_blank"
+              :underline="false">
+              {{ row.client_ip }}
+            </el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="add_time" label="添加时间" width="180">
           <template #default="scope">
             {{ formatDateTime(scope.row.add_time) }}
@@ -235,6 +245,12 @@
           <el-button type="primary" @click="downloadFile" :disabled="!currentTaskDetails.url">
             <el-icon><Download /></el-icon>下载文件
           </el-button>
+          <el-button 
+            type="success" 
+            @click="downloadProxiedFile"
+            :disabled="!canDownloadProxied">
+            <el-icon><Connection /></el-icon>下载文件(已代理)
+          </el-button>
         </div>
       </div>
     </el-dialog>
@@ -249,8 +265,9 @@ import {
   Plus, Delete, Monitor, Search, 
   InfoFilled, DocumentCopy, Download,
   VideoPlay, VideoPause, RefreshRight,
-  Top 
+  Top, Connection
 } from '@element-plus/icons-vue'
+import { API_BASE_URL } from '../config/api.config'
 
 const loading = ref(false)
 const total = ref(0)
@@ -643,6 +660,25 @@ onUnmounted(() => {
     isMobile.value = window.innerWidth <= 768
   })
 })
+
+// 判断是否可以使用代理下载
+const canDownloadProxied = computed(() => {
+  if (!currentTaskDetails.value) return false
+  
+  const validStatus = [3, 4]  // 3: 已完成, 4: 已缓存
+  return (
+    validStatus.includes(currentTaskDetails.value.status) && 
+    currentTaskDetails.value.tag !== 'CLEANED'
+  )
+})
+
+// 添加代理下载方法
+const downloadProxiedFile = () => {
+  if (!currentTaskDetails.value || !canDownloadProxied.value) return
+  
+  const downloadUrl = `${API_BASE_URL}/Download/${currentTaskDetails.value.tid}`
+  window.open(downloadUrl, '_blank')
+}
 </script>
 
 <style scoped>
@@ -769,6 +805,7 @@ onUnmounted(() => {
   display: flex;
   gap: 12px;
   justify-content: flex-end;
+  flex-wrap: wrap;  /* 允许按钮换行 */
 }
 
 :deep(.el-descriptions__cell) {
@@ -863,6 +900,16 @@ onUnmounted(() => {
       }
     }
   }
+
+  .details-actions {
+    flex-direction: column;
+    gap: 8px;
+    
+    .el-button {
+      width: 100%;
+      justify-content: center;
+    }
+  }
 }
 
 /* 平板端样式调整 */
diff --git a/src/views/UserEvents.vue b/src/views/UserEvents.vue
index 79e192f..f59a697 100644
--- a/src/views/UserEvents.vue
+++ b/src/views/UserEvents.vue
@@ -72,7 +72,17 @@
         <el-table-column 
           prop="eventIP" 
           label="IP地址" 
-          :width="isMobile ? '100' : '140'" />
+          :width="isMobile ? '100' : '140'">
+          <template #default="{ row }">
+            <el-link 
+              type="primary" 
+              :href="`https://ip138.com/iplookup.php?ip=${row.eventIP}`"
+              target="_blank"
+              :underline="false">
+              {{ row.eventIP }}
+            </el-link>
+          </template>
+        </el-table-column>
         <el-table-column 
           prop="eventDetail" 
           label="详细信息" 
diff --git a/src/views/visitor/TaskList.vue b/src/views/visitor/TaskList.vue
index c06eb2b..2addcc5 100644
--- a/src/views/visitor/TaskList.vue
+++ b/src/views/visitor/TaskList.vue
@@ -31,10 +31,19 @@
 
         <el-table-column 
           label="大小" 
-          prop="size"
-          :formatter="formatFileSize"
           width="120"
-          class-name="hidden-on-mobile" />
+          class-name="hidden-on-mobile">
+          <template #default="{ row }">
+            <span>{{ formatFileSize(row.size) }}</span>
+            <template v-if="row.size < 0">
+              <el-tooltip 
+                content="这个大小可能不准确, 实际文件大小将会在下载完成后更新" 
+                placement="top">
+                <el-icon class="ml-2"><InfoFilled /></el-icon>
+              </el-tooltip>
+            </template>
+          </template>
+        </el-table-column>
 
         <el-table-column 
           label="提交时间" 
@@ -97,6 +106,7 @@
 <script setup>
 import { ref, onMounted, inject } from 'vue'
 import { ElMessage } from 'element-plus'
+import { InfoFilled } from '@element-plus/icons-vue'
 import { getRandomTip } from '@/utils/visitorTips'
 import { VisitorAPI } from '@/api/visitor'
 import { API_BASE_URL } from '@/config/api.config'
@@ -129,16 +139,16 @@ const formatDateTime = (dateStr) => {
   return new Date(dateStr).toLocaleString()
 }
 
-const formatFileSize = (row, column, cellValue) => {
-  if (!cellValue) return '0 B'
+const formatFileSize = (size) => {
+  if (!size && size !== 0) return '0 B'
   const units = ['B', 'KB', 'MB', 'GB', 'TB']
-  let size = cellValue
+  let value = Math.abs(size)  // 使用绝对值来处理负数
   let unitIndex = 0
-  while (size >= 1024 && unitIndex < units.length - 1) {
-    size /= 1024
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024
     unitIndex++
   }
-  return `${size.toFixed(2)} ${units[unitIndex]}`
+  return `${value.toFixed(2)} ${units[unitIndex]}`
 }
 
 const fetchTasks = async () => {
@@ -224,4 +234,11 @@ onMounted(() => {
     }
   }
 }
+
+.ml-2 {
+  margin-left: 4px;
+  color: #909399;
+  font-size: 14px;
+  vertical-align: middle;
+}
 </style> 
\ No newline at end of file