Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

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>