From 53dcc83b59ada763d2d92068fed97830eec1dc85 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 15 一月 2024 16:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/dashboard/PieChart.vue | 36 +++++++++++++++++++++++++-----------
jcdm-ui/src/views/dashboard/LineChart.vue | 4 ++++
jcdm-ui/src/views/dashboard/PanelGroup.vue | 8 ++++----
3 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/jcdm-ui/src/views/dashboard/LineChart.vue b/jcdm-ui/src/views/dashboard/LineChart.vue
index 702ff73..4ab1c09 100644
--- a/jcdm-ui/src/views/dashboard/LineChart.vue
+++ b/jcdm-ui/src/views/dashboard/LineChart.vue
@@ -63,6 +63,10 @@
},
setOptions({ expectedData, actualData } = {}) {
this.chart.setOption({
+ title: {
+ text: '灏忔椂浜ч噺瀵规瘮', // 鏍囬鏂囨湰
+ left: 'left' // 鏍囬浣嶇疆
+ },
xAxis: {
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
boundaryGap: false,
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index 1a1081f..f7b6b93 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -7,7 +7,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 璁垮
+ 鍚堢涓婄嚎
</div>
<count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
</div>
@@ -20,7 +20,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 娑堟伅
+ 鍚堢涓嬬嚎
</div>
<count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
</div>
@@ -33,7 +33,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 閲戦
+ 鎬昏涓婄嚎
</div>
<count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
</div>
@@ -46,7 +46,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 璁㈠崟
+ 鎬昏涓嬬嚎
</div>
<count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
</div>
diff --git a/jcdm-ui/src/views/dashboard/PieChart.vue b/jcdm-ui/src/views/dashboard/PieChart.vue
index 63f0d84..167711d 100644
--- a/jcdm-ui/src/views/dashboard/PieChart.vue
+++ b/jcdm-ui/src/views/dashboard/PieChart.vue
@@ -45,29 +45,43 @@
this.chart = echarts.init(this.$el, 'macarons')
this.chart.setOption({
+ title: {
+ text: '宸ヤ綅鍫靛Top5', // 鏍囬鏂囨湰
+ left: 'center' // 鏍囬浣嶇疆
+ },
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)'
},
+ // textStyle
legend: {
- left: 'center',
- bottom: '10',
- data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+ orient: 'vertical',
+
+ left: 'left',
+ // left: 'center',
+ // bottom: '10',//宸︿晶楂樺害
+ data: ['OP460', 'OP090', 'OP660', 'OP650', 'OP730']
},
series: [
{
name: 'WEEKLY WRITE ARTICLES',
type: 'pie',
- roseType: 'radius',
- radius: [15, 95],
- center: ['50%', '38%'],
+ // roseType: 'radius',//鏇存敼鏍峰紡
+ radius: '50%',
+ // labelLine: {
+ // length: 10 // 璋冩暣鏍囩绾跨殑闀垮害
+ // },
+ center: ['50%', '60%'],
data: [
- { value: 320, name: 'Industries' },
- { value: 240, name: 'Technology' },
- { value: 149, name: 'Forex' },
- { value: 100, name: 'Gold' },
- { value: 59, name: 'Forecasts' }
+ { value: 5, name: 'OP460' },
+ { value: 9, name: 'OP090' },
+ { value: 5, name: 'OP660' },
+ { value: 5, name: 'OP650' },
+ { value: 7, name: 'OP730' }
],
+ label: {
+ formatter: '{b}: {c} ({d}%)'
+ },
animationEasing: 'cubicInOut',
animationDuration: 2600
}
--
Gitblit v1.9.3