From f9ca72d2c14bc64fce54aa2e8742d7b7f6ff3a35 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 四月 2024 00:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
index fcc9ab9..083b0ac 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
@@ -1,7 +1,10 @@
<template>
- <div id="main">
+ <div id="main" style="height: 460px;margin-bottom: 15px">
<basic-container>
<v-chart id="chart" :auto-resize="true" :options="chartOptions"></v-chart>
+ <div style="display: inline-block;float: right;margin-bottom: 10px;margin-right: 60px">
+ <el-button size="small" type="danger" plain @click="delHandler">鍒犻櫎</el-button>
+ </div>
</basic-container>
</div>
</template>
@@ -12,6 +15,7 @@
import 'echarts/lib/component/tooltip'
import 'echarts/lib/component/title'
import 'echarts/lib/component/legend'
+import {deleteChartId} from "@/api/statistic/chart"
export default {
name: "lineChart",
@@ -23,6 +27,9 @@
chartName: {
type: String,
default: ""
+ },
+ btmname :{
+ type: String
}
},
watch: {
@@ -31,13 +38,15 @@
handler(newval, oldval) {
if (newval) {
const series = newval.map((data, index) => ({
- name: index === 0 ? "鎬婚噺" : "鏂板",
- type: "line",
+ name: index === 0 ? '鎬婚噺' : '鏂板',
+ type: 'line',
smooth: true,
- stack: "Total",
+ stack: index === 0 ? 'Total' : 'total2', // 鏍规嵁 index 鍖哄垎鎬婚噺鍜屾柊澧炵殑鍫嗗彔鎯呭喌
label: {
show: true,
- position: "top"
+ textStyle: {
+ fontSize: 14
+ }
},
data: data.map(value => ({value}))
}));
@@ -46,15 +55,15 @@
}
}
},
- chartName:{
- handler(newval,oldval){
- if(newval){
+ chartName: {
+ handler(newval, oldval) {
+ if (newval) {
this.chartOptions.title.text = newval + "鏁版嵁缁熻"
}
},
- immediate:true,
- deep:true
- }
+ immediate: true,
+ deep: true
+ },
},
data() {
return {
@@ -67,21 +76,32 @@
trigger: 'axis'
},
legend: {
- data: ['鎬婚噺', '鏂板']
+ data: ['鎬婚噺', '鏂板'],
+ textStyle: {
+ fontSize: 14 // 璋冩暣瀛椾綋澶у皬
+ }
},
xAxis: {
boundaryGap: true,
type: 'category',
- 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: {
- type: 'value'
+ type: 'value',
},
series: []
}
};
},
- created() {
+ methods:{
+ delHandler(){
+ deleteChartId({btmname:this.btmname,chartId:'0'}).then(res=>{
+ this.$message.success(this.chartName+'鎶樼嚎鍥撅紝鍒犻櫎鎴愬姛锛�')
+ this.$emit('refresh');
+ }).catch(error=>{
+ this.$message.error(error)
+ })
+ }
}
};
</script>
@@ -91,4 +111,5 @@
width: 100%;
height: 400px;
}
+
</style>
--
Gitblit v1.9.3