From 1d3dda0085b6d1485b1447864d5e2dbf5e80bf49 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Thu, 5 Dec 2024 15:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E9=A6=96=E5=85=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9C=80=E4=B8=8B?=
 =?UTF-8?q?=E8=A1=8C=E7=AC=AC=E4=BA=8C=E4=B8=AA=E9=A5=BC=E5=9B=BE=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/workspace/index.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index be6a906..3c5dc92 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -242,9 +242,9 @@ const get = async function () {
         ]
 
         option4Data.value = [
-            { value: Math.abs(getYearConsumeCoin.value.todayRecharge), name: '充值金币' },
-            { value: Math.abs(getYearConsumeCoin.value.todayFree), name: '免费金币' },
-            { value: Math.abs(getYearConsumeCoin.value.todayTask), name: '任务金币' },
+            { value: Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin), name: '充值金币' },
+            { value: Math.abs(getYearConsumeCoin.value.yearSumFreeCoin), name: '免费金币' },
+            { value: Math.abs(getYearConsumeCoin.value.yearSumTaskCoin), name: '任务金币' },
         ];
         console.log('option4Data', option4Data.value);
 
@@ -596,10 +596,6 @@ onMounted(async function () {
     // 第一个饼状图 基于准备好的dom，初始化echarts实例
     var yearRechargePie = echarts.init(document.getElementById('yearRecharge'));
     const option3 = {
-        title: {
-            text: '全年累计金币数(个)\n',
-            subtext: statistics.value.totalSumCoin
-        },
         tooltip: {
             trigger: 'item'
         },
@@ -610,6 +606,7 @@ onMounted(async function () {
         },
         series: [
             {
+                name: '全年累计金币数(个)\n' + statistics.value.totalSumCoin,
                 type: 'pie',
                 radius: ['80%', '60%'],
                 avoidLabelOverlap: false,
@@ -829,7 +826,7 @@ onMounted(async function () {
                     </span>
                 </p>
                 <template #footer>昨日充值人数 {{ formatNum(Math.abs(statistics.rechargeCountYesterday)) }}
-                    ，其中首充（）人</template>
+                    ，其中首充 {{ formatNum(Math.abs(statistics.firstRechargeCountYesterday)) }} 人</template>
             </el-card>
         </el-col>
     </el-row>