From 2bd948dd66d69a48f0c34f8d9852e05bc574602c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 十二月 2023 16:43:22 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
index cffc3c5..6762433 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
@@ -1,6 +1,9 @@
 <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="danger" plain @click="delHandler">鍒犻櫎</el-button>
+    </div>
   </basic-container>
 </template>
 
@@ -9,6 +12,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: "ColumnarChart",
@@ -20,6 +24,9 @@
     chartName:{
       type:String,
       default: ""
+    },
+    btmname :{
+      type: String
     }
   },
   watch:{
@@ -36,7 +43,7 @@
             );
           });
 
-          let colors = ["#91CC75", "#5470C6"];
+          let colors = ['#84C9E5', '#F68686'];
 
           const seriesData = [];
           for (let i = 0; i < newval.length; i++) {
@@ -50,7 +57,7 @@
                 value: newval[i][j],
                 itemStyle: {
                   normal: {
-                    barBorderRadius: borderRadius,  // 璁剧疆鍦嗚
+                    // barBorderRadius: borderRadius,  // 璁剧疆鍦嗚
                     color: colors[i],
                   }
                 },
@@ -61,10 +68,14 @@
               name: seriesName,
               type: "bar",
               stack: "鎬婚噺",
+              barWidth: 60,
               data: curSeriesData,
               label: {
                 show: true,
-                position: 'top'
+                position: 'top',
+                formatter: function (params) {
+                  return params.value === 0 ? '' : params.value; // 鍊间负 0 涓嶆樉绀猴紝鍏朵粬鎯呭喌鏄剧ず
+                }
               },
               emphasis: {
                 focus: "series",
@@ -78,7 +89,6 @@
     chartName:{
       handler(newval,oldval){
         if(newval){
-          console.log(newval)
           this.chartOptions.title.text = newval + "鏁版嵁缁熻"
         }
       },
@@ -89,7 +99,7 @@
   data() {
     return {
       chartOptions: {
-        color:["#91CC75", "#5470C6"],
+        color:['#84C9E5', '#F68686'],
         title: {
           text: "",
         },
@@ -138,6 +148,16 @@
   },
   created() {
   },
+  methods:{
+    delHandler(){
+      deleteChartId({btmname:this.btmname,chartId:'2'}).then(res=>{
+        this.$message.success('鍒犻櫎鎴愬姛')
+        this.$emit('refresh');
+      }).catch(error=>{
+        this.$message.error(error)
+      })
+    }
+  }
 };
 </script>
 

--
Gitblit v1.9.3