diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 31e1cce..f5912a6 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -11,10 +11,13 @@
当前金币余量
{{ currentGold / 100 }} 较前一日 {{ dailyChange / 100 }}
-
+
-
+
+
+
+
@@ -22,8 +25,8 @@
永久金币:{{ currentPermanent / 100 }}
免费金币:{{ currentFree / 100 }}
-
[六月到期|{{ currentFreeJune / 100 }}] [12月到期|{{ currentFreeDecember }}]
-
任务金币:{{ currentTask }}
+
[六月到期|{{ currentFreeJune / 100 }}] [12月到期|{{ currentFreeDecember / 100 }}]
+
任务金币:{{ currentTask / 100 }}
@@ -63,8 +66,28 @@
全年累计充值人头数
{{ yearlyRechargeNum }}
- 周同比:{{ wow }}
- 日环比:{{ daily }}%
+ 周同比:{{ wow }}%
+
+
+
+
+
+
+
+
+
+
+ 日环比:{{ daily }}%
+
+
+
+
+
+
+
+
+
+
昨日充值人数:{{ rechargeNum }}
其中首充:{{ firstRecharge }}
@@ -133,7 +156,7 @@ import * as echarts from 'echarts'
import { ref, onMounted, nextTick, watch } from 'vue'
import API from '@/util/http'
import { ElMessage } from 'element-plus'
-import { Top, Bottom, SemiSelect } from '@element-plus/icons-vue'
+import { ArrowUpBold, ArrowDownBold, SemiSelect } from '@element-plus/icons-vue'
// 地区数据
const markets = ref([])
// 图表相关
@@ -302,6 +325,7 @@ const processChartData = (marketCards) => {
const chartData = {
rechargePermanent: [],
rechargeFree: [],
+ rechargeTask: [],
consumePermanent: [],
consumeFree: [],
consumeTask: []
@@ -311,6 +335,7 @@ const processChartData = (marketCards) => {
marketCards.forEach(market => {
chartData.rechargePermanent.push(market.sumRechargePermanent / 100 || 0)
chartData.rechargeFree.push(market.sumRechargeFree / 100 || 0)
+ chartData.rechargeTask.push(market.sumRechargeTask / 100 || 0)
chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0)
chartData.consumeFree.push(market.sumConsumeFree / 100 || 0)
chartData.consumeTask.push(market.sumConsumeTask / 100 || 0)
@@ -372,10 +397,19 @@ const updateChart = (chartData) => {
type: 'bar',
stack: 'recharge',
data: chartData.rechargeFree,
- itemStyle: { color: '#91cc75' }
+ itemStyle: { color: '#91cc75' },
+ barWidth:30
+ },
+ {
+ name: '任务金币',
+ type: 'bar',
+ stack: 'recharge',
+ data: chartData.rechargeTask,
+ itemStyle: { color: '#fac858' },
+ barWidth:30
}
]
- legend = ['永久金币', '免费金币']
+ legend = ['永久金币', '免费金币','任务金币']
} else {
series = [
{
@@ -391,14 +425,16 @@ const updateChart = (chartData) => {
type: 'bar',
stack: 'consume',
data: chartData.consumeFree,
- itemStyle: { color: '#91cc75' }
+ itemStyle: { color: '#91cc75' },
+ barWidth:30
},
{
name: '任务金币',
type: 'bar',
stack: 'consume',
data: chartData.consumeTask,
- itemStyle: { color: '#fac858' }
+ itemStyle: { color: '#fac858' },
+ barWidth:30
}
]
legend = ['永久金币', '免费金币', '任务金币']