From 7cb67ad3058503d67af5e7dc117dcc1243e4c713 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 23 十一月 2023 16:56:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue | 105 ++++++++++++++++++++--------------------------------
1 files changed, 40 insertions(+), 65 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
index 6ea8c1d..d51df80 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
@@ -1,103 +1,78 @@
<template>
<div id="main">
<basic-container>
- <v-chart :options="option" ref="chart" style="width: 100%;height:100vh"></v-chart>
+ <v-chart id="chart" :auto-resize="true" :options="chartOptions"></v-chart>
</basic-container>
</div>
</template>
<script>
import 'echarts'
-import 'echarts/lib/chart/line';
-import 'echarts/lib/component/tooltip';
-import 'echarts/lib/component/title';
-import 'echarts/lib/component/legend';
+import 'echarts/lib/chart/line'
+import 'echarts/lib/chart/pie'
+import 'echarts/lib/chart/bar'
+import 'echarts/lib/component/tooltip'
+import 'echarts/lib/component/title'
+import 'echarts/lib/component/legend'
+
export default {
- name: "statisticPage",
+ name: "lineChart",
data() {
return {
- option: {
- color: ['red','black'],
- legend: {
- data: ['鍥句緥1', '鍥句緥2', '鍥句緥3'],
- },
- dataset: [
- {
- id: 'dataset_raw',
- source: [
- { month: 1, total: 1000, newly: 800 },
- { month: 2, total: 5000, newly: 1000 },
- { month: 3, total: 1800, newly: 1400 },
- { month: 4, total: 1500, newly: 1200 },
- { month: 5, total: 1000, newly: 1200 },
- { month: 6, total: 1500, newly: 1200 },
- { month: 7, total: 1500, newly: 1200 },
- { month: 8, total: 1500, newly: 1000 },
- { month: 9, total: 1500, newly: 1200 },
- { month: 10, total: 1500, newly: 1200 },
- { month: 11, total: 1500, newly: 1200 },
- { month: 12, total: 1500, newly: 1200 },
- ],
- },
- ],
+ chartOptions: {
+ color:['#2eadd6 ','#FFA500 '],
title: {
- text: '涓婚搴撴暟鎹粺璁″垎鏋�',
- left:'center',
- textAlign:'center'
+ text: '鐗╁搧涓绘暟鎹粺璁�'
},
tooltip: {
- trigger: 'axis',
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['鎬婚噺', '鏂板']
},
xAxis: {
+ boundaryGap: true, // 鎺у埗鍧愭爣杞翠袱渚х暀鐧�
type: 'category',
- nameLocation: 'middle',
- name:'month',
- // data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] // 鏈堜唤鏁版嵁
+ data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
},
yAxis: {
- name: 'Number',
- type: 'value',
+ type: 'value'
},
series: [
{
+ name: '鎬婚噺',
type: 'line',
- datasetId: 'dataset_raw',
- showSymbol: false,
- encode: {
- x: 'month',
- y: 'total',
- itemName: 'month',
- tooltip: ['total'],
+ smooth: true,
+ stack: 'Total',
+ label: {
+ show: true,
+ position: 'top'
},
+ data: [5000, 2000, 3600, 1000, 1000, 2000, 500, 2000, 500, 2000, 500, 2000]
},
{
+ name: '鏂板',
type: 'line',
- datasetId: 'dataset_raw',
- showSymbol: false,
- encode: {
- x: 'month',
- y: 'newly',
- itemName: 'month',
- tooltip: ['newly'],
+ smooth: true,
+ stack: 'Total',
+ label: {
+ show: true,
+ position: 'top'
},
- },
- ],
- }
+ data: [1510, 1010, 2610, 2010, 3010, 1010, 1510, 3010, 1010, 1510, 3010, 2000]
+ }
+ ]
+ },
};
},
mounted() {
- import('echarts').then((echarts) => {
- // console.log(echarts)
- this.$nextTick(() => {
- const chartDom = this.$refs.chart.$el;
- const myChart = echarts.init(chartDom);
- myChart.setOption(this.option);
- });
- });
},
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+#chart {
+ width: 1280px;
+}
</style>
--
Gitblit v1.9.3