合一下

1 day ago · 4f3a0ce024
7 changed files with 252 additions and 177 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -10,6 +10,8 @@
      "dependencies": {
        "@element-plus/icons-vue": "^2.3.1",
        "axios": "^1.7.8",
+        "dayjs": "^1.11.13",
+        "dayjs-plugin-utc": "^0.1.2",
        "echarts": "^5.5.1",
        "element-plus": "^2.8.8",
        "lodash": "^4.17.21",
@ -3421,10 +3423,16 @@
    },
    "node_modules/dayjs": {
      "version": "1.11.13",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/dayjs/-/dayjs-1.11.13.tgz",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
      "license": "MIT"
    },
+    "node_modules/dayjs-plugin-utc": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz",
+      "integrity": "sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg==",
+      "license": "MIT"
+    },
    "node_modules/de-indent": {
      "version": "1.0.2",
      "resolved": "https://mirrors.huaweicloud.com/repository/npm/de-indent/-/de-indent-1.0.2.tgz",
--- a/package.json
+++ b/package.json
@ -14,6 +14,8 @@
  "dependencies": {
    "@element-plus/icons-vue": "^2.3.1",
    "axios": "^1.7.8",
+    "dayjs": "^1.11.13",
+    "dayjs-plugin-utc": "^0.1.2",
    "echarts": "^5.5.1",
    "element-plus": "^2.8.8",
    "lodash": "^4.17.21",
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@ -47,7 +47,6 @@

          </el-col>

-
        </el-row>
      </el-card>
    </el-col>
--- a/src/views/audit/refundAudit.vue
+++ b/src/views/audit/refundAudit.vue
@ -387,7 +387,7 @@ const resetSearch = function () {
    startTime: '',
    endTime: '',
  sortField:'',
-  sortOrder:'',
+  sortOrder:''
  }
  dateRange.value = []
 }
--- a/src/views/usergold/clientCountDetail.vue
+++ b/src/views/usergold/clientCountDetail.vue
@ -292,33 +292,6 @@ const calculateFreeGold = (row) => {
 //   }, 0);
 // });

-// 验证页码跳转输入框的数字是否合法
-const checkNumber = function () {
-  if (typeof parseInt(getObj.value.pageNum) === 'number') {
-    console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
-    if (
-      getObj.value.pageNum > 0 &&
-      getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
-    ) {
-      getObj.value.pageNum = parseInt(getObj.value.pageNum)
-      console.log('输入的数字合法')
-      get()
-    } else {
-      //提示
-      ElMessage({
-        type: 'error',
-        message: '请检查输入内容'
-      })
-    }
-  } else {
-    //提示
-    ElMessage({
-      type: 'error',
-      message: '输入非法'
-    })
-  }
-}
-
 // 新增排序字段和排序方式
 const sortField = ref('')
 const sortOrder = ref('')
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@ -9,15 +9,22 @@
        <template #header>
          <div class="card-header">
            <div class="card-title">当前金币余量</div>
-            <div>{{ currentGold / 100 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;较前一日 {{ dailyChange / 100 }} 
+            <div>{{ currentGold / 100 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;较前一日 {{
+              dailyChange / 100 }}
              <template v-if="dailyChange > 0">
-                <el-icon style="color:red"><ArrowUpBold /></el-icon>
+                <el-icon style="color:red">
+                  <ArrowUpBold />
+                </el-icon>
              </template>
              <template v-else-if="dailyChange < 0">
-                <el-icon style="color:forestgreen"><ArrowDownBold /></el-icon>
+                <el-icon style="color:forestgreen">
+                  <ArrowDownBold />
+                </el-icon>
              </template>
              <template v-else>
-                <el-icon style="color:grey"><SemiSelect /></el-icon>
+                <el-icon style="color:grey">
+                  <SemiSelect />
+                </el-icon>
              </template>
            </div>
          </div>
@ -25,7 +32,9 @@
        <div>
          <div class="margin-bottom">永久金币：{{ currentPermanent / 100 }}</div>
          <div class="margin-bottom">免费金币：{{ currentFree / 100 }}</div>
-          <div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;&nbsp;&nbsp;[12月到期|{{ currentFreeDecember / 100 }}]</div>
+          <div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;&nbsp;&nbsp;[12月到期|{{
+            currentFreeDecember /
+            100 }}]</div>
          <div>任务金币：{{ currentTask / 100 }}</div>
        </div>
      </el-card>
@ -38,7 +47,7 @@
        <div class="card-title">{{ yearlyRecharge / 100 }}</div>
        <div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
        <div class="center-card">折合新币累计金额:{{ yearlyMoney / 100 }}</div>
-        <template #footer >
+        <template #footer>
          <el-col class="margin-bottom center-card">昨日新增：{{ recharge / 100 }}</el-col>
          <el-col class="margin-bottom center-card">其中充值：{{ money / 100 }}</el-col>
        </template>
@ -66,28 +75,40 @@
      <el-card class="card-item">
        <el-col class="card-title">全年累计充值人头数</el-col>
        <el-col class="card-title">{{ yearlyRechargeNum }}</el-col>
-        <el-col class="center-card">周同比:{{ wow }}%&nbsp;&nbsp;&nbsp;&nbsp;
-        <template v-if="wow > 0">
-                <el-icon style="color:red"><ArrowUpBold /></el-icon>
-              </template>
-              <template v-else-if="wow < 0">
-                <el-icon style="color:forestgreen"><ArrowDownBold /></el-icon>
-              </template>
-              <template v-else>
-                <el-icon style="color:grey"><SemiSelect /></el-icon>
-              </template>
-            </el-col>
-        <el-col class="center-card">日环比:{{ daily }}%&nbsp;&nbsp;&nbsp;&nbsp;
-        <template v-if="daily > 0">
-                <el-icon style="color:red"><ArrowUpBold /></el-icon>
-              </template>
-              <template v-else-if="daily < 0">
-                <el-icon style="color:forestgreen"><ArrowDownBold /></el-icon>
-              </template>
-              <template v-else>
-                <el-icon style="color:grey"><SemiSelect /></el-icon>
-              </template>
-            </el-col>
+        <el-col class="center-card">周同比:{{ sumWow }}%&nbsp;&nbsp;&nbsp;&nbsp;
+          <template v-if="sumWow > 0">
+            <el-icon style="color:red">
+              <ArrowUpBold />
+            </el-icon>
+          </template>
+          <template v-else-if="sumWow < 0">
+            <el-icon style="color:forestgreen">
+              <ArrowDownBold />
+            </el-icon>
+          </template>
+          <template v-else>
+            <el-icon style="color:grey">
+              <SemiSelect />
+            </el-icon>
+          </template>
+        </el-col>
+        <el-col class="center-card">日环比:{{ sumDaily }}%&nbsp;&nbsp;&nbsp;&nbsp;
+          <template v-if="sumDaily > 0">
+            <el-icon style="color:red">
+              <ArrowUpBold />
+            </el-icon>
+          </template>
+          <template v-else-if="sumDaily < 0">
+            <el-icon style="color:forestgreen">
+              <ArrowDownBold />
+            </el-icon>
+          </template>
+          <template v-else>
+            <el-icon style="color:grey">
+              <SemiSelect />
+            </el-icon>
+          </template>
+        </el-col>
        <template #footer>
          <el-col class="margin-bottom center-card">昨日充值人数：{{ rechargeNum }}</el-col>
          <el-col class="margin-bottom center-card">其中首充：{{ firstRecharge }}</el-col>
@ -100,22 +121,32 @@
    <el-col :span="24">
      <el-card style="width: 100%">
        <el-row>
-          <el-col :span="15">
+          <el-col :span="21">
            <el-tabs v-model="activeTab" @tab-change="handleTabChange">
              <el-tab-pane label="金币充值" name="recharge"></el-tab-pane>
              <el-tab-pane label="金币消费" name="consume"></el-tab-pane>
            </el-tabs>
          </el-col>
-          <el-col :span="9" style="text-align: right">
-            <el-radio-group v-model="timeRange" @change="handleTimeRangeChange" style="margin-right: 5px; margin-top:5px">
-              <el-radio-button label="day" style="border-color: white">今日</el-radio-button>
-              <el-radio-button label="week" style="border-color: white">本周</el-radio-button>
-              <el-radio-button label="month" style="border-color: white">本月</el-radio-button>
-              <el-radio-button label="year" style="border-color: white">本年</el-radio-button>
-            </el-radio-group>
-            <el-date-picker v-model="dateRange" type="daterange"  range-separator="→" start-placeholder="开始时间" end-placeholder="结束时间"
-              style="width: 200px" @change="handleDateRangeChange" value-format="YYYY-MM-DD HH:mm:ss" />
-            <el-button type="primary" style="margin-left: 5px" @click="getChartData">查询</el-button>
+          <el-col :span="24">
+            <el-row>
+              <div style="margin-top:5px">合计&nbsp;&nbsp;&nbsp;&nbsp;
+                永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100
+                }}&nbsp;&nbsp;&nbsp;&nbsp;
+                免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100
+                }}&nbsp;&nbsp;&nbsp;&nbsp;
+                任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100
+                }}&nbsp;&nbsp;&nbsp;&nbsp;
+              </div>
+              <div>
+                <el-button @click="getToday()" label="day" style="margin-left:250px">今日</el-button>
+                <el-button @click="getWeek()" label="week">本周</el-button>
+                <el-button @click="getMonth()" label="month">本月</el-button>
+                <el-button @click="getYear()" label="year">本年</el-button>
+              </div>
+              <el-date-picker v-model="dateRange" type="datetimerange" range-separator="→" start-placeholder="开始时间"
+                end-placeholder="结束时间" style="margin-left:10px" />
+              <el-button type="primary" style="margin-left: 5px" @click="getChartData">查询</el-button>
+            </el-row>
          </el-col>
        </el-row>

@ -139,7 +170,7 @@
                <el-table-column prop="market" label="地区" align="center"></el-table-column>
                <el-table-column prop="coinAmount" label="金币数量" align="center">
                  <template #default="{ row }">
-                    {{ row.coinAmount.toLocaleString()  }}
+                    {{ row.coinAmount.toLocaleString() }}
                  </template>
                </el-table-column>
              </el-table>
@ -156,17 +187,26 @@ import * as echarts from 'echarts'
 import { ref, onMounted, nextTick, watch } from 'vue'
 import API from '@/util/http'
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs';
+import utc from 'dayjs-plugin-utc'
+dayjs.extend(utc)
 import { ArrowUpBold, ArrowDownBold, SemiSelect } from '@element-plus/icons-vue'
 // 地区数据
 const markets = ref([])
 // 图表相关
-const activeTab = ref('recharge')
-const timeRange = ref('')
 const dateRange = ref([])
+const activeTab = ref('recharge')
 const selectedType = ref('all')
 const tableData = ref([])
 const chartRef = ref(null)
 let chartInstance = null
+// 图表合计数
+const sumRechargePermanent = ref(0)
+const sumRechargeFree = ref(0)
+const sumRechargeTask = ref(0)
+const sumConsumePermanent = ref(0)
+const sumConsumeFree = ref(0)
+const sumConsumeTask = ref(0)
 // 用户信息
 const adminData = ref({})
 // 卡片数据相关
@ -188,12 +228,54 @@ const dailyReduce = ref(0)
 const dailyConsume = ref(0)
 const dailyRefund = ref(0)
 const yearlyRechargeNum = ref(0)
-const wow = ref(0)
-const daily = ref(0)
+const sumWow = ref(0)
+const sumDaily = ref(0)
 const rechargeNum = ref(0)
 const firstRecharge = ref(0)
+const length = ref(0)
+const formatDate = function(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      const hours = String(date.getHours()).padStart(2, '0');
+      const minutes = String(date.getMinutes()).padStart(2, '0');
+      const seconds = String(date.getSeconds()).padStart(2, '0');
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    }
+// 今天
+const getToday = function () {
+  const today = new Date()
+  const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate())
+  const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
+  dateRange.value = [formatDate(startTime), formatDate(endTime)]
+  console.log('看看dateRange', dateRange.value)
+}
+// 本周
+const getWeek = function () {
+  const today = new Date()
+  const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6)
+  const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
+  dateRange.value = [formatDate(startTime), formatDate(endTime)]
+  console.log('看看dateRange', dateRange.value)
+}
+// 本月
+const getMonth = function () {
+  const today = new Date()
+  const startTime = new Date(today.getFullYear(), today.getMonth(), 1)
+  const endTime = new Date(today.getFullYear(), today.getMonth() + 1, 1)
+  dateRange.value = [formatDate(startTime), formatDate(endTime)]
+  console.log('看看dateRange', dateRange.value)
+}
+// 本年
+const getYear = function () { 
+  const today = new Date()
+  const startTime = new Date(today.getFullYear(), 0, 1)
+  const endTime = new Date(today.getFullYear() + 1, 0, 1)
+  dateRange.value = [formatDate(startTime), formatDate(endTime)]
+  console.log('看看dateRange', dateRange.value)
+}

-// 处理用，因为要加上所有市场的，还有额外计算的(总数 = 永久 + 6月 + 12月 + 免费 + 任务)
+// 要加上所有市场的，还有额外计算的(总数 = 永久 + 6月 + 12月 + 免费 + 任务)
 const processData = (data) => {
  const summary = {
    currentGold: 0,
@ -221,8 +303,8 @@ const processData = (data) => {
    yearlyReduce: 0,
    rechargeNum: 0,
    firstRecharge: 0,
-    wow: 0,
-    daily: 0,
+    sumWow: 0,
+    sumDaily: 0,
    yearlyRechargeNum: 0
  }

@ -235,6 +317,10 @@ const processData = (data) => {
    }
  })

+  // wow和daily除一下
+  length.value = data.markets.length
+  console.log(length.value)
+
  // 计算昨日新增消费和退款
  const yesterdayConsume = summary.consumePermanent + summary.consumeFreeJune + summary.consumeFreeDecember + summary.consumeTask
  const yesterdayRefund = summary.refundPermanent + summary.refundFreeJune + summary.refundFreeDecember + summary.refundTask
@ -261,8 +347,8 @@ const processData = (data) => {
  dailyRefund.value = yesterdayRefund

  yearlyRechargeNum.value = summary.yearlyRechargeNum
-  wow.value = summary.wow
-  daily.value = summary.daily
+  sumWow.value = summary.sumWow / length.value
+  sumDaily.value = summary.sumDaily / length.value
  rechargeNum.value = summary.rechargeNum
  firstRecharge.value = summary.firstRecharge
 }
@ -292,18 +378,19 @@ const getChartData = async () => {
      await getMarkets()
    }

-    // 构建请求参数
+
    const params = {
      markets: markets.value,
-      startDate: dateRange.value[0] || '2025-01-01 00:00:00',
-      endDate: dateRange.value[1] || '2025-12-31 23:59:59'
-    }
+      startDate: dateRange.value[0],
+      endDate: dateRange.value[1]
+    };
+

    const response = await API({
      url: '/workbench/getGraph',
      data: params
    })
-    
+    console.log('看看params', params)
    if (Array.isArray(response.marketGraphs)) {
      // 处理图表数据
      processChartData(response.marketGraphs)
@ -318,7 +405,6 @@ const getChartData = async () => {
    ElMessage.error('获取图表数据失败')
  }
 }
-
 // 处理图表数据
 const processChartData = (marketCards) => {
  // 准备图表数据
@ -330,6 +416,13 @@ const processChartData = (marketCards) => {
    consumeFree: [],
    consumeTask: []
  }
+  // 这是图表的合计数，怎样遍历？？？？？
+  const sumRechargePermanent1 = ref(0)
+  const sumRechargeFree1 = ref(0)
+  const sumRechargeTask1 = ref(0)
+  const sumConsumePermanent1 = ref(0)
+  const sumConsumeFree1 = ref(0)
+  const sumConsumeTask1 = ref(0)

  // 按市场组织数据
  marketCards.forEach(market => {
@ -339,23 +432,62 @@ const processChartData = (marketCards) => {
    chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0)
    chartData.consumeFree.push(market.sumConsumeFree / 100 || 0)
    chartData.consumeTask.push(market.sumConsumeTask / 100 || 0)
+
+    // 合计数合计数合计数咋算
+    sumRechargePermanent1.value += (market.sumRechargePermanent || 0)
+    sumRechargeFree1.value += (market.sumRechargeFree || 0)
+    //sumRechargeTask1.value += (market.sumRechargeTask || 0)
+    sumConsumePermanent1.value += (market.sumConsumePermanent || 0)
+    sumConsumeFree1.value += (market.sumConsumeFree || 0)
+    sumConsumeTask1.value += (market.sumConsumeTask || 0)
  })
+  sumRechargePermanent.value = sumRechargePermanent1.value
+  sumRechargeFree.value = sumRechargeFree1.value
+  sumRechargeTask.value = 0
+  sumConsumePermanent.value = sumConsumePermanent1.value
+  sumConsumeFree.value = sumConsumeFree1.value
+  sumConsumeTask.value = sumConsumeTask1.value

  // 根据当前选中的标签更新图表
  updateChart(chartData)
 }

-// 处理排名数据 - 修改点：根据接口字段计算金币数量
 const processRankingData = (marketCards) => {
-  // 根据当前选中的标签计算每个市场的总金币数量
+  // 根据当前选中的标签和类型计算每个市场的总金币数量
  const rankingData = marketCards.map(market => {
    let coinAmount = 0;
    if (activeTab.value === 'recharge') {
-      // 充值排名：永久金币 + 免费金币
-      coinAmount = (market.sumRechargePermanent / 100 || 0) + (market.sumRechargeFree / 100 || 0);
+      // 充值排名
+      switch (selectedType.value) {
+        case 'all':
+          coinAmount = (market.sumRechargePermanent / 100 || 0) + (market.sumRechargeFree / 100 || 0) + (market.sumRechargeTask / 100 || 0);
+          break;
+        case 'permanent':
+          coinAmount = market.sumRechargePermanent / 100 || 0;
+          break;
+        case 'free':
+          coinAmount = market.sumRechargeFree / 100 || 0;
+          break;
+        case 'task':
+          coinAmount = market.sumRechargeTask / 100 || 0;
+          break;
+      }
    } else {
-      // 消费排名：永久金币 + 免费金币 + 任务金币
-      coinAmount = (market.sumConsumePermanent / 100 || 0) + (market.sumConsumeFree / 100 || 0) + (market.sumConsumeTask / 100 || 0);
+      // 消费排名
+      switch (selectedType.value) {
+        case 'all':
+          coinAmount = (market.sumConsumePermanent / 100 || 0) + (market.sumConsumeFree / 100 || 0) + (market.sumConsumeTask / 100 || 0);
+          break;
+        case 'permanent':
+          coinAmount = market.sumConsumePermanent / 100 || 0;
+          break;
+        case 'free':
+          coinAmount = market.sumConsumeFree / 100 || 0;
+          break;
+        case 'task':
+          coinAmount = market.sumConsumeTask / 100 || 0;
+          break;
+      }
    }
    return {
      market: market.market, // 使用 market 字段作为地区名称
@ -373,6 +505,10 @@ const processRankingData = (marketCards) => {
  }));
 }

+// 监听 selectedType 的变化，重新处理排名数据
+watch(selectedType, () => {
+  getChartData();
+});
 // 更新图表
 const updateChart = (chartData) => {
  if (!chartInstance) {
@ -390,7 +526,7 @@ const updateChart = (chartData) => {
        stack: 'recharge',
        data: chartData.rechargePermanent,
        itemStyle: { color: '#5470c6' },
-        barWidth:30
+        barWidth: 30
      },
      {
        name: '免费金币',
@ -398,7 +534,7 @@ const updateChart = (chartData) => {
        stack: 'recharge',
        data: chartData.rechargeFree,
        itemStyle: { color: '#91cc75' },
-        barWidth:30
+        barWidth: 30
      },
      {
        name: '任务金币',
@ -406,10 +542,10 @@ const updateChart = (chartData) => {
        stack: 'recharge',
        data: chartData.rechargeTask,
        itemStyle: { color: '#fac858' },
-        barWidth:30
+        barWidth: 30
      }
    ]
-    legend = ['永久金币', '免费金币','任务金币']
+    legend = ['永久金币', '免费金币', '任务金币']
  } else {
    series = [
      {
@ -418,7 +554,7 @@ const updateChart = (chartData) => {
        stack: 'consume',
        data: chartData.consumePermanent,
        itemStyle: { color: '#5470c6' },
-        barWidth:30
+        barWidth: 30
      },
      {
        name: '免费金币',
@ -426,7 +562,7 @@ const updateChart = (chartData) => {
        stack: 'consume',
        data: chartData.consumeFree,
        itemStyle: { color: '#91cc75' },
-        barWidth:30
+        barWidth: 30
      },
      {
        name: '任务金币',
@ -434,7 +570,7 @@ const updateChart = (chartData) => {
        stack: 'consume',
        data: chartData.consumeTask,
        itemStyle: { color: '#fac858' },
-        barWidth:30
+        barWidth: 30
      }
    ]
    legend = ['永久金币', '免费金币', '任务金币']
@ -447,7 +583,7 @@ const updateChart = (chartData) => {
      axisPointer: {
        type: 'shadow'
      },
-      formatter: function(params) {
+      formatter: function (params) {
        let result = params[0].name + '<br/>'
        params.forEach(param => {
          result += `${param.seriesName}: ${param.value.toLocaleString()}<br/>`
@ -476,7 +612,7 @@ const updateChart = (chartData) => {
    yAxis: {
      type: 'value',
      axisLabel: {
-        formatter: function(value) {
+        formatter: function (value) {
          return value.toLocaleString()
        }
      }
@ -490,60 +626,9 @@ const updateChart = (chartData) => {
 // 处理标签切换
 const handleTabChange = () => {
  getChartData()
+  console.log('标签切换调用图表')
 }

-// 处理时间范围变化
-const handleTimeRangeChange = () => {
-  // 根据时间范围设置日期范围
-  const now = new Date()
-  let startDate, endDate
-  
-  if (timeRange.value === 'day') {
-    startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate())
-    endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59)
-  } else if (timeRange.value === 'week') {
-    const day = now.getDay()
-    const diff = now.getDate() - day + (day === 0 ? -6 : 1)
-    startDate = new Date(now.setDate(diff))
-    startDate.setHours(0, 0, 0, 0)
-    endDate = new Date(now)
-    endDate.setDate(now.getDate() + 6)
-    endDate.setHours(23, 59, 59, 0)
-  } else if (timeRange.value === 'month') {
-    startDate = new Date(now.getFullYear(), now.getMonth(), 1)
-    endDate = new Date(now.getFullYear(), now.getMonth() + 1, 0)
-    endDate.setHours(23, 59, 59, 0)
-  } else {
-    startDate = new Date(now.getFullYear(), 0, 1)
-    endDate = new Date(now.getFullYear(), 11, 31)
-    endDate.setHours(23, 59, 59, 0)
-  }
-  
-  dateRange.value = [
-    formatDate(startDate),
-    formatDate(endDate)
-  ]
-  
-  getChartData()
-}
-
-// 格式化日期为字符串
-const formatDate = (date) => {
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, '0')
-  const day = String(date.getDate()).padStart(2, '0')
-  const hours = String(date.getHours()).padStart(2, '0')
-  const minutes = String(date.getMinutes()).padStart(2, '0')
-  const seconds = String(date.getSeconds()).padStart(2, '0')
-  
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
-}
-
-// 处理日期范围变化
-const handleDateRangeChange = () => {
-  timeRange.value = 'custom'
-  getChartData()
-}
 const getAdminData = async function () {
  try {
    const result = await API({ url: '/admin/userinfo', data: {} })
@ -569,12 +654,15 @@ const getCardData = async () => {
  }
 }

+
 onMounted(async () => {
+
  await getAdminData()
  await getCardData()
  await getMarkets()
+  getYear() 
  await getChartData()
-  handleTimeRangeChange() // 初始化时间范围
+  console.log('挂载后调用')
 })
 </script>

@ -646,7 +734,12 @@ onMounted(async () => {
 }

@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
 }
 </style>
--- a/stats.html
+++ b/stats.html