diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 98e4bfe68..974fc9e05 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -9,12 +9,13 @@
   }
   .list-width{
     width:98%;
+    overflow-x:hidden;/*避免鼠标第一次放到曲线时，x轴出现滚动条后消失*/
   }
 </style>
 <template>
 
   <div class="list-width">
-    <div class="chartBox" v-for="(item, index) in dataList" :key="item.id">
+    <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"
       ref="editChart" 
diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss
index b39bbc8da..c8e078ded 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.scss
+++ b/nezha-fronted/src/components/charts/line-chart-block.scss
@@ -2,10 +2,12 @@
 .clearfix:after{
   display: block;
   content: "";
+  height:0;
+  visibility:hidden;
   clear: both;
 }
 .clearfix{
-  margin-bottom: 20px;
+  //margin-bottom: 20px;
 }
 .legend-shape{
   display:inline-block;
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index c586111eb..05a989ec4 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -2,7 +2,7 @@
   @import './line-chart-block.scss';
 </style>
 <template>
-  <div class="line-chart-block">
+  <div class="line-chart-block" id="lineChartDiv">
 
     <!--<div class="edit">
       <div class="list-icon" v-if="firstShow">
@@ -27,7 +27,7 @@
       @click="showAllScreen" type="button" class="nz-btn nz-btn-size-large nz-btn-style-light"><i class="el-icon-full-screen"></i></button>
     </div>
 
-    <div class="line-area" ref="lineChartArea"  id="lineChartArea"></div>
+    <div class="line-area" ref="lineChartArea"  id="lineChartArea" ></div>
 
     <div class="legend-container"   id="legendArea" ref="legendArea">
       <div v-for="(item, index) in legendList" :title="item.name"  @click="clickLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGrey[index]}" :key="'legend_' + item.name+'_'+index">
@@ -38,25 +38,25 @@
     <!--
     <Modal title="查看" v-model="screenModal" width="96%" class="line-chart-block-modal">-->
     <el-dialog class="line-chart-block-modal nz-dialog"
-      :title="$t('dashboard.panel.view')"
-      :visible.sync="screenModal"
-       width="90%"
-       @close="screenModal = false"
-       @opened="initDialog">
+               :title="$t('dashboard.panel.view')"
+               :visible.sync="screenModal"
+               width="90%"
+               @close="screenModal = false"
+               @opened="initDialog">
       <div slot="title">
         <span class="nz-dialog-title">{{data.title}}</span>
         <div class="float-right panel-calendar dialog-tool">
-            <el-date-picker ref="calendar" prefix-icon=" " size="mini" class="nz-dashboard-picker"
-                            format="yyyy/MM/dd HH:mm"
-                            @change="dateChange"
-                            v-model="searchTime"
-                            type="datetimerange"
-                            :picker-options="pickerOptions"
-                            :range-separator="$t('dashboard.panel.to')"
-                            :start-placeholder="$t('dashboard.panel.startTime')"
-                            :end-placeholder="$t('dashboard.panel.endTime')"
-                            align="right">
-            </el-date-picker>
+          <el-date-picker ref="calendar" prefix-icon=" " size="mini" class="nz-dashboard-picker"
+                          format="yyyy/MM/dd HH:mm"
+                          @change="dateChange"
+                          v-model="searchTime"
+                          type="datetimerange"
+                          :picker-options="pickerOptions"
+                          :range-separator="$t('dashboard.panel.to')"
+                          :start-placeholder="$t('dashboard.panel.startTime')"
+                          :end-placeholder="$t('dashboard.panel.endTime')"
+                          align="right">
+          </el-date-picker>
           <!--<button @click="refreshChart" type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light"><i style="font-size: 14px;" class="el-icon-refresh-right"></i></button>-->
         </div>
       </div>
@@ -72,168 +72,168 @@
   </div>
 </template>
 <script>
-import axios from 'axios';
-import echarts from 'echarts';
-import bus from '../../libs/bus';
+  import axios from 'axios';
+  import echarts from 'echarts';
+  import bus from '../../libs/bus';
 
-export default {
-  name: 'lineChartBlock',
-  components: {
-    //calendarSelect,
-  },
-  props: {
-    editChartId: {
-      type: String,
-      default: 'editChartId',
+  export default {
+    name: 'lineChartBlock',
+    components: {
+      //calendarSelect,
     },
-    // 看板id
-    panelId: {
-      type: Number,
-      default: 0,
-    },
-    // 展示设置内容
-    showSetting: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data() {
-    return {
-      data: {}, // 该图表信息,chartItem
-      seriesItem: [], // 保存信息
-      images: '',
-      toolbox: false,
-      items: {
-        metric_name: [], // 每条数据列名称
-        xAxis: [],
-        theData: [], // series数据组
+    props: {
+      editChartId: {
+        type: String,
+        default: 'editChartId',
       },
-      panelIdInner: '', // 看板id=panelId,原写作chart,由set_data获取
-      chartName: '',
-      firstLoad: false, // 是否第一次加载
-      highchartStore: null, // 保存图表数据
-      echartStore:null,// 保存图表数据
-      echartModalStore: null, // 全屏查看时数据
-      chartType: 'line', // 图表类型
-      screenModal: false,
-      // 查询数据使用
-      filter: {
-        start_time: '',
-        end_time: '',
+      // 看板id
+      panelId: {
+        type: Number,
+        default: 0,
       },
-      stableFilter: {}, // 保存数据使用,初始化起止时间,单图or多图等
-      legend:[],
-      legendList:[],
-      screenLegendList:[],
-      isGrey:[],
-      isGreyScreen:[],
-      bgColorList: ['#7bbfea', '#b3424a', '#f05b72', '#596032', '#bd6758',
-        '#cd9a5b', '#918597', '#70a19f', '#005344', '#FF00FF',
-        '#f7acbc', '#5f5d46', '#66ffff', '#ccFF66', '#f47920',
-        '#769149', '#1d953f', '#abc88b', '#7f7522', '#9b95c9',
-        '#f3715c', '#ea66a6', '#d1c7b7', '#9d9087', '#77787b',
-        '#f58220', '#c37e00', '#00ae9d', '#f26522', '#76becc',
-        '#76624c', '#d71345', '#2468a2', '#ca8687', '#1b315e',
-      ],
-      firstShow: false, // 默认不显示操作按钮,
-      searchTime:[new Date().setHours(new Date().getHours()-1),new Date()],
-      oldSearchTime:[],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text:  this.$t("dashboard.panel.recOne"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setHours(start.getHours() - 1);
-              picker.$emit('pick', [start, end]);
-            }
-          },{
-            text: this.$t("dashboard.panel.recFour"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setHours(start.getHours() - 4);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: this.$t("dashboard.panel.recOneDay"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setDate(start.getDate() - 1);
-              picker.$emit('pick', [start, end]);
-            }
-          },  {
-            text: this.$t("dashboard.panel.yesterday"),
-            onClick(picker) {
-              const start = new Date();
-              const end = new Date();
-              start.setDate(start.getDate() - 1);
-              start.setHours(0);
-              start.setMinutes(0);
-              start.setSeconds(0);
-              end.setDate(end.getDate() - 1);
-              end.setHours(23);
-              end.setMinutes(59);
-              end.setSeconds(59);
-              picker.$emit('pick', [start, end]);
-            }
-          },{
-            text: this.$t("dashboard.panel.recSevenDay"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setDate(start.getDate() - 7);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: this.$t("dashboard.panel.recOneMonth"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setDate(start.getDate() - 30);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: this.$t("dashboard.panel.curMonth"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setDate(1);
-              start.setHours(0);
-              start.setMinutes(0);
-              picker.$emit('pick', [start, end]);
-            }
-          },{
-            text: this.$t("dashboard.panel.lastMonth"),
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setDate(1);
-              start.setMonth(start.getMonth() - 1);
-              end.setDate(0);
-              start.setStart();
-              end.setEnd();
-              picker.$emit('pick', [start, end]);
-            }
-          }]
+      // 展示设置内容
+      showSetting: {
+        type: Boolean,
+        default: true,
       },
-    };
-  },
-  computed: {
-    /*
-    typeVisible() {
-      if (this.data.type === 'line' || this.data.type === 'bar' || this.data.type === 4) {
-        return true;
-      }
-      return false;
     },
-*/
-  },
-  watch: {},
-  methods: {
-    clickLegend(legendName,index){
+    data() {
+      return {
+        data: {}, // 该图表信息,chartItem
+        seriesItem: [], // 保存信息
+        images: '',
+        toolbox: false,
+        items: {
+          metric_name: [], // 每条数据列名称
+          xAxis: [],
+          theData: [], // series数据组
+        },
+        panelIdInner: '', // 看板id=panelId,原写作chart,由set_data获取
+        chartName: '',
+        firstLoad: false, // 是否第一次加载
+        highchartStore: null, // 保存图表数据
+        echartStore:null,// 保存图表数据
+        echartModalStore: null, // 全屏查看时数据
+        chartType: 'line', // 图表类型
+        screenModal: false,
+        // 查询数据使用
+        filter: {
+          start_time: '',
+          end_time: '',
+        },
+        stableFilter: {}, // 保存数据使用,初始化起止时间,单图or多图等
+        legend:[],
+        legendList:[],
+        screenLegendList:[],
+        isGrey:[],
+        isGreyScreen:[],
+        bgColorList: ['#7bbfea', '#b3424a', '#f05b72', '#596032', '#bd6758',
+          '#cd9a5b', '#918597', '#70a19f', '#005344', '#FF00FF',
+          '#f7acbc', '#5f5d46', '#66ffff', '#ccFF66', '#f47920',
+          '#769149', '#1d953f', '#abc88b', '#7f7522', '#9b95c9',
+          '#f3715c', '#ea66a6', '#d1c7b7', '#9d9087', '#77787b',
+          '#f58220', '#c37e00', '#00ae9d', '#f26522', '#76becc',
+          '#76624c', '#d71345', '#2468a2', '#ca8687', '#1b315e',
+        ],
+        firstShow: false, // 默认不显示操作按钮,
+        searchTime:[new Date().setHours(new Date().getHours()-1),new Date()],
+        oldSearchTime:[],
+        pickerOptions: {
+          shortcuts: [
+            {
+              text:  this.$t("dashboard.panel.recOne"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setHours(start.getHours() - 1);
+                picker.$emit('pick', [start, end]);
+              }
+            },{
+              text: this.$t("dashboard.panel.recFour"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setHours(start.getHours() - 4);
+                picker.$emit('pick', [start, end]);
+              }
+            }, {
+              text: this.$t("dashboard.panel.recOneDay"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setDate(start.getDate() - 1);
+                picker.$emit('pick', [start, end]);
+              }
+            },  {
+              text: this.$t("dashboard.panel.yesterday"),
+              onClick(picker) {
+                const start = new Date();
+                const end = new Date();
+                start.setDate(start.getDate() - 1);
+                start.setHours(0);
+                start.setMinutes(0);
+                start.setSeconds(0);
+                end.setDate(end.getDate() - 1);
+                end.setHours(23);
+                end.setMinutes(59);
+                end.setSeconds(59);
+                picker.$emit('pick', [start, end]);
+              }
+            },{
+              text: this.$t("dashboard.panel.recSevenDay"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setDate(start.getDate() - 7);
+                picker.$emit('pick', [start, end]);
+              }
+            }, {
+              text: this.$t("dashboard.panel.recOneMonth"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setDate(start.getDate() - 30);
+                picker.$emit('pick', [start, end]);
+              }
+            }, {
+              text: this.$t("dashboard.panel.curMonth"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setDate(1);
+                start.setHours(0);
+                start.setMinutes(0);
+                picker.$emit('pick', [start, end]);
+              }
+            },{
+              text: this.$t("dashboard.panel.lastMonth"),
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setDate(1);
+                start.setMonth(start.getMonth() - 1);
+                end.setDate(0);
+                start.setStart();
+                end.setEnd();
+                picker.$emit('pick', [start, end]);
+              }
+            }]
+        },
+      };
+    },
+    computed: {
+      /*
+      typeVisible() {
+        if (this.data.type === 'line' || this.data.type === 'bar' || this.data.type === 4) {
+          return true;
+        }
+        return false;
+      },
+  */
+    },
+    watch: {},
+    methods: {
+      clickLegend(legendName,index){
         if (this.echartStore) {
           this.echartStore.dispatchAction({
             type: 'legendToggleSelect',
@@ -242,8 +242,8 @@ export default {
           let isGreyTmp = this.isGrey[index];
           this.$set(this.isGrey, index, !isGreyTmp);
         }
-    },
-    clickScreenLegend(legendName,index){
+      },
+      clickScreenLegend(legendName,index){
         if (this.echartModalStore) {
           this.echartModalStore.dispatchAction({
             type: 'legendToggleSelect',
@@ -252,912 +252,972 @@ export default {
           let isGreyTmp = this.isGreyScreen[index];
           this.$set(this.isGreyScreen, index, !isGreyTmp);
         }
-    },
-    clearData(){
-      if(this.echartStore){
-        this.echartStore.clear();
-      }
-    },
-    formatLegend(chartWidth,name){
-      if(!name){
-        return '';
-      }
-      //计算宽度
-      var span = document.createElement("span");
-      var result = {};
-      result.width = span.offsetWidth;
-      result.height = span.offsetHeight;
-      span.style.visibility = "hidden";
-      span.style.fontSize = 14;
-      span.style.fontFamily = "Arial";
-      span.style.display = "inline-block";
-      document.body.appendChild(span);
-      if(typeof span.textContent != "undefined"){
-        span.textContent = name;
-      }else{
-        span.innerText = name;
-      }
-      var txtWidth = parseFloat(window.getComputedStyle(span).width) - result.width;
-      document.body.removeChild(span);
-
-      if(txtWidth < chartWidth){
-        return name;
-      }else {
-        var charNum = `${(chartWidth-100)/(txtWidth/name.length)}`;
-        return name.slice(0,charNum)+'...';
-      }
-    },
-    // chartSite用于区分是全屏显示还是局部显示
-    initChart(chartInfo, dataArg, ele, chartSite,legend) {
-      this.firstShow = true; // 展示操作按键
-      const self = this;
-      this.chartType = ''; // 图表类型
-      if ( chartInfo.type === 4) {//line,bar
-        this.chartType = 'line';
-      }
-      let chartId = '';
-      if (chartSite === 'local') {
-        this.echartStore = echarts.init(ele);
-        chartId='lineChartArea';
-      }else if (chartSite === 'screen') {
-        this.echartModalStore = echarts.init(ele);
-        chartId='screenShowArea';
-      }
-      var chartWidth = ele.clientWidth;
-      var title = {
-        text: chartInfo.title || null,
-        textAlign: 'left',
-        useHTML: true,
-        textStyle: {
-          //display: 'inline-block',//无此属性
-          width: '60%',
-          fontStyle:'normal',
-          fontWeight:'bold',
-          color: "#333",
-
+      },
+      clearData(){
+        if(this.echartStore){
+          this.echartStore.clear();
         }
-      };
-      var option = {
-        color: this.bgColorList,
-        tooltip: {
-          trigger: 'axis',
-          confine:true,
-          formatter:function(params){
-            let str = `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal;line-height: 18px;font-size:12px;font-family: Roboto,Helvetica Neue,Arial,sans-serif;'>`;
-            params.forEach((item, i) => {
-              if(i===0){
-                let t_date = new Date(item.data[0]);
-                str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " "
-                  + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':');
-              }
-              str +=`<br/>`;
-              let val = parseFloat(Number(item.data[1]).toFixed(2));
-              if(val===0){
-                val = Number(item.data[1]);
-              }
-              let itemNameList = ["instance","module","project","job","dc","asset"];
-              //let seriesNameTmp = this.filterItem(item.seriesName,itemNameList);
-              let seriesNameTmp = item.seriesName;
-              itemNameList.forEach((itemName, i) => {
-                let insIndex = seriesNameTmp.indexOf(itemName+"=");
-                if(insIndex>-1){//{dd=""22,instance="aa",job="nn"},如果最后只有{},则去掉{}
-                  let start = seriesNameTmp.substring(0,insIndex);
-                  let endTmp = seriesNameTmp.substring(insIndex+itemName.length+1,seriesNameTmp.length);
-                  let sepInd = endTmp.indexOf(',');
-                  let end = "";
-                  if(sepInd>-1){
-                    end = endTmp.substring(sepInd+1,endTmp.length);
-                  }else {
-                    sepInd = endTmp.indexOf('"',1);
-                    end = endTmp.substring(sepInd+1,endTmp.length);
+      },
+      formatLegend(chartWidth,name){
+        if(!name){
+          return '';
+        }
+        //计算宽度
+        var span = document.createElement("span");
+        var result = {};
+        result.width = span.offsetWidth;
+        result.height = span.offsetHeight;
+        span.style.visibility = "hidden";
+        span.style.fontSize = 14;
+        span.style.fontFamily = "Arial";
+        span.style.display = "inline-block";
+        document.body.appendChild(span);
+        if(typeof span.textContent != "undefined"){
+          span.textContent = name;
+        }else{
+          span.innerText = name;
+        }
+        var txtWidth = parseFloat(window.getComputedStyle(span).width) - result.width;
+        document.body.removeChild(span);
+
+        if(txtWidth < chartWidth){
+          return name;
+        }else {
+          var charNum = `${(chartWidth-100)/(txtWidth/name.length)}`;
+          return name.slice(0,charNum)+'...';
+        }
+      },
+      // chartSite用于区分是全屏显示还是局部显示
+      initChart(chartInfo, dataArg, ele, chartSite,legend) {
+
+        this.firstShow = true; // 展示操作按键
+        const self = this;
+        this.chartType = ''; // 图表类型
+        if ( chartInfo.type === 4) {//line,bar
+          this.chartType = 'line';
+        }
+        let chartId = '';
+        if (chartSite === 'local') {
+          this.echartStore = echarts.init(ele);
+          chartId='lineChartArea';
+        }else if (chartSite === 'screen') {
+          this.echartModalStore = echarts.init(ele);
+          chartId='screenShowArea';
+        }
+        var chartWidth = ele.clientWidth;
+        var title = {
+          text: chartInfo.title || null,
+          textAlign: 'left',
+          useHTML: true,
+          textStyle: {
+            //display: 'inline-block',//无此属性
+            width: '60%',
+            fontStyle:'normal',
+            fontWeight:'bold',
+            color: "#333",
+
+          }
+        };
+        var option = {
+          color: this.bgColorList,
+          tooltip: {
+            trigger: 'axis',
+            confine:false,
+            extraCssText:'z-index:1000;',
+            enterable:true,
+            position:function(point,params,dom,rect,size){
+              dom.style.transform = "translateZ(0)";
+              //提示框位置
+              var x=0;
+              var y=0;
+              //当前鼠标位置
+              var pointX = point[0];
+              var pointY = point[1];
+              //外层div大小
+              var viewWidth = size.viewSize[0];
+              var viewHeight = size.viewSize[1];
+              //提示框大小
+              var boxWidth = size.contentSize[0];
+              var boxHeight = size.contentSize[1];
+              if (chartSite === 'local') { // 本地显示
+                let chartDom = document.getElementById(chartInfo.title+"_"+chartInfo.id);
+                if(chartDom){
+                  let parTop = document.getElementById(chartInfo.title+"_"+chartInfo.id).offsetTop;
+                  let parleft = document.getElementById(chartInfo.title+"_"+chartInfo.id).offsetLeft;
+
+                  let parent = document.getElementById('tableList');
+                  let parClientHeight = parent.clientHeight;//可视高度
+                  let parClientWidth = parent.clientWidth;//可视宽度
+                  let parScrollTop = parent.scrollTop;
+                  if((parClientWidth-pointX-parleft-20)>=boxWidth){//说明鼠标在左边放不下提示框
+                    x=pointX+10;
+                  }else{
+                    x = pointX - boxWidth;
                   }
-                  seriesNameTmp = start+end;
+                  if((parClientHeight-pointY-(parTop-parScrollTop)-20)>=boxHeight){//说明鼠标上面放不下提示框
+                    y = pointY+10;
+                  }else {
+                    y = pointY-boxHeight;
+                  }
+                  return [x,y];
+                }else {//preview page
+                  x = pointX - boxWidth;
+                  y = pointY+10;
+                  return [x,y];
                 }
-              });
-              if(seriesNameTmp.indexOf(",}")>-1){
-                seriesNameTmp = seriesNameTmp.replace(",}","}");
+              }else {
+                if(pointX<(viewWidth/2)){//说明鼠标在左边放不下提示框
+                  x=pointX+10;
+                }else{
+                  x = pointX - boxWidth;
+                }
+                if(pointY<(viewHeight/2)){//说明鼠标上面放不下提示框
+                  y = pointY+10;
+                }else {
+                  y = pointY-boxHeight;
+                }
+                return [x,y];
               }
-              if(seriesNameTmp.indexOf("{}")>-1){
-                seriesNameTmp = seriesNameTmp.replace("{}","");
-              }
-              /*
-              if(chartInfo.elements[serIndex].type==='normal'){
+            },
+            formatter:function(params){
+              //display:inline-block;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;
+              let str = `<div   style='width:600px;display:inline-block;line-height: 18px;font-size:12px;font-family: Roboto,Helvetica Neue,Arial,sans-serif;'>`;
+              params.forEach((item, i) => {
+                if(i===0){
+                  let t_date = new Date(item.data[0]);
+                  str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " "
+                    + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':');
+                }
+                str +=`<br/>`;
+                let val = parseFloat(Number(item.data[1]).toFixed(2));
+                if(val===0){
+                  val = Number(item.data[1]);
+                }
+                /*
+                let itemNameList = ["instance","module","project","job","dc","asset"];
+                let seriesNameTmp = item.seriesName;
+                itemNameList.forEach((itemName) => {
+                  let insIndex = seriesNameTmp.indexOf(itemName+"=");
+                  if(insIndex>-1){//{dd=""22,instance="aa",job="nn"},如果最后只有{},则去掉{}
+                    let start = seriesNameTmp.substring(0,insIndex);
+                    let endTmp = seriesNameTmp.substring(insIndex+itemName.length+1,seriesNameTmp.length);
+                    let sepInd = endTmp.indexOf(',');
+                    let end = "";
+                    if(sepInd>-1){
+                      end = endTmp.substring(sepInd+1,endTmp.length);
+                    }else {
+                      sepInd = endTmp.indexOf('"',1);
+                      end = endTmp.substring(sepInd+1,endTmp.length);
+                    }
+                    seriesNameTmp = start+end;
+                  }
+                });
+                if(seriesNameTmp.indexOf(",}")>-1){
+                  seriesNameTmp = seriesNameTmp.replace(",}","}");
+                }
+                if(seriesNameTmp.indexOf("{}")>-1){
+                  seriesNameTmp = seriesNameTmp.replace("{}","");
+                }
                 str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span> `;
                 str +=seriesNameTmp+":"+val;
-              }else if(chartInfo.elements[serIndex].type==='expert'){
-                str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span>${item.seriesName} `;
+                 */
+                str += `<div style='max-width:510px;display:inline-block;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;line-height: 18px;font-size:12px;font-family: Roboto,Helvetica Neue,Arial,sans-serif;'>`;
+
+                str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span>${item.seriesName}: `;
+                str +=`</div>`;
+                str += `<div style='max-width:90px;min-width:20px;float:right;text-align:right;display:inline-block;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;line-height: 18px;font-size:12px;font-family: Roboto,Helvetica Neue,Arial,sans-serif;'>`;
                 str +=val;
-              }
-               */
-              str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span> `;
-              str +=seriesNameTmp+":"+val;
-            });
-            str +=`</div>`;
-            return str;
-           // return `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal'><span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${params[0].color};}'></span> ${params[0].seriesName}:${params[0].data[1]}</div>`;
-          },
-        },
-        legend: {
-          type:'scroll',
-          height:80,
-          show:false,
-          icon:"roundRect",
-          itemHeight:5,
-          itemWidth:15,
-          formatter:function(name){
-            //console.log('==========='+name);
-            if(!name){
-              return '';
-            }
-            //计算宽度
-            var span = document.createElement("span");
-            var result = {};
-            result.width = span.offsetWidth;
-            result.height = span.offsetHeight;
-            span.style.visibility = "hidden";
-            span.style.fontSize = 14;
-            span.style.fontFamily = "Arial";
-            span.style.display = "inline-block";
-            document.body.appendChild(span);
-            if(typeof span.textContent != "undefined"){
-              span.textContent = name;
-            }else{
-              span.innerText = name;
-            }
-            var txtWidth = parseFloat(window.getComputedStyle(span).width) - result.width;
-            document.body.removeChild(span);
-
-            if(txtWidth < chartWidth){
-              return name;
-            }else {
-              var charNum = `${(chartWidth-100)/(txtWidth/name.length)}`;
-              return name.slice(0,charNum)+'...';
-            }
-          },
-          tooltip:{
-            show:true,
-            formatter:function(params){
-              //alert(params.length);
-              //alert(JSON.stringify(params));
-
-              return `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal'> ${params.name}</div>`;
+                str +=`</div>`;
+              });
+              str +=`</div>`;
+              return str;
+              // return `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal'><span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${params[0].color};}'></span> ${params[0].seriesName}:${params[0].data[1]}</div>`;
             },
           },
-          data: legend,
-          orient:'vertical',
-          x:'center',
-          y:'bottom',
-          //top:'5%',
-          //bottom:0
-        },
-        grid: {
-          //height:"50%",
-          left: 65,
-          right: 65,
-          containLabel: false,
-          bottom:70//156
-        },
-        dataZoom: [{
-          type: 'slider',
-          show:true,
-          xAxisIndex: [0],
-          start: 0,
-          end: 100,
-          height:25,
-          bottom:10//96
-        }
-        /*
-        , {
-          start: 0,
-          end: 100,
-          handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-          handleSize: '80%',
-          handleStyle: {
-            color: '#fff',
-            shadowBlur: 3,
-            shadowColor: 'rgba(0, 0, 0, 0.6)',
-            shadowOffsetX: 2,
-            shadowOffsetY: 2
-          }
+          legend: {
+            type:'scroll',
+            height:80,
+            show:false,
+            icon:"roundRect",
+            itemHeight:5,
+            itemWidth:15,
+            formatter:function(name){
+              //console.log('==========='+name);
+              if(!name){
+                return '';
+              }
+              //计算宽度
+              var span = document.createElement("span");
+              var result = {};
+              result.width = span.offsetWidth;
+              result.height = span.offsetHeight;
+              span.style.visibility = "hidden";
+              span.style.fontSize = 14;
+              span.style.fontFamily = "Arial";
+              span.style.display = "inline-block";
+              document.body.appendChild(span);
+              if(typeof span.textContent != "undefined"){
+                span.textContent = name;
+              }else{
+                span.innerText = name;
+              }
+              var txtWidth = parseFloat(window.getComputedStyle(span).width) - result.width;
+              document.body.removeChild(span);
 
-
-        }
-        */],
-
-        xAxis: {
-          type: 'time',
-          //boundaryGap: false,//line-false; bar-true;
-          //data: ['20190101', '20190102', '周三', '周四', '周五', '周六', '周日']
-          axisLabel: {
-            intervale: 0,
-            rotate: 0,
-            formatter: function (value) {
-              var t_date = new Date(value);
-              return [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + "\n"
-                + [t_date.getHours(), t_date.getMinutes()].join(':');
-            }
-          },
-          axisPointer: {//y轴上显示指针对应的值
-            show: true,
-          },
-          splitLine:{
-            show:false
-          }
-        },
-        yAxis: {
-          type: 'value',
-          splitLine:{
-            show:true
-          },
-          axisLabel: {
-            formatter: function(num,index) {
-              if (num >= 1000) {
-                const kbNum = num / 1000;
-                if (kbNum >= 1000) {
-                  const mbNum = kbNum / 1000;
-                  if (mbNum > 1000) {
-                    const gbNum = mbNum / 1000;
-                    /*
-                    if (gbNum > 1000) {
-                      const tbNum = gbNum / 1000;
-                      if (tbNum > 1000) {
-                        const pbNum = tbNum / 1000;
-                        return `${pbNum.toFixed(2)}PB`;
-                      }
-                      return `${tbNum.toFixed(2)}TB`;
-                    }*/
-                    return `${parseFloat(gbNum.toFixed(2))}B`;
-                  }
-                  return `${parseFloat(mbNum.toFixed(2))}M`;
-                }
-                return `${parseFloat(kbNum.toFixed(2))}K`;
+              if(txtWidth < chartWidth){
+                return name;
               }else {
-                let rlt = parseFloat(num.toFixed(2));
-                if(rlt===0){
-                  return num;
-                }else {
-                  return rlt;
-                }
+                var charNum = `${(chartWidth-100)/(txtWidth/name.length)}`;
+                return name.slice(0,charNum)+'...';
               }
             },
+            tooltip:{
+              show:true,
+              formatter:function(params){
+                //alert(params.length);
+                //alert(JSON.stringify(params));
+
+                return `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal'> ${params.name}</div>`;
+              },
+            },
+            data: legend,
+            orient:'vertical',
+            x:'center',
+            y:'bottom',
+            //top:'5%',
+            //bottom:0
           },
-          //boundaryGap:[0,0.2]
-        },
-        useUTC: false,//使用本地时间
-        series: dataArg
-      };
-      // params.series = dataArg;
-      if (chartSite === 'local') { // 本地显示
-        /*
-        option.series = dataArg.map((item) => {// params.series = dataArg.map((item) => {
-          const obj = Object.assign(item);
-          /*
-          obj.events = {
-            // eslint-disable-next-line
-            legendItemClick: function(event) {//点击metric的事件，可以用默认的先
-              event.preventDefault();
-              let visibleAll = true; // 全部显示
-              let visibleThis = true; // 点击是否是当前显示的那个条目
-              self.highchartStore.series.forEach((serie, i) => {
-                // 最后一个为导航,排除。
-                if (i !== self.highchartStore.series.length - 1) {
-                  // 查看是否为显示一条状态数据,如果有非显示状态的,表示当前只显示一条数据
-                  if (!serie.visible) {
-                    visibleAll = false;
-                    // 点击前显示单个,判断是否点击为正在显示那个,该种情况表示点击了其他隐藏状态数据
-                    if (event.target.index === i) { // one to another
-                      visibleThis = false;
-                    }
-                  }
-                }
-              });
-              // 根据visibleAll和visibleThis判断是要显示一个还是全显示
-              // 当visibleAll为true(表示all => one)
-              // visibleAll为false: visibleThis为false(one => another one)。
-              // visibleAll为false: visibleThis为true(one => all)。
-              if (visibleAll || !visibleThis) { // 隐藏显示其中一个
-                self.highchartStore.series.forEach((serie, i) => {
-                  const operateObj = serie;
-                  // 除显示条目以外,还有一条serie是导航栏
-                  if (i !== self.highchartStore.series.length - 1) {
-                    if (event.target.index === i) {
-                      operateObj.setVisible(true, false);
-                    } else {
-                      operateObj.setVisible(false, false);
-                    }
-                  } else {
-                    operateObj.setVisible(true, false);
-                  }
-                });
-                self.highchartStore.redraw();
-              } else { // 全部显示
-                self.highchartStore.series.forEach((serie) => {
-                  const operateObj = serie;
-                  operateObj.setVisible(true, false);
-                });
-                self.highchartStore.redraw();
+          grid: {
+            //height:"50%",
+            //top: '13%',
+            left: 65,
+            right: 65,
+            containLabel: false,
+            bottom:70,//156
+          },
+          dataZoom: [{
+            type: 'slider',
+            show:true,
+            xAxisIndex: [0],
+            start: 0,
+            end: 100,
+            height:25,
+            bottom:10//96
+          }
+            /*
+            , {
+              start: 0,
+              end: 100,
+              handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+              handleSize: '80%',
+              handleStyle: {
+                color: '#fff',
+                shadowBlur: 3,
+                shadowColor: 'rgba(0, 0, 0, 0.6)',
+                shadowOffsetX: 2,
+                shadowOffsetY: 2
+              }
+
+
+            }
+            */],
+
+          xAxis: {
+            type: 'time',
+            //boundaryGap: false,//line-false; bar-true;
+            //data: ['20190101', '20190102', '周三', '周四', '周五', '周六', '周日']
+            axisLabel: {
+              intervale: 0,
+              rotate: 0,
+              formatter: function (value) {
+                var t_date = new Date(value);
+                return [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + "\n"
+                  + [t_date.getHours(), t_date.getMinutes()].join(':');
               }
             },
-          };
-
-          return obj;
-        });
-        */
-        this.echartStore.clear();
-        option.title = title;
-        this.echartStore.setOption(option);//创建图表
-        this.echartStore.hideLoading();
-        this.echartStore.resize({height:chartInfo.height});//,width:`${ele.clientWidth-100}`}
-        if(legend && legend.length>0){
-          this.legendList = [];
-          legend.forEach((item, i) => {
-            const legend = {
-              name:item,
-              showText:this.formatLegend(chartWidth,item)
-            };
-            this.legendList.push(legend);
-            this.isGrey.push(false);
-          });
-        }
-        /*
-        this.$nextTick(() => {
-          let divHeight = this.$refs.legendArea.offsetHeight;
-          let chartHeight = (chartInfo.height-divHeight);
-          this.echartStore.resize({height:chartHeight});//,width:`${ele.clientWidth-100}`}
-        });
-        */
-      } else if (chartSite === 'screen') { // 全屏显示
-        /*
-        option.series = dataArg.map((item) => {// params.series = dataArg.map((item) => {
-          const obj = Object.assign(item);
-          obj.events = {
-            // eslint-disable-next-line
-            legendItemClick: function(event) {
-              event.preventDefault();
-              let visibleAll = true; // 全部显示
-              let visibleThis = true; // 点击是否是当前显示的那个条目
-              self.highchartModalStore.series.forEach((serie, i) => {
-                if (i !== self.highchartModalStore.series.length - 1) {
-                  if (!serie.visible) {
-                    visibleAll = false;
-                    if (event.target.index === i) {
-                      visibleThis = false;
-                    }
-                  }
-                }
-              });
-              if (visibleAll || !visibleThis) {
-                self.highchartModalStore.series.forEach((serie, i) => {
-                  const operateObj = serie;
-                  if (i !== self.highchartModalStore.series.length - 1) {
-                    if (event.target.index === i) {
-                      operateObj.setVisible(true, false);
-                    } else {
-                      operateObj.setVisible(false, false);
-                    }
-                  } else {
-                    operateObj.setVisible(true, false);
-                  }
-                });
-                self.highchartModalStore.redraw();
-              } else {
-                self.highchartModalStore.series.forEach((serie) => {
-                  const operateObj = serie;
-                  operateObj.setVisible(true, false);
-                });
-                self.highchartModalStore.redraw();
-              }
+            axisPointer: {//y轴上显示指针对应的值
+              show: true,
             },
-          };
-          return obj;
-        });
-        */
-        // eslint-disable-next-line
-        this.echartModalStore.clear();
-        option.title = {};
-        this.echartModalStore.setOption(option);//显示全屏界面
-        this.echartModalStore.hideLoading();
-        this.echartModalStore.resize({height:chartInfo.height});
-        if(legend && legend.length>0){
-          this.screenLegendList = [];
-          legend.forEach((item, i) => {
-            const legend = {
-              name:item,
-              showText:this.formatLegend(chartWidth,item)
-            };
-            this.screenLegendList.push(legend);
-            this.isGreyScreen.push(false);
-          });
-        }
-        /*
-        this.$nextTick(() => {
-          let divHeight = this.$refs.screenLegendArea.offsetHeight;
-          let chartHeight = (chartInfo.height-divHeight);
-          this.echartModalStore.resize({height:chartHeight});
-        });
-        */
-      }
-    },
-    handleLineFeed(str,chartWidth){
-      let rlt='';
-      if(!str){
-        return '';
-      }
-      //计算宽度
-      var span = document.createElement("span");
-      var result = {};
-      result.width = span.offsetWidth;
-      result.height = span.offsetHeight;
-      span.style.visibility = "hidden";
-      span.style.fontSize = 14;
-      span.style.fontFamily = "Arial";
-      span.style.display = "inline-block";
-      document.body.appendChild(span);
-      if(typeof span.textContent != "undefined"){
-        span.textContent = str;
-      }else{
-        span.innerText = str;
-      }
-      var txtWidth = parseFloat(window.getComputedStyle(span).width) - result.width;
-      document.body.removeChild(span);
-
-      if(txtWidth < chartWidth){
-        return str;
-      }else {
-        var charNum = `${(chartWidth-100)/(txtWidth/str.length)}`;
-        return str.slice(0,charNum)+'...';
-      }
-      /*
-      if(txtWidth < (chartWidth-30)){
-        return str;
-      }else {
-        var charNum = `${(chartWidth-200)/(txtWidth/str.length)}`;//一行的字符数
-        charNum = parseInt(charNum);
-        if(str.length>charNum){
-          let num = `${str.length/charNum}`;
-          num = parseInt(num)+1;
-          for(let i=0;i<num;i++){
-            rlt += str.substring(charNum*i,charNum*(i+1))+'\n';
-          }
-        }else {
-          return str;
-        }
-      }
-      */
-      //return rlt;
-    },
-    // 设置数据, filter区分
-    setData(chartItem, seriesItem, panelId, filter,legend) {
-      if (filter) { // 保存数据,用于同步时间
-        this.stableFilter = filter;
-      }
-      this.legend = legend;
-      this.panelIdInner = panelId;
-      this.data = chartItem;
-      this.seriesItem = seriesItem;
-      this.searchTime[0] = filter.start_time;
-      this.searchTime[1] = filter.end_time;
-      this.oldSearchTime = this.searchTime;
-      this.initChart(chartItem, seriesItem, this.$refs.lineChartArea, 'local',legend);
-      /*
-      if (chartItem.type === 'line' || chartItem.type === 'bar' || chartItem.type === 4) {
-        this.initChart(chartItem, seriesItem, this.$refs.lineChartArea, 'local',legend);
-      }
-      */
-    },
-
-    // 删除该图表
-    removeChart() {
-      this.$emit('on-remove-chart-block', this.data.id);
-    },
-    // 编辑图表
-    editChart() {
-      this.$emit('on-edit-chart-block', this.data.id);
-    },
-    // 重新请求数据 刷新操作
-    refreshChart() {
-      this.echartStore.showLoading();
-      this.$emit('on-refresh-data', this.data.id);
-    },
-    initDialog(){
-      //此时初始化，才能获得screenShowArea对象，否则此对象为undefined，无法初始化图表
-      this.initChart(this.data, this.seriesItem, this.$refs.screenShowArea, 'screen',this.legend);
-      // 日期组件同步时间
-      /*
-      this.$refs.calendar.initTime({
-        start: this.stableFilter.start_time,
-        end: this.stableFilter.end_time,
-      });
-      */
-    },
-    changeDate(st){
-      this.oldSearchTime=st;
-      this.searchTime = st;
-      this.filter.start_time = st[0];
-      this.filter.end_time = st[1];
-    },
-    // 全屏查看
-    showAllScreen() {
-      // 初始化同步时间
-      this.filter.start_time = this.stableFilter.start_time;
-      this.filter.end_time = this.stableFilter.end_time;
-      this.searchTime = this.oldSearchTime;
-      this.screenModal = true;
-      this.isGreyScreen=[];
-      this.dateChange();
-    },
-    dateChange(time) {
-      this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
-      this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
-      if (this.showSetting) {
-        this.getQueryChart('list');
-      } else {
-        this.getQueryChart('dashboard');
-      }
-    },
-    // 查询数据,修改日期查询全屏数据
-    getQueryChart(type) {
-      if (this.echartModalStore) {
-        this.echartModalStore.showLoading();
-      }
-      let axiosArr = [];
-      this.$nextTick(() => {
-        let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
-        let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
-        if(!startTime || !endTime){//如果时间为空，则默认取最近1小时
-          let now = new Date();
-          startTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss');
-          endTime = bus.timeFormate(now.setHours(now.getHours()-1), 'yyyy-MM-dd hh:mm:ss');
-          this.searchTime[0] = startTime;
-          this.searchTime[1] = endTime;
-        }
-        let step = bus.getStep(startTime,endTime);
-        if (type === 'list') { // 普通模式,主控台使用
-          axiosArr = this.data.elements.map((ele) => {
-            const filterItem = ele;
-            return  this.$get('/prom/api/v1/query_range?query='+filterItem.expression+"&start="+startTime+"&end="+endTime+'&step='+step);
-          });
-        } else if (type === 'dashboard') { // 概览模式,指标概览中使用
-          // 概览模式,需要区分单独一个和多个
-          if (this.stableFilter.chartCount === 'multiple') {
-            axiosArr = [this.$get('/prom/api/v1/query_range?query='+this.data.title+"&start="+startTime+"&end="+endTime+'&step='+step)];
-          } else {
-            axiosArr = [this.$get('/prom/api/v1/query_range?query='+this.data.elements[0].expression+"&start="+startTime+"&end="+endTime+'&step='+step)];
-          }
-        }
-        // 一个图表
-        axios.all(axiosArr).then((res) => {
-          if (res.length > 0) {
-            const series = [];
-            const legend = [];
-            const sumData = {
-              name: 'sum',
-              data: [],
-              visible: true,
-              threshold: null,
-            };
-            res.forEach((response) => {
-              if (response.status === 'success') {
-                if (response.data.result) {
-                  // 循环处理每个elements下获取的数据列
-                  response.data.result.forEach((queryItem,innerPos) => {
-                    const seriesItem = {
-                      theData: {
-                        name: '',
-                        symbol:'none',  //去掉点
-                        smooth:true,  //曲线变平滑
-                        data: [],
-                        type:this.data.type,
-                        //visible: true,
-                        //threshold: null,
-                      },
-                      metric_name: '',
-                    };
-                    // 图表中每条线的名字,后半部分
-                   // let host = `${queryItem.metric.__name__}{`;//up,
-                    let host = '';//up,
-                    if(queryItem.metric.__name__){
-                      host = `${queryItem.metric.__name__}{`;//up,
-                    }
-                    const tagsArr = Object.keys(queryItem.metric);//["__name__","asset","idc","instance","job","module","project"]
-                    // 设置时间-数据格式对
-                    const dpsArr = Object.entries(queryItem.values);//[ ["0",[1577959830.781,"0"]], ["1",[1577959845.781,"0"]] ]
-                    // 判断是否有数据
-                    if (dpsArr.length > 0 && tagsArr.length > 0) {
-                      tagsArr.forEach((tag, i) => {
-                        if (tag !== '__name__') {
-                          host += `${tag}="${queryItem.metric[tag]}",`;
-                        }
-                      });
-                      if(host.endsWith(',')){host = host.substr(0,host.length-1);}
-                      host +="}";
-                      legend.push(host);
-                      // 图表中每条线的名字,去掉最后的逗号与空格:metric名称,  标签1=a,标签2=c
-                      seriesItem.theData.name = host;
-                      seriesItem.metric_name = seriesItem.theData.name;
-                      // 将秒改为毫秒
-                      //alert('table=='+JSON.stringify(queryItem))
-                      seriesItem.theData.data = queryItem.values.map((dpsItem, dpsIndex) => {
-                        /*曲线汇总暂不需要
-                        if (sumData.data[dpsIndex]) {
-                          const sumNum = sumData.data[dpsIndex][1] || 0;
-                          sumData.data[dpsIndex][1] = sumNum + dpsItem[1];
-                        } else {
-                          sumData.data[dpsIndex] = [dpsItem[0] * 1000, dpsItem[1]];
-                        }
-                        */
-                        return [dpsItem[0] * 1000, dpsItem[1]];
-                      });
-                      series.push(seriesItem.theData);
-
-                    } else if (this.data.elements && this.data.elements[innerPos]) {
-                      // 无数据提示
+            splitLine:{
+              show:false
+            }
+          },
+          yAxis: {
+            type: 'value',
+            splitLine:{
+              show:true
+            },
+            axisLabel: {
+              formatter: function(num,index) {
+                if (num >= 1000) {
+                  const kbNum = num / 1000;
+                  if (kbNum >= 1000) {
+                    const mbNum = kbNum / 1000;
+                    if (mbNum >= 1000) {
+                      const gbNum = mbNum / 1000;
                       /*
-                      const currentInfo = chartItem.elements[innerPos];
-                      const errorMsg = `图表 ${chartItem.title} 中 ${currentInfo.metric},${currentInfo.tags} 无数据`;
-                      this.$message.warning({
-                        duration: 15,
-                        content: errorMsg,
-                        closable: true,
-                      });
-                      */
+                      if (gbNum > 1000) {
+                        const tbNum = gbNum / 1000;
+                        if (tbNum > 1000) {
+                          const pbNum = tbNum / 1000;
+                          return `${pbNum.toFixed(2)}PB`;
+                        }
+                        return `${tbNum.toFixed(2)}TB`;
+                      }*/
+                      return `${parseFloat(gbNum.toFixed(2))}B`;
+                    }
+                    return `${parseFloat(mbNum.toFixed(2))}M`;
+                  }
+                  return `${parseFloat(kbNum.toFixed(2))}K`;
+                }else {
+                  let rlt = parseFloat(num.toFixed(2));
+                  if(rlt===0){
+                    return num;
+                  }else {
+                    return rlt;
+                  }
+                }
+              },
+            },
+            //boundaryGap:[0,0.2]
+          },
+          useUTC: false,//使用本地时间
+          series: dataArg
+        };
+        // params.series = dataArg;
+        if (chartSite === 'local') { // 本地显示
+          /*
+          option.series = dataArg.map((item) => {// params.series = dataArg.map((item) => {
+            const obj = Object.assign(item);
+            /*
+            obj.events = {
+              // eslint-disable-next-line
+              legendItemClick: function(event) {//点击metric的事件，可以用默认的先
+                event.preventDefault();
+                let visibleAll = true; // 全部显示
+                let visibleThis = true; // 点击是否是当前显示的那个条目
+                self.highchartStore.series.forEach((serie, i) => {
+                  // 最后一个为导航,排除。
+                  if (i !== self.highchartStore.series.length - 1) {
+                    // 查看是否为显示一条状态数据,如果有非显示状态的,表示当前只显示一条数据
+                    if (!serie.visible) {
+                      visibleAll = false;
+                      // 点击前显示单个,判断是否点击为正在显示那个,该种情况表示点击了其他隐藏状态数据
+                      if (event.target.index === i) { // one to another
+                        visibleThis = false;
+                      }
+                    }
+                  }
+                });
+                // 根据visibleAll和visibleThis判断是要显示一个还是全显示
+                // 当visibleAll为true(表示all => one)
+                // visibleAll为false: visibleThis为false(one => another one)。
+                // visibleAll为false: visibleThis为true(one => all)。
+                if (visibleAll || !visibleThis) { // 隐藏显示其中一个
+                  self.highchartStore.series.forEach((serie, i) => {
+                    const operateObj = serie;
+                    // 除显示条目以外,还有一条serie是导航栏
+                    if (i !== self.highchartStore.series.length - 1) {
+                      if (event.target.index === i) {
+                        operateObj.setVisible(true, false);
+                      } else {
+                        operateObj.setVisible(false, false);
+                      }
+                    } else {
+                      operateObj.setVisible(true, false);
                     }
                   });
+                  self.highchartStore.redraw();
+                } else { // 全部显示
+                  self.highchartStore.series.forEach((serie) => {
+                    const operateObj = serie;
+                    operateObj.setVisible(true, false);
+                  });
+                  self.highchartStore.redraw();
                 }
-              }
-            });
-            /*
-            if (series.length && this.data.type === 4) {
-              series.push(sumData);
-            }
-            */
-            this.initChart(this.data, series, this.$refs.screenShowArea, 'screen',legend);
-          }
-        }).catch((error) => {
-          if (error) {
-            this.$message.warning({
-              content: this.$t("tip.refreshLater"),//'Please refesh later',//请稍后刷新
-              duration: 3,
-            });
-          }
-        });
-      });
-    },
-    showLoad() {
-      if (this.echartStore) {
-        this.echartStore.showLoading();
-      }
-    },
-    // 获取格式
-    getNumStr(num) {
-      if (num >= 1000) {
-        const kbNum = num / 1000;
-        if (kbNum >= 1000) {
-          const mbNum = kbNum / 1000;
-          if (mbNum > 1000) {
-            const gbNum = mbNum / 1000;
-            /*
-            if (gbNum > 1000) {
-              const tbNum = gbNum / 1000;
-              if (tbNum > 1000) {
-                const pbNum = tbNum / 1000;
-                return `${pbNum.toFixed(2)}PB`;
-              }
-              return `${tbNum.toFixed(2)}TB`;
-            }*/
-            return `${gbNum.toFixed(2)}B`;
-          }
-          return `${mbNum.toFixed(2)}M`;
-        }
-        return `${kbNum.toFixed(2)}K`;
-      }
-      return num.toFixed(2);
-    },
-    handleClose(){},
-    /*
-    handleClose(done) {
-      /*
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {});
+              },
+            };
 
-    },*/
-  /*
-    // 展示图表编辑区
-    showTool() {
-      this.toolbox = !this.toolbox;
-    },
-    // 修改图表类型
-    changeChart(type) {
-      this.chartType = type;
-      this.highchartStore.update({
-        chart: {
-          type: this.chartType,
-        },
-      });
-    },
-
-    dateChange(time) {
-      this.filter.start_time = `${time[0]}:00`;
-      this.filter.end_time = `${time[1]}:59`;
-      if (this.showSetting) {
-        this.getQueryChart('list');
-      } else {
-        this.getQueryChart('dashboard');
-      }
-    },
-    // 查询数据,修改日期查询全屏数据
-    getQueryChart(type) {
-      if (this.highchartModalStore) {
-        this.highchartModalStore.showLoading();
-      }
-      let axiosArr = [];
-      if (type === 'list') { // 普通模式,主控台使用
-        axiosArr = this.data.elements.map((ele) => {
-          const filterItem = ele;
-          return getQueryChart({
-            product_id: this.productId,
-            metric: filterItem.metric,
-            tags: filterItem.tags,
-            start: this.filter.start_time,
-            end: this.filter.end_time,
+            return obj;
           });
-        });
-      } else if (type === 'dashboard') { // 概览模式,指标概览中使用
-        // 概览模式,需要区分单独一个和多个
-        if (this.stableFilter.chartCount === 'multiple') {
-          // 所有tag标签
-          const tagAllArr = this.proTags(this.data.tags);
-          // 根据title格式化的标签
-          const titles = this.data.title.split(',');
-          const titleArr = titles.map(item => item.trim());
-          // 获取所需标签
-          const tagArr = this.getCompilation(tagAllArr, titleArr);
-          axiosArr = [getQueryChart({
-            product_id: this.productId,
-            metric: this.data.metric,
-            tags: tagArr.toString(),
-            start: this.filter.start_time,
-            end: this.filter.end_time,
-          })];
-        } else {
-          axiosArr = [getQueryChart({
-            product_id: this.productId,
-            metric: this.data.metric,
-            tags: this.data.tags,
-            start: this.filter.start_time,
-            end: this.filter.end_time,
-          })];
-        }
-      }
-      // 一个图表
-      axios.all(axiosArr).then((res) => {
-        if (res.length > 0) {
-          const series = [];
-          const sumData = {
-            name: 'sum',
-            data: [],
-            visible: true,
-            threshold: null,
-          };
-          res.forEach((response) => {
-            if (response.data.code === 200) {
-              if (response.data.data) {
-                // 循环处理每个elements下获取的数据列
-                response.data.data.forEach((queryItem) => {
-                  const seriesItem = {
-                    theData: {
-                      name: '',
-                      data: [],
-                      visible: true,
-                      threshold: null,
-                    },
-                    metric_name: '',
-                  };
-                  // 图表中每条线的名字,后半部分
-                  let host = `${queryItem.metric}, `;
-                  const tagsArr = Object.keys(queryItem.tags);
-                  // 设置时间-数据格式对
-                  const dpsArr = Object.entries(queryItem.dps);
-                  if (tagsArr.length > 0 && dpsArr.length > 0) {
-                    tagsArr.forEach((tag, i) => {
-                      if (tag !== 'uuid') {
-                        host += i === 0 ? `${tag}=${queryItem.tags[tag]}` : `, ${tag}=${queryItem.tags[tag]}`;
+          */
+          this.echartStore.clear();
+          option.title = title;
+          this.echartStore.setOption(option);//创建图表
+          this.echartStore.hideLoading();
+          this.echartStore.resize({height:chartInfo.height});//,width:`${ele.clientWidth-100}`}
+          if(legend && legend.length>0){
+            this.legendList = [];
+            legend.forEach((item, i) => {
+              const legend = {
+                name:item,
+                showText:this.formatLegend(chartWidth,item)
+              };
+              this.legendList.push(legend);
+              this.isGrey.push(false);
+            });
+          }
+          this.$nextTick(() => {
+            let divHeight = this.$refs.legendArea.offsetHeight;
+            if(!chartInfo.height){
+              this.echartStore.resize({height:(400-divHeight)});
+            }else {
+              this.echartStore.resize({height:(chartInfo.height-divHeight)});
+            }
+          });
+        } else if (chartSite === 'screen') { // 全屏显示
+          /*
+          option.series = dataArg.map((item) => {// params.series = dataArg.map((item) => {
+            const obj = Object.assign(item);
+            obj.events = {
+              // eslint-disable-next-line
+              legendItemClick: function(event) {
+                event.preventDefault();
+                let visibleAll = true; // 全部显示
+                let visibleThis = true; // 点击是否是当前显示的那个条目
+                self.highchartModalStore.series.forEach((serie, i) => {
+                  if (i !== self.highchartModalStore.series.length - 1) {
+                    if (!serie.visible) {
+                      visibleAll = false;
+                      if (event.target.index === i) {
+                        visibleThis = false;
                       }
-                    });
-                    // 图表中每条线的名字,去掉最后的逗号与空格
-                    seriesItem.theData.name = host;
-                    seriesItem.metric_name = seriesItem.theData.name;
-                    // 将秒改为毫秒
-                    seriesItem.theData.data = dpsArr.map((dpsItem, dpsIndex) => {
-                      if (sumData.data[dpsIndex]) {
-                        const sumNum = sumData.data[dpsIndex][1] || 0;
-                        sumData.data[dpsIndex][1] = sumNum + dpsItem[1];
-                      } else {
-                        sumData.data[dpsIndex] = [dpsItem[0] * 1000, dpsItem[1]];
-                      }
-                      return [dpsItem[0] * 1000, dpsItem[1]];
-                    });
-                    series.push(seriesItem.theData);
+                    }
                   }
                 });
-              }
+                if (visibleAll || !visibleThis) {
+                  self.highchartModalStore.series.forEach((serie, i) => {
+                    const operateObj = serie;
+                    if (i !== self.highchartModalStore.series.length - 1) {
+                      if (event.target.index === i) {
+                        operateObj.setVisible(true, false);
+                      } else {
+                        operateObj.setVisible(false, false);
+                      }
+                    } else {
+                      operateObj.setVisible(true, false);
+                    }
+                  });
+                  self.highchartModalStore.redraw();
+                } else {
+                  self.highchartModalStore.series.forEach((serie) => {
+                    const operateObj = serie;
+                    operateObj.setVisible(true, false);
+                  });
+                  self.highchartModalStore.redraw();
+                }
+              },
+            };
+            return obj;
+          });
+          */
+          // eslint-disable-next-line
+          this.echartModalStore.clear();
+          option.title = {};
+          this.echartModalStore.setOption(option);//显示全屏界面
+          this.echartModalStore.hideLoading();
+          this.echartModalStore.resize({height:chartInfo.height});
+          if(legend && legend.length>0){
+            this.screenLegendList = [];
+            legend.forEach((item, i) => {
+              const legend = {
+                name:item,
+                showText:this.formatLegend(chartWidth,item)
+              };
+              this.screenLegendList.push(legend);
+              this.isGreyScreen.push(false);
+            });
+          }
+          this.$nextTick(() => {
+            let divHeight = this.$refs.screenLegendArea.offsetHeight;
+            if(!chartInfo.height){
+              this.echartModalStore.resize({height:(400-divHeight)});
+            }else {
+              this.echartModalStore.resize({height:(chartInfo.height-divHeight)});
             }
           });
-          if (series.length && this.data.type === 4) {
-            series.push(sumData);
+        }
+      },
+      handleLineFeed(str,chartWidth){
+        let rlt='';
+        if(!str){
+          return '';
+        }
+        //计算宽度
+        var span = document.createElement("span");
+        var result = {};
+        result.width = span.offsetWidth;
+        result.height = span.offsetHeight;
+        span.style.visibility = "hidden";
+        span.style.fontSize = 14;
+        span.style.fontFamily = "Arial";
+        span.style.display = "inline-block";
+        document.body.appendChild(span);
+        if(typeof span.textContent != "undefined"){
+          span.textContent = str;
+        }else{
+          span.innerText = str;
+        }
+        var txtWidth = parseFloat(window.getComputedStyle(span).width) - result.width;
+        document.body.removeChild(span);
+
+        if(txtWidth < chartWidth){
+          return str;
+        }else {
+          var charNum = `${(chartWidth-100)/(txtWidth/str.length)}`;
+          return str.slice(0,charNum)+'...';
+        }
+        /*
+        if(txtWidth < (chartWidth-30)){
+          return str;
+        }else {
+          var charNum = `${(chartWidth-200)/(txtWidth/str.length)}`;//一行的字符数
+          charNum = parseInt(charNum);
+          if(str.length>charNum){
+            let num = `${str.length/charNum}`;
+            num = parseInt(num)+1;
+            for(let i=0;i<num;i++){
+              rlt += str.substring(charNum*i,charNum*(i+1))+'\n';
+            }
+          }else {
+            return str;
           }
-          this.initChart(this.data, series, this.$refs.screenShowArea, 'screen');
         }
-      }).catch((error) => {
-        if (error) {
-          this.$Message.warning({
-            content: '请稍后刷新',
-            duration: 3,
-          });
+        */
+        //return rlt;
+      },
+      // 设置数据, filter区分
+      setData(chartItem, seriesItem, panelId, filter,legend) {
+        if (filter) { // 保存数据,用于同步时间
+          this.stableFilter = filter;
         }
-      });
-    },
+        this.legend = legend;
+        this.panelIdInner = panelId;
+        this.data = chartItem;
+        this.seriesItem = seriesItem;
+        this.searchTime[0] = filter.start_time;
+        this.searchTime[1] = filter.end_time;
+        this.oldSearchTime = this.searchTime;
+        this.initChart(chartItem, seriesItem, this.$refs.lineChartArea, 'local',legend);
+        /*
+        if (chartItem.type === 'line' || chartItem.type === 'bar' || chartItem.type === 4) {
+          this.initChart(chartItem, seriesItem, this.$refs.lineChartArea, 'local',legend);
+        }
+        */
+      },
 
-
-    // 获取tag数组
-    proTags(data) {
-      const dou = data.indexOf(',');
-      const tmp = [];
-      if (dou === -1) {
-        const set = data.split('=');
-        if (set[1].indexOf('|') > -1) {
-          const valueArr = set[1].split('|');
-          valueArr.forEach((keyV) => {
-            tmp.push(`${set[0]}=${keyV}`);
-          });
+      // 删除该图表
+      removeChart() {
+        this.$emit('on-remove-chart-block', this.data.id);
+      },
+      // 编辑图表
+      editChart() {
+        this.$emit('on-edit-chart-block', this.data.id);
+      },
+      // 重新请求数据 刷新操作
+      refreshChart() {
+        this.echartStore.showLoading();
+        this.$emit('on-refresh-data', this.data.id);
+      },
+      initDialog(){
+        //此时初始化，才能获得screenShowArea对象，否则此对象为undefined，无法初始化图表
+        this.initChart(this.data, this.seriesItem, this.$refs.screenShowArea, 'screen',this.legend);
+        // 日期组件同步时间
+        /*
+        this.$refs.calendar.initTime({
+          start: this.stableFilter.start_time,
+          end: this.stableFilter.end_time,
+        });
+        */
+      },
+      changeDate(st){
+        this.oldSearchTime=st;
+        this.searchTime = st;
+        this.filter.start_time = st[0];
+        this.filter.end_time = st[1];
+      },
+      // 全屏查看
+      showAllScreen() {
+        // 初始化同步时间
+        this.filter.start_time = this.stableFilter.start_time;
+        this.filter.end_time = this.stableFilter.end_time;
+        this.searchTime = this.oldSearchTime;
+        this.screenModal = true;
+        this.isGreyScreen=[];
+        //this.dateChange();
+      },
+      dateChange(time) {
+        this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
+        this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
+        if (this.showSetting) {
+          this.getQueryChart('list');
         } else {
-          tmp.push(`${set[0]}=${set[1]}`);
+          this.getQueryChart('dashboard');
         }
-      } else {
-        const mid = data.split(','); // ['key=v1','key=v2',....]
-        mid.forEach((item) => {
-          const setInner = item.split('=');
-          if (setInner[1].indexOf('|') > -1) {
-            const valueArr = setInner[1].split('|');
-            valueArr.forEach((keyV) => {
-              tmp.push(`${setInner[0]}=${keyV}`);
+      },
+      // 查询数据,修改日期查询全屏数据
+      getQueryChart(type) {
+        if (this.echartModalStore) {
+          this.echartModalStore.showLoading();
+        }
+        let axiosArr = [];
+        this.$nextTick(() => {
+          let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
+          let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
+          if(!startTime || !endTime){//如果时间为空，则默认取最近1小时
+            let now = new Date();
+            startTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss');
+            endTime = bus.timeFormate(now.setHours(now.getHours()-1), 'yyyy-MM-dd hh:mm:ss');
+            this.searchTime[0] = startTime;
+            this.searchTime[1] = endTime;
+          }
+          let step = bus.getStep(startTime,endTime);
+          if (type === 'list') { // 普通模式,主控台使用
+            axiosArr = this.data.elements.map((ele) => {
+              const filterItem = ele;
+              return  this.$get('/prom/api/v1/query_range?query='+filterItem.expression+"&start="+startTime+"&end="+endTime+'&step='+step);
             });
+          } else if (type === 'dashboard') { // 概览模式,指标概览中使用
+            // 概览模式,需要区分单独一个和多个
+            if (this.stableFilter.chartCount === 'multiple') {
+              axiosArr = [this.$get('/prom/api/v1/query_range?query='+this.data.title+"&start="+startTime+"&end="+endTime+'&step='+step)];
+            } else {
+              axiosArr = [this.$get('/prom/api/v1/query_range?query='+this.data.elements[0].expression+"&start="+startTime+"&end="+endTime+'&step='+step)];
+            }
+          }
+          // 一个图表
+          axios.all(axiosArr).then((res) => {
+            if (res.length > 0) {
+              const series = [];
+              const legend = [];
+              const sumData = {
+                name: 'sum',
+                data: [],
+                visible: true,
+                threshold: null,
+              };
+              res.forEach((response) => {
+                if (response.status === 'success') {
+                  if (response.data.result) {
+                    // 循环处理每个elements下获取的数据列
+                    response.data.result.forEach((queryItem,innerPos) => {
+                      const seriesItem = {
+                        theData: {
+                          name: '',
+                          symbol:'none',  //去掉点
+                          smooth:true,  //曲线变平滑
+                          data: [],
+                          type:this.data.type,
+                          //visible: true,
+                          //threshold: null,
+                        },
+                        metric_name: '',
+                      };
+                      // 图表中每条线的名字,后半部分
+                      // let host = `${queryItem.metric.__name__}{`;//up,
+                      let host = '';//up,
+                      if(queryItem.metric.__name__){
+                        host = `${queryItem.metric.__name__}{`;//up,
+                      }
+                      const tagsArr = Object.keys(queryItem.metric);//["__name__","asset","idc","instance","job","module","project"]
+                      // 设置时间-数据格式对
+                      const dpsArr = Object.entries(queryItem.values);//[ ["0",[1577959830.781,"0"]], ["1",[1577959845.781,"0"]] ]
+                      // 判断是否有数据
+                      if (dpsArr.length > 0 && tagsArr.length > 0) {
+                        tagsArr.forEach((tag, i) => {
+                          if (tag !== '__name__') {
+                            host += `${tag}="${queryItem.metric[tag]}",`;
+                          }
+                        });
+                        if(host.endsWith(',')){host = host.substr(0,host.length-1);}
+                        host +="}";
+                        legend.push(host);
+                        // 图表中每条线的名字,去掉最后的逗号与空格:metric名称,  标签1=a,标签2=c
+                        seriesItem.theData.name = host;
+                        seriesItem.metric_name = seriesItem.theData.name;
+                        // 将秒改为毫秒
+                        //alert('table=='+JSON.stringify(queryItem))
+                        seriesItem.theData.data = queryItem.values.map((dpsItem, dpsIndex) => {
+                          /*曲线汇总暂不需要
+                          if (sumData.data[dpsIndex]) {
+                            const sumNum = sumData.data[dpsIndex][1] || 0;
+                            sumData.data[dpsIndex][1] = sumNum + dpsItem[1];
+                          } else {
+                            sumData.data[dpsIndex] = [dpsItem[0] * 1000, dpsItem[1]];
+                          }
+                          */
+                          return [dpsItem[0] * 1000, dpsItem[1]];
+                        });
+                        series.push(seriesItem.theData);
+
+                      } else if (this.data.elements && this.data.elements[innerPos]) {
+                        // 无数据提示
+                        /*
+                        const currentInfo = chartItem.elements[innerPos];
+                        const errorMsg = `图表 ${chartItem.title} 中 ${currentInfo.metric},${currentInfo.tags} 无数据`;
+                        this.$message.warning({
+                          duration: 15,
+                          content: errorMsg,
+                          closable: true,
+                        });
+                        */
+                      }
+                    });
+                  }
+                }
+              });
+              /*
+              if (series.length && this.data.type === 4) {
+                series.push(sumData);
+              }
+              */
+              this.initChart(this.data, series, this.$refs.screenShowArea, 'screen',legend);
+            }
+          }).catch((error) => {
+            if (error) {
+              this.$message.warning({
+                content: this.$t("tip.refreshLater"),//'Please refesh later',//请稍后刷新
+                duration: 3,
+              });
+            }
+          });
+        });
+      },
+      showLoad() {
+        if (this.echartStore) {
+          this.echartStore.showLoading();
+        }
+      },
+      // 获取格式
+      getNumStr(num) {
+        if (num >= 1000) {
+          const kbNum = num / 1000;
+          if (kbNum >= 1000) {
+            const mbNum = kbNum / 1000;
+            if (mbNum > 1000) {
+              const gbNum = mbNum / 1000;
+              /*
+              if (gbNum > 1000) {
+                const tbNum = gbNum / 1000;
+                if (tbNum > 1000) {
+                  const pbNum = tbNum / 1000;
+                  return `${pbNum.toFixed(2)}PB`;
+                }
+                return `${tbNum.toFixed(2)}TB`;
+              }*/
+              return `${gbNum.toFixed(2)}B`;
+            }
+            return `${mbNum.toFixed(2)}M`;
+          }
+          return `${kbNum.toFixed(2)}K`;
+        }
+        return num.toFixed(2);
+      },
+      handleClose(){},
+      /*
+      handleClose(done) {
+        /*
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+
+      },*/
+      /*
+        // 展示图表编辑区
+        showTool() {
+          this.toolbox = !this.toolbox;
+        },
+        // 修改图表类型
+        changeChart(type) {
+          this.chartType = type;
+          this.highchartStore.update({
+            chart: {
+              type: this.chartType,
+            },
+          });
+        },
+
+        dateChange(time) {
+          this.filter.start_time = `${time[0]}:00`;
+          this.filter.end_time = `${time[1]}:59`;
+          if (this.showSetting) {
+            this.getQueryChart('list');
           } else {
-            tmp.push(`${setInner[0]}=${setInner[1]}`);
+            this.getQueryChart('dashboard');
           }
-        });
-      }
-      return tmp;
-    },
-    // 获取交集,取得所需tags进行查询,k1=v1,k2=v2
-    getCompilation(arr1, arr2) {
-      const arr = [];
-      if (arr1.length && arr2.length) {
-        arr1.forEach((item) => {
-          if (arr2.indexOf(item) > -1) {
-            arr.push(item);
+        },
+        // 查询数据,修改日期查询全屏数据
+        getQueryChart(type) {
+          if (this.highchartModalStore) {
+            this.highchartModalStore.showLoading();
           }
-        });
-        return arr;
-      }
-      return [];
+          let axiosArr = [];
+          if (type === 'list') { // 普通模式,主控台使用
+            axiosArr = this.data.elements.map((ele) => {
+              const filterItem = ele;
+              return getQueryChart({
+                product_id: this.productId,
+                metric: filterItem.metric,
+                tags: filterItem.tags,
+                start: this.filter.start_time,
+                end: this.filter.end_time,
+              });
+            });
+          } else if (type === 'dashboard') { // 概览模式,指标概览中使用
+            // 概览模式,需要区分单独一个和多个
+            if (this.stableFilter.chartCount === 'multiple') {
+              // 所有tag标签
+              const tagAllArr = this.proTags(this.data.tags);
+              // 根据title格式化的标签
+              const titles = this.data.title.split(',');
+              const titleArr = titles.map(item => item.trim());
+              // 获取所需标签
+              const tagArr = this.getCompilation(tagAllArr, titleArr);
+              axiosArr = [getQueryChart({
+                product_id: this.productId,
+                metric: this.data.metric,
+                tags: tagArr.toString(),
+                start: this.filter.start_time,
+                end: this.filter.end_time,
+              })];
+            } else {
+              axiosArr = [getQueryChart({
+                product_id: this.productId,
+                metric: this.data.metric,
+                tags: this.data.tags,
+                start: this.filter.start_time,
+                end: this.filter.end_time,
+              })];
+            }
+          }
+          // 一个图表
+          axios.all(axiosArr).then((res) => {
+            if (res.length > 0) {
+              const series = [];
+              const sumData = {
+                name: 'sum',
+                data: [],
+                visible: true,
+                threshold: null,
+              };
+              res.forEach((response) => {
+                if (response.data.code === 200) {
+                  if (response.data.data) {
+                    // 循环处理每个elements下获取的数据列
+                    response.data.data.forEach((queryItem) => {
+                      const seriesItem = {
+                        theData: {
+                          name: '',
+                          data: [],
+                          visible: true,
+                          threshold: null,
+                        },
+                        metric_name: '',
+                      };
+                      // 图表中每条线的名字,后半部分
+                      let host = `${queryItem.metric}, `;
+                      const tagsArr = Object.keys(queryItem.tags);
+                      // 设置时间-数据格式对
+                      const dpsArr = Object.entries(queryItem.dps);
+                      if (tagsArr.length > 0 && dpsArr.length > 0) {
+                        tagsArr.forEach((tag, i) => {
+                          if (tag !== 'uuid') {
+                            host += i === 0 ? `${tag}=${queryItem.tags[tag]}` : `, ${tag}=${queryItem.tags[tag]}`;
+                          }
+                        });
+                        // 图表中每条线的名字,去掉最后的逗号与空格
+                        seriesItem.theData.name = host;
+                        seriesItem.metric_name = seriesItem.theData.name;
+                        // 将秒改为毫秒
+                        seriesItem.theData.data = dpsArr.map((dpsItem, dpsIndex) => {
+                          if (sumData.data[dpsIndex]) {
+                            const sumNum = sumData.data[dpsIndex][1] || 0;
+                            sumData.data[dpsIndex][1] = sumNum + dpsItem[1];
+                          } else {
+                            sumData.data[dpsIndex] = [dpsItem[0] * 1000, dpsItem[1]];
+                          }
+                          return [dpsItem[0] * 1000, dpsItem[1]];
+                        });
+                        series.push(seriesItem.theData);
+                      }
+                    });
+                  }
+                }
+              });
+              if (series.length && this.data.type === 4) {
+                series.push(sumData);
+              }
+              this.initChart(this.data, series, this.$refs.screenShowArea, 'screen');
+            }
+          }).catch((error) => {
+            if (error) {
+              this.$Message.warning({
+                content: '请稍后刷新',
+                duration: 3,
+              });
+            }
+          });
+        },
+
+
+        // 获取tag数组
+        proTags(data) {
+          const dou = data.indexOf(',');
+          const tmp = [];
+          if (dou === -1) {
+            const set = data.split('=');
+            if (set[1].indexOf('|') > -1) {
+              const valueArr = set[1].split('|');
+              valueArr.forEach((keyV) => {
+                tmp.push(`${set[0]}=${keyV}`);
+              });
+            } else {
+              tmp.push(`${set[0]}=${set[1]}`);
+            }
+          } else {
+            const mid = data.split(','); // ['key=v1','key=v2',....]
+            mid.forEach((item) => {
+              const setInner = item.split('=');
+              if (setInner[1].indexOf('|') > -1) {
+                const valueArr = setInner[1].split('|');
+                valueArr.forEach((keyV) => {
+                  tmp.push(`${setInner[0]}=${keyV}`);
+                });
+              } else {
+                tmp.push(`${setInner[0]}=${setInner[1]}`);
+              }
+            });
+          }
+          return tmp;
+        },
+        // 获取交集,取得所需tags进行查询,k1=v1,k2=v2
+        getCompilation(arr1, arr2) {
+          const arr = [];
+          if (arr1.length && arr2.length) {
+            arr1.forEach((item) => {
+              if (arr2.indexOf(item) > -1) {
+                arr.push(item);
+              }
+            });
+            return arr;
+          }
+          return [];
+        },
+        */
     },
-    */
-  },
-  mounted() {
-    this.firstLoad = false;
-    let Myecharts2 = echarts.init(document.getElementById('lineChartArea'));
-    console.log(Myecharts2);
-    
-            setTimeout(function () {
-                Myecharts2.resize()
-            }, 500)
-    
-  },
-  beforeDestroy() {},
-};
+    mounted() {
+      this.firstLoad = false;
+      let Myecharts2 = echarts.init(document.getElementById('lineChartArea'));
+      console.log(Myecharts2);
+
+      setTimeout(function () {
+        Myecharts2.resize()
+      }, 500)
+
+    },
+    beforeDestroy() {},
+  };
 
 </script>
diff --git a/nezha-fronted/src/components/page/dashboard/chartMetric.vue b/nezha-fronted/src/components/page/dashboard/chartMetric.vue
index 448265c65..df87f1f84 100644
--- a/nezha-fronted/src/components/page/dashboard/chartMetric.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartMetric.vue
@@ -275,6 +275,9 @@ export default {
       if (this.pointer === pointer) {
         this.$refs.elementInfo.validate((valid) => {
           if (valid) {//根据设置的rules进行验证，验证通过，则返回，继续进行保存（每个el-form-item都需要验证）
+            if(this.elementInfo.expression){
+              this.elementInfo.expression = this.elementInfo.expression.replace(/\s+|&nbsp;/ig,'');
+            }
             this.$emit('on-add-target-success', this.elementInfo, pointer);
           }
         });
diff --git a/nezha-fronted/src/components/page/dashboard/chartMetricForPreview.vue b/nezha-fronted/src/components/page/dashboard/chartMetricForPreview.vue
index eecacb6ef..f9ad52bda 100644
--- a/nezha-fronted/src/components/page/dashboard/chartMetricForPreview.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartMetricForPreview.vue
@@ -304,6 +304,9 @@ export default {
     saveTarget() {
       this.$refs.elementInfo.validate((valid) => {
         if (valid) {
+          if(this.elementInfo.expression){
+            this.elementInfo.expression = this.elementInfo.expression.replace(/\s+|&nbsp;/ig,'');
+          }
           this.$emit('on-add-target-success', this.elementInfo);
         }
       });
diff --git a/nezha-fronted/src/components/page/dashboard/metricPreview.scss b/nezha-fronted/src/components/page/dashboard/metricPreview.scss
index c6c993d6a..01ed7290c 100644
--- a/nezha-fronted/src/components/page/dashboard/metricPreview.scss
+++ b/nezha-fronted/src/components/page/dashboard/metricPreview.scss
@@ -23,8 +23,6 @@
   }
   .chart-preview-area {
     height: calc(100% - 180px);
-    overflow-y: auto;
-    overflow-x: hidden;
     position: relative
   }
   .common-detail-top-title {