From ec3add985f600fe56a7232484bbe89a11b73c23b Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期四, 21 十二月 2023 12:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue
index c9c5034..11da013 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue
@@ -1,20 +1,22 @@
<template>
<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="primary" plain @click="delHandler">鍒犻櫎</el-button>
+ </div>
</basic-container>
</template>
<script>
-import 'echarts'
+import echarts from'echarts'
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'
+import {deleteChartId} from "@/api/statistic/chart"
export default {
- name: "mixCart",
+ name: "stackedAreaChart",
props: {
mixData: {
type: Array,
@@ -23,13 +25,17 @@
chartName: {
type: String,
default: ""
+ },
+ btmname :{
+ type: String
}
},
data() {
return {
chartOptions: {
+ color: ['#84C9E5', '#F68686'],
title: {
- text: "",
+ text: '',
},
grid: {
left: "3%",
@@ -40,18 +46,15 @@
tooltip: {
trigger: "axis",
axisPointer: {
- type: "shadow",
- },
+ type: "cross"
+ }
},
legend: {
- data: ["鎬婚噺", "鏂板"],
- left: "center",
- textStyle: {
- fontSize: 14 // 璋冩暣瀛椾綋澶у皬
- }
+ data: ['鎬婚噺', '鏂板']
},
xAxis: {
type: "category",
+ boundaryGap: false,
data: [
"涓�鏈�",
"浜屾湀",
@@ -70,8 +73,10 @@
yAxis: {
type: "value",
},
- series: [],
- },
+ series: [
+
+ ]
+ }
};
},
watch: {
@@ -79,40 +84,49 @@
immediate: true,
handler(newval, oldval) {
if (newval) {
- const colors = ["#8fef5b", "#db3c3c"];
-
- const seriesData = newval.map((data, index) => ({
- name: index === 0 ? "鎬婚噺" : "鏂板",
- type: index === 0 ? "bar" : "line",
- stack: index === 0 ? "鎬婚噺" : null,
- data: data.map(value => ({value})),
- barWidth: 68,
- label: {
- show: true,
- position: "top"
- },
- itemStyle: {
- color: colors[index]
+ const series = newval.map((data, index) => ({
+ name: index === 0 ? '鎬婚噺' : '鏂板',
+ type: 'line',
+ showSymbol: false,//鏄惁鏄剧ず鎶樼嚎涓婄殑鏍囪鐐�
+ smooth: true,//骞虫粦搴�
+ areaStyle: {
+ opacity: 1, //閫忔槑搴�
},
emphasis: {
- focus: "series"
- }
+ focus: 'series'
+ },
+ stack: index === 0 ? '鎬婚噺' : '鏂板', // 鏍规嵁 index 鍖哄垎鎬婚噺鍜屾柊澧炵殑鍫嗗彔鎯呭喌
+ data: data.map(value => ({value})),
+ label: {
+ show: true,
+ position: 'top'
+ },
}));
- this.chartOptions.series = seriesData;
+ this.chartOptions.series = series;
}
- },
+ }
},
- 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
}
},
+ methods:{
+ delHandler(){
+ deleteChartId({btmname:this.btmname,chartId:'3'}).then(res=>{
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.$emit('refresh');
+ }).catch(error=>{
+ this.$message.error(error)
+ })
+ }
+ }
};
</script>
--
Gitblit v1.9.3