From 95d2e472868a0379c7e9ecc4ef24c10cc0a18d56 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Sat, 7 Dec 2024 09:47:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E6=9C=80?=
 =?UTF-8?q?=E4=B8=8B=E8=A1=8C=E9=A5=BC=E5=9B=BE=E5=8F=AF=E8=83=BD=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=A4=8D=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index 772747a..445f2ec 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -341,6 +341,7 @@ const handleClick = function () {
     goldTypePay.value = '全部类型';
     goldTypeConsume.value = '全部类型';
 }
+
 // 切换平台
 const changePlatform = function () {
     console.log('changePlatform', platform.value);
@@ -445,7 +446,7 @@ const changePlatform = function () {
 // 计算属性
 // 格式化数字
 const formatNum = function (val) {
-    console.log(val);
+    // console.log(val);
     if (val === undefined) {
         return ''; // 或者返回其他合适的默认值，避免调用toString报错
     } else {
@@ -599,6 +600,7 @@ onMounted(async function () {
     // 使用刚指定的配置项和数据显示图表。
     consumeBar.setOption(option2);
 
+
     // 第一个饼状图 基于准备好的dom，初始化echarts实例
     var yearRechargePie = echarts.init(document.getElementById('yearRecharge'));
     const option3 = {
@@ -612,7 +614,7 @@ onMounted(async function () {
         },
         series: [
             {
-                name: '全年累计金币数(个)\n' + statistics.value.totalSumCoin,
+                name: '全年累计金币数(个)\n' + Math.abs(statistics.value.totalSumCoin),
                 type: 'pie',
                 radius: ['60%', '80%'],
                 avoidLabelOverlap: false,
@@ -650,7 +652,7 @@ onMounted(async function () {
         },
         series: [
             {
-                name: '全年累计消耗金币数(个)\n' + getYearConsumeCoin.value.yearsumCoin,
+                name: '全年累计消耗金币数(个)\n' + Math.abs(getYearConsumeCoin.value.yearsumCoin),
                 type: 'pie',
                 radius: ['60%', '80%'],
                 avoidLabelOverlap: false,
@@ -688,7 +690,7 @@ onMounted(async function () {
         },
         series: [
             {
-                name: '当前金币余量(个)\n' + getSumCoin.value.todayTotalCoin,
+                name: '当前金币余量(个)\n' + Math.abs(getSumCoin.value.todayTotalCoin),
                 type: 'pie',
                 radius: ['60%', '80%'],
                 avoidLabelOverlap: false,
@@ -841,7 +843,7 @@ onMounted(async function () {
         <el-row :gutter="20">
             <el-col>
                 <el-card>
-                    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" @tab-change="handleChange">
                         <el-tab-pane label="金币充值" name="recharge">
                             <div>
                                 合计：充值金币：

From f0eeec268eaf5d76bba50a94f2fd7e713c69f637 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Sat, 7 Dec 2024 10:26:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9A=E5=87=BA=E7=8E=B0=E4=B8=A4=E4=B8=AA=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/recharge/allRecharge.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index 0a0c355..74d63e7 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -410,23 +410,6 @@ onMounted(async function () {
       </el-card>
     </el-col>
   </el-row>
-
-  <!-- 分页 -->
-  <div class="pagination">
-    <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
-      <div>共{{ total }}条,每页</div>
-      <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
-        <el-option v-for="item in [5, 6, 7, 8, 9, 10]" :key="item" :label="item" :value="item"></el-option>
-      </el-select>
-      <div>条</div>
-    </el-pagination>
-    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize" :total="total"
-      :current-page="getObj.pageNum" @current-change="get">
-      <div>跳至</div>
-      <el-input v-model="getObj.pageNum" style="width: 40px" @change="checkNumber" />
-      <div>页</div>
-    </el-pagination>
-  </div>
 </template>
 
 <style scoped>