重置
@@ -263,42 +272,17 @@ onMounted(async function () {
@@ -311,6 +295,7 @@ onMounted(async function () {
.pagination {
display: flex;
}
+
.status {
display: flex;
}
diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index 3c5dc92..14a93af 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -6,6 +6,8 @@ import { Bs1CircleFill, Bs2CircleFill, Bs3CircleFill, Bs4Circle, Bs5Circle, Bs6C
import axios, { all } from 'axios';
// 变量
+// 加载对象
+const loading = ref(true)
// 总览对象
const getSumCoin = ref({});
const statistics = ref({});
@@ -136,13 +138,13 @@ const get = async function () {
payMonthRecharge.value = getMediuPayCoin.value.map(item => Math.abs(item.rechargeSumCoin)).reverse();
payMonthFree.value = getMediuPayCoin.value.map(item => Math.abs(item.freeSumCoin)).reverse();
payMonthTask.value = getMediuPayCoin.value.map(item => Math.abs(item.taskSumCoin)).reverse();
- payMonthRecharge.value.forEach((number)=>{
+ payMonthRecharge.value.forEach((number) => {
payTotalRecharge.value += number
})
- payMonthFree.value.forEach((number)=>{
+ payMonthFree.value.forEach((number) => {
payTotalFree.value += number
})
- payMonthTask.value.forEach((number)=>{
+ payMonthTask.value.forEach((number) => {
payTotalTask.value += number
})
console.log('payMonthCategory', payMonthCategory.value);
@@ -157,13 +159,13 @@ const get = async function () {
consumeMonthRecharge.value = getMediuConsumeCoin.value.map(item => Math.abs(item.rechargeSumCoin)).reverse();
consumeMonthFree.value = getMediuConsumeCoin.value.map(item => Math.abs(item.freeSumCoin)).reverse();
consumeMonthTask.value = getMediuConsumeCoin.value.map(item => Math.abs(item.taskSumCoin)).reverse();
- consumeMonthRecharge.value.forEach((number)=>{
+ consumeMonthRecharge.value.forEach((number) => {
consumeTotalRecharge.value += number
})
- consumeMonthFree.value.forEach((number)=>{
+ consumeMonthFree.value.forEach((number) => {
consumeTotalFree.value += number
})
- consumeMonthTask.value.forEach((number)=>{
+ consumeMonthTask.value.forEach((number) => {
consumeTotalTask.value += number
})
console.log('consumeMonthCategory', consumeMonthCategory.value);
@@ -293,6 +295,9 @@ const get = async function () {
{ value: (Number(ERPData.value[2].value) + Number(HCData.value[2].value) + Number(LinkData.value[2].value) + Number(goldData.value[2].value)), name: '第3学科' },
{ value: (Number(ERPData.value[3].value) + Number(HCData.value[3].value) + Number(LinkData.value[3].value) + Number(goldData.value[3].value)), name: '第4学科' },
]
+
+ loading.value = false;
+
console.log('allData', allData.value);
} catch (error) {
console.log('请求失败', error);
@@ -608,7 +613,7 @@ onMounted(async function () {
{
name: '全年累计金币数(个)\n' + statistics.value.totalSumCoin,
type: 'pie',
- radius: ['80%', '60%'],
+ radius: ['60%', '80%'],
avoidLabelOverlap: false,
label: {
show: true,
@@ -646,7 +651,7 @@ onMounted(async function () {
{
name: '全年累计消耗金币数(个)\n' + getYearConsumeCoin.value.yearsumCoin,
type: 'pie',
- radius: ['80%', '60%'],
+ radius: ['60%', '80%'],
avoidLabelOverlap: false,
label: {
show: true,
@@ -684,7 +689,7 @@ onMounted(async function () {
{
name: '当前金币余量(个)\n' + getSumCoin.value.todayTotalCoin,
type: 'pie',
- radius: ['80%', '60%'],
+ radius: ['60%', '80%'],
avoidLabelOverlap: false,
label: {
show: true,
@@ -728,337 +733,349 @@ onMounted(async function () {
-
-
-
- 当前金币余量
-
-
- {{ formatNum(getSumCoin.todayTotalCoin) }}
-
-
-
-
- 较前一天 {{ formatNum(getSumCoin.coinDifference) }}
-
-
-
-
-
- 较前一天 {{ formatNum(getSumCoin.coinDifference) }}
-
-
-
-
-
- 较前一天 {{ formatNum(getSumCoin.coinDifference) }}
-
-
-
-
- 充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{ formatNum(getSumCoin.todayFree) }}
- 任务{{ formatNum(getSumCoin.todayTask) }}
-
-
-
-
- 全年累计金币数
- {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
- 折合新币累计金额 {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
- 昨日新增 {{ formatNum(Math.abs(statistics.totalYesterdaySumCoin)) }} ,其中充值 {{
- formatNum(Math.abs(statistics.rechargeYesterdaySumCoin)) }}
-
-
-
-
- 全年累计消费金币数
- {{ formatNum(Math.abs(getYearConsumeCoin.yearsumCoin)) }}
- 消费 {{ formatNum(Math.abs(getYearConsumeCoin.yearConsumeCoin)) }}; 退款 {{
- formatNum(Math.abs(getYearConsumeCoin.yearRefundCoin))
- }}
- 昨日新增消耗 {{ formatNum(Math.abs(getDayConsumeCoin.daysumCoin)) }} ; 消费 {{
- formatNum(Math.abs(getDayConsumeCoin.dayConsumeCoin)) }} ; 退款 {{
- formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin))
- }}
-
-
-
-
- 全年累计充值人数
- {{ formatNum(Math.abs(statistics.rechargeCount)) }}
-
-
-
- 周同比 {{ statistics.weekOverWeekRate }}%
-
-
-
-
-
- 周同比 {{ statistics.weekOverWeekRate }}%
-
-
-
-
-
- 周同比 {{ statistics.weekOverWeekRate }}%
-
-
-
-
-
-
- 日环比{{ statistics.dayOverDayRate }}%
-
-
-
-
-
- 日环比{{ statistics.dayOverDayRate }}%
-
-
-
-
-
- 日环比{{ statistics.dayOverDayRate }}%
-
-
-
-
- 昨日充值人数 {{ formatNum(Math.abs(statistics.rechargeCountYesterday)) }}
- ,其中首充 {{ formatNum(Math.abs(statistics.firstRechargeCountYesterday)) }} 人
-
-
-
-
-
-
-
-
-
- 合计:充值金币:
- {{ formatNum(payTotalRecharge) }}
- ,免费金币:
- {{ formatNum(payTotalFree) }}
- ,任务金币:
- {{ formatNum(payTotalTask) }}
-
-
-
-
-
-
- 充值金币
-
-
-
- 免费金币
-
-
-
- 任务金币
-
+
+
+
+
+ 当前金币余量
+
+
+ {{ formatNum(getSumCoin.todayTotalCoin) }}
+
+
+
+
+ 较前一天 {{ formatNum(getSumCoin.coinDifference) }}
+
+
+
+
+
+ 较前一天 {{ formatNum(getSumCoin.coinDifference) }}
+
+
+
+
+ 较前一天 {{ formatNum(getSumCoin.coinDifference) }}
+
+
+
+
+ 充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{ formatNum(getSumCoin.todayFree)
+ }}
+ 任务{{ formatNum(getSumCoin.todayTask) }}
+
+
+
+
+ 全年累计金币数
+ {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
+ 折合新币累计金额 {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
+ 昨日新增 {{ formatNum(Math.abs(statistics.totalYesterdaySumCoin)) }} ,其中充值 {{
+ formatNum(Math.abs(statistics.rechargeYesterdaySumCoin)) }}
+
+
+
+
+ 全年累计消费金币数
+ {{ formatNum(Math.abs(getYearConsumeCoin.yearsumCoin)) }}
+ 消费 {{ formatNum(Math.abs(getYearConsumeCoin.yearConsumeCoin)) }}; 退款 {{
+ formatNum(Math.abs(getYearConsumeCoin.yearRefundCoin))
+ }}
+ 昨日新增消耗 {{ formatNum(Math.abs(getDayConsumeCoin.daysumCoin)) }} ; 消费 {{
+ formatNum(Math.abs(getDayConsumeCoin.dayConsumeCoin)) }} ; 退款 {{
+ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin))
+ }}
+
+
+
+
+ 全年累计充值人数
+ {{ formatNum(Math.abs(statistics.rechargeCount)) }}
+
+
+
+ 周同比 {{ statistics.weekOverWeekRate }}%
+
+
+
+
+
+ 周同比 {{ statistics.weekOverWeekRate }}%
+
+
+
+
+
+ 周同比 {{ statistics.weekOverWeekRate }}%
+
+
+
+
+
+
+ 日环比{{ statistics.dayOverDayRate }}%
+
+
+
+
+
+ 日环比{{ statistics.dayOverDayRate }}%
+
+
+
+
+
+ 日环比{{ statistics.dayOverDayRate }}%
+
+
+
+
+ 昨日充值人数 {{ formatNum(Math.abs(statistics.rechargeCountYesterday)) }}
+ ,其中首充 {{ formatNum(Math.abs(statistics.firstRechargeCountYesterday)) }} 人
+
+
+
+
+
+
+
+
-
+ 合计:充值金币:
+ {{ formatNum(payTotalRecharge) }}
+ ,免费金币:
+ {{ formatNum(payTotalFree) }}
+ ,任务金币:
+ {{ formatNum(payTotalTask) }}
+
+
+
-
-
- {{ payRank[0].name }}
- {{ formatNum(payRank[0].value) }}
-
-
-
- {{ payRank[1].name }}
- {{ formatNum(payRank[1].value) }}
-
-
-
- {{ payRank[2].name }}
- {{ formatNum(payRank[2].value) }}
-
-
-
- {{ payRank[3].name }}
- {{ formatNum(payRank[3].value) }}
-
-
-
-
{{ payRank[4].name }}
-
{{ formatNum(payRank[4].value) }}
+
+
+ 充值金币
-
-
-
{{ payRank[5].name }}
-
{{ formatNum(payRank[5].value) }}
+
+
+ 免费金币
-
-
-
{{ payRank[6].name }}
-
{{ formatNum(payRank[6].value) }}
+
+
+ 任务金币
-
-
- {{ payRank[7].name }}
- {{ formatNum(payRank[7].value) }}
+
+
+
-
-
-
{{ payRank[8].name }}
-
{{ formatNum(payRank[8].value) }}
+
+
+
+ {{ payRank[0].name }}
+ {{ formatNum(payRank[0].value) }}
+
+
+
+ {{ payRank[1].name }}
+ {{ formatNum(payRank[1].value) }}
+
+
+
+ {{ payRank[2].name }}
+ {{ formatNum(payRank[2].value) }}
+
+
+
+ {{ payRank[3].name }}
+ {{ formatNum(payRank[3].value) }}
+
+
+
+ {{ payRank[4].name }}
+ {{ formatNum(payRank[4].value) }}
+
+
+
+ {{ payRank[5].name }}
+ {{ formatNum(payRank[5].value) }}
+
+
+
+ {{ payRank[6].name }}
+ {{ formatNum(payRank[6].value) }}
+
+
+
+ {{ payRank[7].name }}
+ {{ formatNum(payRank[7].value) }}
+
+
+
+ {{ payRank[8].name }}
+ {{ formatNum(payRank[8].value) }}
+
+
-
-
-
-
-
- 合计:充值金币:
- {{ formatNum(consumeTotalRecharge) }}
- ,免费金币:
- {{ formatNum(consumeTotalFree) }}
- ,任务金币:
- {{ formatNum(consumeTotalTask) }}
-
-
-
+
+
-
-
- 充值金币
-
-
-
- 免费金币
-
-
-
- 任务金币
-
+ 合计:充值金币:
+
{{ formatNum(consumeTotalRecharge) }}
+ ,免费金币:
+
{{ formatNum(consumeTotalFree) }}
+ ,任务金币:
+
{{ formatNum(consumeTotalTask) }}
-
-
+
+
-
-
- {{ ConsumeRank[0].name }}
- {{ formatNum(ConsumeRank[0].value) }}
-
-
-
-
{{ ConsumeRank[1].name }}
-
{{ formatNum(ConsumeRank[1].value) }}
+
+
+ 充值金币
-
-
-
{{ ConsumeRank[2].name }}
-
{{ formatNum(ConsumeRank[2].value) }}
+
+
+ 免费金币
-
-
-
{{ ConsumeRank[3].name }}
-
{{ formatNum(ConsumeRank[3].value) }}
+
+
+ 任务金币
-
-
- {{ ConsumeRank[4].name }}
- {{ formatNum(ConsumeRank[4].value) }}
-
-
-
- {{ ConsumeRank[5].name }}
- {{ formatNum(ConsumeRank[5].value) }}
-
-
-
- {{ ConsumeRank[6].name }}
- {{ formatNum(ConsumeRank[6].value) }}
-
-
-
- {{ ConsumeRank[7].name }}
- {{ formatNum(ConsumeRank[7].value) }}
+
+
+
-
-
-
{{ ConsumeRank[8].name }}
-
{{ formatNum(ConsumeRank[8].value) }}
+
+
+
+ {{ ConsumeRank[0].name }}
+ {{ formatNum(ConsumeRank[0].value)
+ }}
+
+
+
+ {{ ConsumeRank[1].name }}
+ {{ formatNum(ConsumeRank[1].value)
+ }}
+
+
+
+ {{ ConsumeRank[2].name }}
+ {{ formatNum(ConsumeRank[2].value)
+ }}
+
+
+
+ {{ ConsumeRank[3].name }}
+ {{ formatNum(ConsumeRank[3].value)
+ }}
+
+
+
+ {{ ConsumeRank[4].name }}
+ {{ formatNum(ConsumeRank[4].value)
+ }}
+
+
+
+ {{ ConsumeRank[5].name }}
+ {{ formatNum(ConsumeRank[5].value)
+ }}
+
+
+
+ {{ ConsumeRank[6].name }}
+ {{ formatNum(ConsumeRank[6].value)
+ }}
+
+
+
+ {{ ConsumeRank[7].name }}
+ {{ formatNum(ConsumeRank[7].value)
+ }}
+
+
+
+ {{ ConsumeRank[8].name }}
+ {{ formatNum(ConsumeRank[8].value)
+ }}
+
-
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-