Merge pull request #277 from Aqr-K/style/site

src/components/cards/SiteCard.vue

@@ -8,7 +8,6 @@ import SiteCookieUpdateDialog from '../dialog/SiteCookieUpdateDialog.vue'
 import api from '@/api'
 import type { Site, SiteStatistic, SiteUserData } from '@/api/types'
 import { isNullOrEmptyObject } from '@/@core/utils'
-import { VCardActions, VExpandTransition, VProgressLinear, VSpacer } from 'vuetify/lib/components/index.mjs'
 import { formatFileSize } from '@/@core/utils/formatters'
 
 // 输入参数
@@ -204,33 +203,35 @@ onMounted(() => {
         </span>
         <VSpacer />
       </VCardActions>
-      <VDivider class="mb-1" v-if="siteActionShow" />
+      <VExpandTransition v-show="siteActionShow">
-      <VExpandTransition>
+        <div>
-        <div v-show="siteActionShow" class="py-1 pe-12">
+          <VDivider />
-          <VBtn v-if="!cardProps.site?.public" @click.stop="handleSiteUpdate" variant="text">
+          <div class="py-1 pe-12">
-            <template #prepend>
+            <VBtn v-if="!cardProps.site?.public" @click.stop="handleSiteUpdate" variant="text">
-              <VIcon icon="mdi-refresh" />
+              <template #prepend>
-            </template>
+                <VIcon icon="mdi-refresh" />
-            更新
+              </template>
-          </VBtn>
+              更新
-          <VBtn :disabled="testButtonDisable" @click.stop="testSite" variant="text">
+            </VBtn>
-            <template #prepend>
+            <VBtn :disabled="testButtonDisable" @click.stop="testSite" variant="text">
-              <VIcon icon="mdi-link" />
+              <template #prepend>
-            </template>
+                <VIcon icon="mdi-link" />
-            {{ testButtonText }}
+              </template>
-          </VBtn>
+              {{ testButtonText }}
-          <VBtn @click.stop="handleResourceBrowse" variant="text">
+            </VBtn>
-            <template #prepend>
+            <VBtn @click.stop="handleResourceBrowse" variant="text">
-              <VIcon icon="mdi-web" />
+              <template #prepend>
-            </template>
+                <VIcon icon="mdi-web" />
-            浏览
+              </template>
-          </VBtn>
+              浏览
-          <VBtn @click.stop="handleSiteUserData" variant="text">
+            </VBtn>
-            <template #prepend>
+            <VBtn @click.stop="handleSiteUserData" variant="text">
-              <VIcon icon="mdi-chart-bell-curve" />
+              <template #prepend>
-            </template>
+                <VIcon icon="mdi-chart-bell-curve" />
-            数据
+              </template>
-          </VBtn>
+              数据
+            </VBtn>
+          </div>
         </div>
       </VExpandTransition>
       <StatIcon v-if="cardProps.site?.is_active" :color="statColor" />

src/components/dialog/SiteUserDataDialog.vue

@@ -2,7 +2,6 @@
 import type { Site, SiteUserData } from '@/api/types'
 import api from '@/api'
 import { useDisplay, useTheme } from 'vuetify'
-import { VAvatar, VCardText, VIcon } from 'vuetify/lib/components/index.mjs'
 import { formatFileSize } from '@/@core/utils/formatters'
 import VueApexCharts from 'vue3-apexcharts'
 import ProgressDialog from '@/components/dialog/ProgressDialog.vue'
@@ -34,7 +33,6 @@ const siteDatas = ref<SiteUserData[]>([])
 // 最新一天的数据
 const siteData = computed(() => siteDatas.value[siteDatas.value.length - 1])
 
-
 // 站点数据列表中的上传量、下载量数据生成图形使用的数据
 const historySeries = computed(() => {
   return [
@@ -243,13 +241,12 @@ async function fetchSiteUserData() {
   }
 }
 
-
 // 刷新站点数据
-async function refreshSiteData(){
+async function refreshSiteData() {
   progressDialog.value = true
   try {
     const result: { [key: string]: any } = await api.post(`site/userdata/${props.site?.id}`)
-    if (result.success){
+    if (result.success) {
       await fetchSiteUserData()
     }
   } catch (error) {
@@ -267,12 +264,14 @@ onBeforeMount(async () => {
   <VDialog scrollable eager max-width="80rem" :fullscreen="!display.mdAndUp.value">
     <VCard class="rounded-t">
       <VCardItem>
-        <VCardTitle>{{ `数据 - ${props.site?.name}` }}
+        <VCardTitle
-        <IconBtn @click.stop="refreshSiteData" color="info"><VIcon icon="mdi-refresh"</VIcon></IconBtn>
+          >{{ `数据 - ${props.site?.name}` }}
+          <IconBtn @click.stop="refreshSiteData" color="info"><VIcon icon="mdi-refresh" /></IconBtn>
         </VCardTitle>
         <DialogCloseBtn @click="emit('close')" />
       </VCardItem>
-      <VCardText>
+      <VDivider />
+      <VCardText class="pt-5">
         <VRow class="match-height">
           <!-- 用户信息 -->
           <VCol cols="12" md="3">