diff --git a/src/components/workspace/GoldGraph.vue b/src/components/workspace/GoldGraph.vue index 1265185..48512e9 100644 --- a/src/components/workspace/GoldGraph.vue +++ b/src/components/workspace/GoldGraph.vue @@ -47,11 +47,16 @@
-
+
+ +
金币{{ activeTab === 'recharge' ? '充值' : '消费' }}排名
- + @@ -92,7 +97,8 @@ const defaultTime = [ new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59), ] - +// 加载状态 +const loading = ref(true) // 地区数据 const markets = ref([]) // 图表相关 @@ -806,10 +812,12 @@ onUnmounted(() => { } } + /* select 列表项 初始颜色 */ .el-select-dropdown__item { background: #ffffff; } + /* select hover状态*/ .el-select-dropdown__item:hover { border-radius: 8px; diff --git a/src/components/workspace/GoldGraphMarkets.vue b/src/components/workspace/GoldGraphMarkets.vue index d7ba7c3..16b15cc 100644 --- a/src/components/workspace/GoldGraphMarkets.vue +++ b/src/components/workspace/GoldGraphMarkets.vue @@ -11,10 +11,10 @@
-
合计:{{ sumConsume / 100 }}
   - 永久金币: {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}   - 免费金币: {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}   - 任务金币: {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}   +
合计:{{ sumConsume }}
   + 永久金币: {{ activeTab === 'recharge' ? sumRechargePermanent : sumConsumePermanent }}   + 免费金币: {{ activeTab === 'recharge' ? sumRechargeFree : sumConsumeFree }}   + 任务金币: {{ activeTab === 'recharge' ? sumRechargeTask : sumConsumeTask }}  
昨天 @@ -472,7 +472,17 @@ const updateChart = (chartData) => { const option = { tooltip: { trigger: 'axis', - axisPointer: {type: 'shadow'}, + axisPointer: { type: 'shadow' }, + formatter: function (params) { + let result = params[0].name + '
' + let total = 0 + params.forEach(param => { + result += `${param.seriesName}: ${param.value.toLocaleString()}
` + total += param.value + }) + result += `总${activeTab.value === 'recharge' ? '充值' : '消费'}: ${total.toLocaleString()}` + return result + } }, legend: { data: legend, @@ -488,7 +498,9 @@ const updateChart = (chartData) => { type: 'category', data: chartData.dates.value, axisLabel: { - rotate: 45 + // 大于15个字符的标签旋转45度 + rotate: chartData.dates.value.length > 15 ? 45 : 0 + // rotate: 45 } }, yAxis: { diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue index 43917ce..d176bd0 100644 --- a/src/views/managerecharge/rate.vue +++ b/src/views/managerecharge/rate.vue @@ -1,12 +1,13 @@