From 7973457417e4952cee4b895d225200d989d2c3b1 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 17 Oct 2024 21:39:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E5=8D=A1=E7=89=87=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cards/SiteCard.vue   | 22 +++++++++++-----
 src/views/site/SiteCardListView.vue | 41 ++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index 663b2d36..379ba3cf 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -6,15 +6,15 @@ import SiteUserDataDialog from '../dialog/SiteUserDataDialog.vue'
 import SiteResourceDialog from '../dialog/SiteResourceDialog.vue'
 import SiteCookieUpdateDialog from '../dialog/SiteCookieUpdateDialog.vue'
 import api from '@/api'
-import type { Site, SiteStatistic } from '@/api/types'
+import type { Site, SiteStatistic, SiteUserData } from '@/api/types'
 import { isNullOrEmptyObject } from '@/@core/utils'
-import { VCardActions, VExpandTransition, VSpacer } from 'vuetify/lib/components/index.mjs'
+import { VCardActions, VExpandTransition, VProgressLinear, VSpacer } from 'vuetify/lib/components/index.mjs'
+import { formatFileSize } from '@/@core/utils/formatters'
 
 // 输入参数
 const cardProps = defineProps({
   site: Object as PropType<Site>,
-  width: String,
-  height: String,
+  data: Object as PropType<SiteUserData>,
 })
 
 // 定义触发的自定义事件
@@ -121,6 +121,12 @@ const statColor = computed(() => {
   }
 })
 
+// 计算上传量和下载量的百分比
+const getPercentage = computed(() => {
+  if (cardProps.data?.upload === 0) return 100
+  return ((cardProps.data?.download ?? 0) / ((cardProps.data?.download ?? 0) + (cardProps.data?.upload ?? 0))) * 100
+})
+
 // 保存站点
 function saveSite() {
   siteEditDialog.value = false
@@ -149,8 +155,6 @@ onMounted(() => {
 <template>
   <div>
     <VCard
-      :height="cardProps.height"
-      :width="cardProps.width"
       :variant="cardProps.site?.is_active ? 'elevated' : 'outlined'"
       class="overflow-hidden"
       @click="siteEditDialog = true"
@@ -195,6 +199,9 @@ onMounted(() => {
           :icon="siteActionShow ? 'mdi-chevron-up' : 'mdi-chevron-down'"
           @click.stop="siteActionShow = !siteActionShow"
         />
+        <span class="text-sm">
+          ↑ {{ formatFileSize(cardProps.data?.upload || 0) }} / ↓ {{ formatFileSize(cardProps.data?.download || 0) }}
+        </span>
         <VSpacer />
       </VCardActions>
       <VDivider class="mb-1" v-if="siteActionShow" />
@@ -230,6 +237,9 @@ onMounted(() => {
       <span class="absolute top-1 right-8">
         <VIcon class="cursor-move">mdi-drag</VIcon>
       </span>
+      <div class="w-full absolute bottom-0" v-if="(cardProps.data?.upload || cardProps.data?.download || 0) > 0">
+        <VProgressLinear :model-value="getPercentage" bg-color="success" color="warning" bg-opacity="0.5" height="3" />
+      </div>
     </VCard>
     <!-- 更新站点Cookie & UA弹窗 -->
     <SiteCookieUpdateDialog
diff --git a/src/views/site/SiteCardListView.vue b/src/views/site/SiteCardListView.vue
index 63fac637..62389b30 100644
--- a/src/views/site/SiteCardListView.vue
+++ b/src/views/site/SiteCardListView.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import draggable from 'vuedraggable'
 import api from '@/api'
-import type { Site } from '@/api/types'
+import type { Site, SiteUserData } from '@/api/types'
 import SiteCard from '@/components/cards/SiteCard.vue'
 import NoDataFound from '@/components/NoDataFound.vue'
 import SiteAddEditDialog from '@/components/dialog/SiteAddEditDialog.vue'
@@ -15,8 +15,11 @@ const appMode = computed(() => {
   return localStorage.getItem('MP_APPMODE') != '0' && display.mdAndDown.value
 })
 
-// 数据列表
-const dataList = ref<Site[]>([])
+// 站点列表
+const siteList = ref<Site[]>([])
+
+// 站点数据列表
+const userDataList = ref<SiteUserData[]>([])
 
 // 是否刷新过
 const isRefreshed = ref(false)
@@ -31,7 +34,7 @@ const siteAddDialog = ref(false)
 async function fetchData() {
   try {
     loading.value = true
-    dataList.value = await api.get('site/')
+    siteList.value = await api.get('site/')
     loading.value = false
     isRefreshed.value = true
   } catch (error) {
@@ -39,10 +42,19 @@ async function fetchData() {
   }
 }
 
+// 获取站点最新数据
+async function fetchUserData() {
+  try {
+    userDataList.value = await api.get('site/userdata/latest')
+  } catch (error) {
+    console.error(error)
+  }
+}
+
 // 保存站点排序
 async function savaSitesPriority() {
   // 重新排序
-  const priorities = dataList.value.map((site, index) => ({ id: site.id, pri: index + 1 }))
+  const priorities = siteList.value.map((site, index) => ({ id: site.id, pri: index + 1 }))
   try {
     const result: { [key: string]: any } = await api.post('site/priorities', priorities)
     if (result.success) {
@@ -53,6 +65,11 @@ async function savaSitesPriority() {
   }
 }
 
+// 根据站点ID获取站点数据
+function getUserData(domain: string) {
+  return userDataList.value.find(userData => userData.domain === domain)
+}
+
 // 更新站点事件时
 function onSiteSave() {
   siteAddDialog.value = false
@@ -60,11 +77,15 @@ function onSiteSave() {
 }
 
 // 加载时获取数据
-onBeforeMount(fetchData)
+onBeforeMount(() => {
+  fetchData()
+  fetchUserData()
+})
 
 onActivated(() => {
   if (!loading.value) {
     fetchData()
+    fetchUserData()
   }
 })
 </script>
@@ -73,8 +94,8 @@ onActivated(() => {
   <LoadingBanner v-if="!isRefreshed" class="mt-12" />
   <div>
     <draggable
-      v-if="dataList.length > 0"
-      v-model="dataList"
+      v-if="siteList.length > 0"
+      v-model="siteList"
       @end="savaSitesPriority"
       handle=".cursor-move"
       item-key="id"
@@ -82,12 +103,12 @@ onActivated(() => {
       :component-data="{ 'class': 'grid gap-3 grid-site-card' }"
     >
       <template #item="{ element }">
-        <SiteCard :site="element" @remove="fetchData" @update="fetchData" />
+        <SiteCard :site="element" :data="getUserData(element.domain)" @remove="fetchData" @update="fetchData" />
       </template>
     </draggable>
   </div>
   <NoDataFound
-    v-if="dataList.length === 0 && isRefreshed"
+    v-if="siteList.length === 0 && isRefreshed"
     error-code="404"
     error-title="没有站点"
     error-description="已添加并支持的站点将会在这里显示。"