From b89cc755adebeb8e08856c04cd1fcbf9b6bcf2a5 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Wed, 25 Dec 2024 16:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E8=B4=B9=E9=87=91=E5=B8=81=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/workspace/index.vue | 43 +++++++++++++++++----------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index ee2fd33..c72894a 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -7,6 +7,7 @@ import axios, { all } from "axios";
 import API from "../../api/index";
 import moment from "moment";
 import * as math from 'mathjs';
+import { getTime } from "element-plus/es/components/countdown/src/utils.mjs";
 
 // 变量
 // 加载对象
@@ -93,7 +94,7 @@ const get = async function () {
       {}
     );
     const result2 = await API.post(
-      "http://192.168.8.93:10010/statistics/a",
+      "http://192.168.8.174:10010/statistics/a",
       {}
     );
     const result3 = await API.post(
@@ -953,9 +954,12 @@ onMounted(async function () {
     tooltip: {
       trigger: "item",
       position: ["15%", "-3%"],
+      formatter: function (params) {
+        return params.seriesName + '<br/>' + params.name;
+      }
     },
     legend: {
-      bottom: "-2%",
+      bottom: "-1%",
       left: "center",
       orient: "vertical",
     },
@@ -989,9 +993,12 @@ onMounted(async function () {
     tooltip: {
       trigger: "item",
       position: ["15%", "-3%"],
+      formatter: function (params) {
+        return params.seriesName + '<br/>' + params.name;
+      }
     },
     legend: {
-      bottom: "-2%",
+      bottom: "-1%",
       left: "center",
       orient: "vertical",
     },
@@ -1030,9 +1037,12 @@ onMounted(async function () {
     tooltip: {
       trigger: "item",
       position: ["15%", "-3%"],
+      formatter: function (params) {
+        return params.seriesName + '<br/>' + params.name + (params.value == getSumCoin.value.todayFree ? '</br>6月到期 | ' + statistics.value.free6SumCoin + ' ; 12月到期 | ' + statistics.value.free12SumCoin : '');
+      }
     },
     legend: {
-      bottom: "-2%",
+      bottom: "-1%",
       left: "center",
       orient: "vertical",
     },
@@ -1088,7 +1098,7 @@ onMounted(async function () {
   <div v-loading="loading">
     <el-row :gutter="20">
       <el-col :span="6">
-        <el-card>
+        <el-card style="height: 260px;">
           <p>当前金币余量</p>
           <p class="head-mid-font">
             {{ formatNum(getSumCoin.todayTotalCoin) }}
@@ -1113,14 +1123,17 @@ onMounted(async function () {
               </div>
             </span>
           </p>
-          <template #footer>充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{
-            formatNum(getSumCoin.todayFree)
-          }}
-            任务{{ formatNum(getSumCoin.todayTask) }}</template>
+          <template #footer>
+            <span>充值{{ formatNum(getSumCoin.todayRecharge) }}
+              免费{{ formatNum(getSumCoin.todayFree) }}
+              任务{{ formatNum(getSumCoin.todayTask) }}
+            </span>
+            <p style="font-size: 12px;">免费金币：6月到期 | {{ formatNum(statistics.free6SumCoin) }} ; 12月到期 |{{ formatNum(statistics.free12SumCoin) }}</p>
+          </template>
         </el-card>
       </el-col>
       <el-col :span="6">
-        <el-card>
+        <el-card style="height: 260px;">
           <p>全年累计金币数</p>
           <p class="head-mid-font">
             {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
@@ -1137,7 +1150,7 @@ onMounted(async function () {
         </el-card>
       </el-col>
       <el-col :span="6">
-        <el-card>
+        <el-card style="height: 260px;">
           <p>全年累计消耗金币数</p>
           <p class="head-mid-font">
             {{ formatNum(Math.abs(getYearConsumeCoin.yearsumCoin)) }}
@@ -1153,7 +1166,7 @@ onMounted(async function () {
         </el-card>
       </el-col>
       <el-col :span="6">
-        <el-card>
+        <el-card style="height: 260px;">
           <p>全年累计充值人数</p>
           <p class="head-mid-font">
             {{ formatNum(Math.abs(statistics.rechargeCount)) }}
@@ -1345,9 +1358,9 @@ onMounted(async function () {
             </div>
           </template>
           <div class="pie">
-            <div id="yearRecharge" style="width: 400px; height: 400px"></div>
-            <div id="yearConsume" style="width: 400px; height: 400px"></div>
-            <div id="nowGold" style="width: 400px; height: 400px"></div>
+            <div id="yearRecharge" style="width: 400px; height: 450px"></div>
+            <div id="yearConsume" style="width: 400px; height: 450px"></div>
+            <div id="nowGold" style="width: 400px; height: 450px"></div>
           </div>
         </el-card>
       </el-col>