From 5fdd699c7b2cdc63d67e294c2e0df8e7d5ab8175 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Thu, 12 Mar 2020 17:41:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:stack=20area=20=E5=9B=BE=E8=A1=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-list.vue | 12 ++++++------
 .../src/components/charts/line-chart-block.vue     | 14 ++++++--------
 .../src/components/page/dashboard/chartBox.vue     |  8 ++++----
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 25f7b489b..3ab15b879 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -17,7 +17,7 @@
   <div class="list-width">
     <div class="chartBox" v-for="(item, index) in dataList"    :key="item.id" :id="item.title+'_'+item.id">
 
-      <line-chart-block v-if="item.type === 'line' || item.type === 'bar' || item.type === 4" :key="'inner' + item.id"
+      <line-chart-block v-if="item.type === 'line' || item.type === 'bar' ||item.type == 'stackArea' || item.type === 4" :key="'inner' + item.id"
       ref="editChart"
       @on-refresh-data="refreshChart"
       @on-remove-chart-block="removeChart"
@@ -261,11 +261,11 @@ export default {
                         },
                         metric_name: '',
                       };
-                      // if(chartInfo.type === 'stackArea'){
-                      //   seriesItem.theData.type='line';
-                      //   // seriesItem.theData.stack=chartInfo.title
-                      //   seriesItem.theData.areaStyle={};
-                      // }
+                      if(chartInfo.type === 'stackArea'){
+                        seriesItem.theData.type='line';
+                        seriesItem.theData.stack=chartInfo.title
+                        seriesItem.theData.areaStyle={};
+                      }
                       // 图表中每条线的名字,后半部分
                       let host = '';//up,
                       if(queryItem.metric.__name__){
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 0f97878a5..93fd74f42 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -627,7 +627,7 @@
 
           xAxis: {
             type: 'time',
-            //boundaryGap: false,//line-false; bar-true;
+            // boundaryGap: false,//line-false; bar-true;
             //data: ['20190101', '20190102', '周三', '周四', '周五', '周六', '周日']
             axisLabel: {
               intervale: 0,
@@ -743,8 +743,6 @@
             this.echartStore.clear();
             //option.title = title;
             this.echartStore.setOption(option);//创建图表
-            console.log('图表参数')
-            console.log(option)
             this.$refs['localLoading'+this.chartIndex].endLoading();
             this.firstShow = true; // 展示操作按键
           });
@@ -1047,11 +1045,11 @@
                         },
                         metric_name: '',
                       };
-                      // if(chartInfo.type === 'stackArea'){
-                      //   seriesItem.theData.type='line';
-                      //   // seriesItem.theData.stack=chartInfo.title
-                      //   seriesItem.theData.areaStyle={};
-                      // }
+                      if(this.data.type === 'stackArea'){
+                        seriesItem.theData.type='line';
+                        seriesItem.theData.stack=this.data.title
+                        seriesItem.theData.areaStyle={};
+                      }
                       // 图表中每条线的名字,后半部分
                       // let host = `${queryItem.metric.__name__}{`;//up,
                       let host = '';//up,
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 9854a93b3..c7806ec50 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -270,10 +270,10 @@
             id:"table",
             name:this.$t("dashboard.panel.chartForm.typeVal.table.label")
           },
-          // {
-          //   id:'stackArea',
-          //   name:this.$t("dashboard.panel.chartForm.typeVal.stackArea.label")
-          // }
+          {
+            id:'stackArea',
+            name:this.$t("dashboard.panel.chartForm.typeVal.stackArea.label")
+          }
         ],
         elements: [1], // 指标部分 tarNum
         elementTarget: [], // 本地保存数据