diff --git a/nezha-fronted/src/components/charts/chart-group.vue b/nezha-fronted/src/components/charts/chart-group.vue
new file mode 100644
index 000000000..a87ac56ff
--- /dev/null
+++ b/nezha-fronted/src/components/charts/chart-group.vue
@@ -0,0 +1,300 @@
+<style lang="scss">
+  @import './chart.scss';
+</style>
+<template>
+  <div class="nz-chart-resize">
+    <div class="resize-shadow" ref="resizeShadow"></div>
+    <div class="resize-box resize-box-group" ref="resizeBox">
+      <div class="chart-url" :id="'chartUrlDiv'+chartIndex" @mouseenter="caretShow=true" @mouseleave="caretShow=false" >
+        <loading  :ref="'localLoading'+chartIndex"></loading>
+        <div class="clearfix chartTitle" :class="{'dragTitle':dragTitleShow}" :id="'chartTitle'+chartIndex">
+          <el-dropdown trigger="click" class="nz-chart-top" :key="'chartDropdown'+chartIndex"  v-clickoutside="clickos" :class="{'move-able':!isLock}">
+            <el-dropdown-menu style="display: none"></el-dropdown-menu>
+            <span class="el-dropdown-link chart-title" @click.stop="dropdownMenuShow=!dropdownMenuShow">
+              <span class="chart-title-text">{{chartData.title}}</span>
+              <span class="chart-title-icon"><i class="nz-icon nz-icon-xialaxuanze  "  :class="{'visible':caretShow,'hidden':!caretShow}"></i></span>
+            </span>
+            <ul slot="dropdown" v-show="dropdownMenuShow"  :id="'dropdownUl'+chartIndex"  class="el-dropdown-menu nz-chart-dropdown"  style="position: absolute; top: 30px; left: calc(50% - 79px); transform-origin: center top; z-index: 1000;" >
+              <li  @click="refreshChart" class="el-dropdown-menu__item">
+                <i class="global-active-color el-icon-refresh-right" style="font-size: 16px;"></i><span>{{$t('dashboard.refresh')}}</span></li>
+              <li  @click="editChart" class="el-dropdown-menu__item" v-has="`${from}_chart_toEdit`">
+                <i class="nz-icon nz-icon-edit" style="font-size: 14px; margin-right: 11px; margin-left: 1px;"></i>{{$t('dashboard.edit')}}</li>
+              <li  @click="removeChart" class="el-dropdown-menu__item" v-has="`${from}_chart_delete`">
+                <i class="nz-icon nz-icon-delete" style="font-size: 16px;"></i>{{$t('dashboard.delete')}}</li>
+              <li  @click="showAllScreen"  class="el-dropdown-menu__item">
+                <i class="el-icon-full-screen" style="font-size: 16px;"></i>{{$t('dashboard.screen')}}</li>
+              <li  @click="duplicate" class="el-dropdown-menu__item" v-has="`${from}_chart_duplicate`">
+                <i class="el-icon-copy-document" style="font-size: 16px;"></i>{{$t('dashboard.duplicate')}}</li>
+            </ul>
+          </el-dropdown>
+
+        </div>
+        <div :id="'chartUrl'+chartIndex" class="mt-10 url-container">
+          <chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter"  :class="{'show-top':false}" :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId"></chart-list-group>
+        </div>
+        <div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic">
+          <div  :id="'staticContainer'+chartIndex" class="center-content"></div>
+        </div>
+      </div>
+<!--      <span class="vue-resizable-handle" @mousedown="startResize" v-if="!isLock"></span>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import loading from '../common/loading'
+import chartListGroup from './chart-list-group'
+export default {
+  name: 'chartGroup',
+  components: {
+    loading: loading,
+    chartListGroup
+  },
+  props: {
+    chartData: {
+      type: Object
+    },
+    // 看板id
+    panelId: {
+      type: Number,
+      default: 0
+    },
+    editChartId: {
+      type: String,
+      default: 'editChartId'
+    },
+    chartIndex: {
+      type: Number,
+      default: 0
+    },
+    from: { type: String },
+    isLock: { type: Boolean, default: false },
+    filter: {},
+    panelLock: { type: Boolean, default: false },
+    dataList: {}
+  },
+  data () {
+    return {
+      data: {}, // 该图表信息,chartItem
+      unit: {},
+
+      images: '',
+      loading: Object,
+      panelIdInner: '', // 看板id=panelId,原写作chart,由set_data获取
+      firstLoad: false, // 是否第一次加载
+      screenModal: false,
+      firstShow: false, // 默认不显示操作按钮,
+      caretShow: false,
+      dragTitleShow: false,
+      dropdownMenuShow: false,
+      minHeight: 200,
+      chartSpaceHeight: 5, // top-border: 1,bottom-border: 1,padding-bottome:3
+      titleHeight: 38, // title-height:28,magrin-bottom:10
+      paddingBottom: 6,
+      divFirstShow: false,
+      showStatic: false
+    }
+  },
+  methods: {
+    startResize (e) {
+      const vm = this
+      this.$chartResizeTool.start(vm, this.chartData, e)
+    },
+    resize (chartItem) {
+      const chartBox = document.getElementById('chartUrlDiv' + this.chartIndex)
+      chartBox.querySelector('.url-container').style.height = `calc(100% - ${this.$chartResizeTool.titleHeight}px)`
+    },
+    showLoad (chartItem) {
+      this.data = chartItem
+      this.panelIdInner = this.panelId
+      // 设置高度
+      this.$nextTick(() => {
+        this.resize(chartItem)
+      })
+      this.startLoading()
+
+      if (/\{\{.*?\}\}/g.test(this.data.param.url)) {
+        this.showStatic = true
+        this.setStaticContent()
+      } else {
+        this.showStatic = false
+        this.setLoadFrame()
+      }
+      this.divFirstShow = true
+    },
+    setStaticContent: function () {
+      const that = this
+      this.$nextTick(() => {
+        const staticDiv = document.querySelector('#staticContainer' + this.chartIndex)
+        staticDiv.innerHTML = `<div class="content-static-url">${that.data.param.url}</div><div class="content-static-tip">${that.$t('dashboard.panel.chartForm.typeVal.url.staticTip')}</div>`
+        that.firstShow = true
+        that.endLoading()
+      })
+    },
+    setLoadFrame () {
+      const that = this
+      this.$nextTick(() => {
+        const iframe = document.querySelector('#urlContainer' + this.chartIndex)
+        // 处理兼容行问题
+        if (iframe.attachEvent) {
+          iframe.attachEvent('onload', function () {
+            // iframe加载完毕以后执行操作
+            that.firstShow = true
+            // console.log('iframe已加载完毕');
+            that.endLoading()
+          })
+        } else {
+          iframe.onload = function () {
+            // iframe加载完毕以后执行操作
+            that.firstShow = true
+            // console.log('iframe已加载完毕');
+            that.endLoading()
+          }
+        }
+        iframe.src = that.data.param.url
+      })
+    },
+    initDialog () {
+      this.startLoading('screen')
+      if (/\{\{.*?\}\}/g.test(this.data.param.url)) {
+        this.showStatic = true
+        this.setStaticContentFull()
+      } else {
+        this.showStatic = false
+        this.setLoadFrameFull()
+      }
+    },
+    startLoading (area) {
+      if (area === 'screen') {
+        this.$refs['localLoadingScreen' + this.chartIndex].startLoading()
+      } else {
+        this.$refs['localLoading' + this.chartIndex].startLoading()
+      }
+    },
+    endLoading (area) {
+      if (area === 'screen') {
+        this.$refs['localLoadingScreen' + this.chartIndex].endLoading()
+      } else {
+        this.$refs['localLoading' + this.chartIndex].endLoading()
+      }
+    },
+    clearChart () {
+      this.data = {}
+    },
+    screenRefreshChart () {
+      ('urlContainerFull' + this.chartIndex).window.location.reload()
+    },
+    // 重新请求数据 刷新操作-local
+    refreshChart () {
+      this.dropdownMenuShow = false
+      // this.startLoading()
+      this.firstShow = false
+      this.$refs.listGroup.refresh()
+    },
+    // 编辑图表
+    editChart () {
+      this.dropdownMenuShow = false
+      this.$emit('on-edit-chart-block', this.data.id)
+    },
+    // 删除该图表
+    removeChart () {
+      this.dropdownMenuShow = false
+      this.$emit('on-remove-chart-block', this.data.id)
+    },
+    clickos () {
+      this.dropdownMenuShow = false
+    },
+    // 全屏查看
+    showAllScreen () {
+      this.dropdownMenuShow = false
+      this.screenModal = true
+    },
+    duplicate () {
+      this.dropdownMenuShow = false
+      this.$confirm(this.$t('tip.confirmDuplicate'), {
+        confirmButtonText: this.$t('tip.yes'),
+        cancelButtonText: this.$t('tip.no'),
+        type: 'info'
+      }).then(() => {
+        const param = { id: this.data.id }
+        this.$post('panel/' + this.data.panelId + '/charts/duplicate', (param)).then(response => {
+          if (response.code === 200) {
+            this.$message({
+              duration: 2000,
+              type: 'success',
+              message: this.$t('tip.duplicateSuccess')
+            })
+            this.$emit('on-duplicate-chart-block', this.data.id, response.data)
+          } else {
+            if (response.msg) {
+              this.$message.error(response.msg)
+            } else if (response.error) {
+              this.$message.error(response.error)
+            } else {
+              this.$message.error(response)
+            }
+          }
+        })
+      })
+    },
+    setLoadFrameFull () {
+      const that = this
+      this.$nextTick(() => {
+        const iframe = document.querySelector('#urlContainerFull' + this.chartIndex)
+
+        // 处理兼容行问题
+        if (iframe.attachEvent) {
+          iframe.attachEvent('onload', function () {
+            // iframe加载完毕以后执行操作
+            that.firstShow = true
+            // console.log('iframe已加载完毕');
+            that.endLoading('screen')
+          })
+        } else {
+          iframe.onload = function () {
+            // iframe加载完毕以后执行操作
+            that.firstShow = true
+            // console.log('iframe已加载完毕');
+            that.endLoading('screen')
+          }
+        }
+
+        iframe.src = this.data.param.url
+      })
+    },
+    setStaticContentFull: function () {
+      const that = this
+      this.$nextTick(() => {
+        const staticDiv = document.querySelector('#staticContainerFull' + this.chartIndex)
+        staticDiv.innerHTML = `<div class="content-static-url">${that.data.param.url}</div><div class="content-static-tip">${that.$t('dashboard.panel.chartForm.typeVal.url.staticTip')}</div>`
+        that.firstShow = true
+        that.endLoading('screen')
+      })
+    }
+  },
+  watch: {
+    dropdownMenuShow (n) {
+      this.$emit('dropmenu-change', n)
+    }
+  },
+  mounted () {
+    this.firstLoad = false
+  },
+  beforeDestroy () {
+    this.clearChart()
+  }
+}
+</script>
+<style>
+  .center-content .content-static-url{
+    font-weight: bold;
+    font-size: 24px;
+  }
+  .center-content .content-static-tip{
+    font-size: 18px;
+    color: lightgrey;
+  }
+  .resize-box-group{
+    position: unset !important;
+  }
+</style>
diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue
new file mode 100644
index 000000000..2e2a4bc1c
--- /dev/null
+++ b/nezha-fronted/src/components/charts/chart-list-group.vue
@@ -0,0 +1,1730 @@
+<style scoped>
+  .chartBox {
+    float:left;
+    padding: 0px 2px 2px 0;
+    position:relative;
+    box-sizing: border-box;
+  }
+  .noData{
+    text-align: center
+  }
+  .list-width{
+    width: calc(100% - 2px);
+    padding: 5px 5px 5px 0px;
+    box-sizing: border-box;
+    overflow: hidden;/*避免鼠标第一次放到曲线时，x轴出现滚动条后消失*/
+  }
+</style>
+<style lang="scss">
+  .vue-resizable-handle {
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    bottom: 0;
+    right: 0;
+    cursor: se-resize;
+    box-sizing: border-box;
+    user-select: none;
+    z-index: 99;
+  }
+  .vue-resizable-handle:after {
+    border-right: 2px solid #acb6bf;
+    border-bottom: 2px solid #acb6bf;
+    content: "";
+    position: absolute;
+    right: 3px;
+    bottom: 3px;
+    width: 5px;
+    height: 5px;
+    box-sizing: inherit;
+  }
+
+  .temp-dom {
+    visibility: hidden;
+    font-size: 14px;
+    position: fixed;
+  }
+</style>
+<template>
+  <div class="list-width"  id="listContainer" ref="listContainer"><!--v-drag-->
+
+    <span class="temp-dom"></span>
+
+    <draggable v-model="dataList" :disabled="panelLock" :move="move" @end="end" @start="start"
+               :scroll-sensitivity="150"
+               :options="{
+                 group:{name:'chartGroup',pull:'false'},
+                 dragClass:'drag-chart-class',
+                 fallbackClass:'fallback-class',
+                 forceFallback:true,
+                 ghostClass:'chart-group-ghost',
+                 chosenClass:'choose-class',
+                 scroll:true,
+                 filter: '.drag-disabled',
+                 scrollFn:function(offsetX,offsetY,originalEvent,touchEvt,hoverTargetEI){},
+                 animation: 150,
+                 handle: '.chart-title'
+               }"
+    style="width: 100%;height: 100%">
+      <div :class="{'drag-disabled': !draggable,'chartBox':true}" :id="'chart-group-' + item.id" :key="item.id" :name="item.title" :ref="'chart' + item.id" :style="{marginBottom: extraMarginBottom}" v-for="(item, index) in dataList" v-show="!item.isHide">
+        <line-chart-block v-if="item.type === 'line' || item.type === 'bar' ||item.type == 'stackArea' || item.type === 4" :key="'inner' + item.id"
+                          :from="from" :ref="'editChart'+item.id" :temp-dom="tempDom"
+                          @on-refresh-data="refreshChart"
+                          @on-remove-chart-block="removeChart"
+                          @on-duplicate-chart-block="duplicateChart"
+                          @on-drag-chart="editChartForDrag"
+                          @on-edit-chart-block="editData"
+                          :panel-id="filter.panelId"
+                          :is-lock="panelLock"
+                          :chart-index="item.chartIndex"
+                          @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                          :chart-data="item"
+        ></line-chart-block>
+
+        <chart-single-stat  :from="from" :key="'inner' + item.id" :ref="'editChart'+item.id" v-if="item.type === 'singleStat'"
+                     @on-refresh-data="refreshChart"
+                     @on-search-data="searchData"
+                     @on-remove-chart-block="removeChart"
+                     @on-duplicate-chart-block="duplicateChart"
+                     @on-drag-chart="editChartForDrag"
+                     @on-edit-chart-block="editData"
+                     :chart-data="item"
+                     :is-lock="panelLock"
+                     :panel-id="filter.panelId"
+                     @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                     :chart-index="item.chartIndex"></chart-single-stat>
+
+        <chart-table  :from="from" :key="'inner' + item.id" :ref="'editChart'+item.id" v-if="item.type === 'table'"
+                      @on-refresh-data="refreshChart"
+                      @on-search-data="searchData"
+                      @on-remove-chart-block="removeChart"
+                      @on-duplicate-chart-block="duplicateChart"
+                      @on-drag-chart="editChartForDrag"
+                      @on-edit-chart-block="editData"
+                      :is-lock="panelLock"
+                      :panel-id="filter.panelId"
+                      :chart-data="item"
+                      @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                      :chart-index="item.chartIndex"></chart-table>
+
+        <chart-url  :from="from" :key="'inner' + item.id" :ref="'editChart'+item.id" v-if="item.type === 'url'"
+                     @on-refresh-data="refreshChart"
+                     @on-search-data="searchData"
+                     @on-remove-chart-block="removeChart"
+                     @on-duplicate-chart-block="duplicateChart"
+                     @on-drag-chart="editChartForDrag"
+                    :is-lock="panelLock"
+                     @on-edit-chart-block="editData"
+                     :panel-id="filter.panelId"
+                     :chart-data="item"
+                      @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                     :chart-index="item.chartIndex"></chart-url>
+
+        <chart-detail  v-if="item.type === 'assetInfo' || item.type == 'projectInfo' || item.type == 'endpointInfo' || item.type == 'alertRuleInfo'" :ref="'editChart'+item.id" :key="'inner' + item.id"
+                          :from="from" :panel-id="filter.panelId"
+                          :chart-index="item.chartIndex"
+                          @on-refresh-data="refreshChart"
+                          :is-lock="panelLock"
+                          :chart-data="item"
+                          @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                          :editChartId="'editChartId' + item.id"
+        ></chart-detail>
+
+        <text-chart :from="from" :key="'inner' + item.id" :ref="'editChart'+item.id" v-if="item.type === 'text'"
+                    @on-refresh-data="refreshChart"
+                    @on-remove-chart-block="removeChart"
+                    @on-duplicate-chart-block="duplicateChart"
+                    @on-drag-chart="editChartForDrag"
+                    @on-edit-chart-block="editData"
+                    @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                    :is-lock="panelLock"
+                    :panel-id="filter.panelId"
+                    :chart-data="item"
+                    :chart-index="item.chartIndex"
+        ></text-chart>
+
+        <chart-alert-list  :from="from" :ref="'editChart'+item.id"
+                           :panel-id="filter.panelId"
+                          :chart-index="item.chartIndex"
+                          v-if="item.type  === 'alertList'"
+                          :editChartId="'editChartId' + item.id"
+                           :is-lock="panelLock"
+                          :chart-info="item"
+                          @on-refresh-data="refreshChart"
+                          @on-search-data="searchData"
+                          @on-remove-chart-block="removeChart"
+                          @on-duplicate-chart-block="duplicateChart"
+                          @on-drag-chart="editChartForDrag"
+                          @on-edit-chart-block="editData"
+                          @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+        ></chart-alert-list>
+
+        <chart-pie  :from="from" :key="'inner' + item.id" :ref="'editChart'+item.id" v-if="item.type === 'pie'" :temp-dom="tempDom"
+                            @on-refresh-data="refreshChart"
+                            @on-search-data="searchData"
+                            @on-remove-chart-block="removeChart"
+                            @on-duplicate-chart-block="duplicateChart"
+                            @on-drag-chart="editChartForDrag"
+                            @on-edit-chart-block="editData"
+                            :chart-data="item"
+                            :is-lock="panelLock"
+                            :panel-id="filter.panelId"
+                            @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                            :chart-index="item.chartIndex"></chart-pie>
+      </div>
+   </draggable>
+    <el-row v-if="dataList.length === 0"  class="noData"></el-row>
+    <!--<div class="page-shadow" v-if="showShadow"></div>-->
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import bus from '../../libs/bus'
+import lineChartBlock from './line-chart-block'
+import chartTable from './chart-table'
+import chartUrl from './chart-url'
+import chartSingleStat from './chart-single-stat'
+import chartDetail from './chart-detail'
+import draggable from 'vuedraggable'
+import chartDataFormat from './chartDataFormat'
+import chartAlertList from './chart-alert-list'
+import textChart from './text-chart'
+import chartPie from './chart-pie'
+// import visNetwork from './visNetwork'
+export default {
+  name: 'chartList',
+  props: {
+    isModel: { type: Boolean, default: false },
+    additionalInfo: {},
+    draggable: { type: Boolean, default: true },
+    detail: Object,
+    from: { type: String },
+    panelLock: { type: Boolean, default: false },
+    hasGroup: { type: Boolean, default: true },
+    groupList: {},
+    filterParent: {},
+  },
+
+  components: {
+    chartAlertList,
+    chartDetail,
+    lineChartBlock,
+    chartTable,
+    chartUrl,
+    chartSingleStat,
+    draggable,
+    textChart,
+    chartPie
+    // visNetwork,
+  },
+  watch: {
+    groupList: {
+      handler (n) {
+        this.dataList = [...n]
+        console.log(this.dataList)
+        this.$nextTick(()=>{
+          this.dataList.forEach((item, index) => {
+            if (item.type === 'text') {
+              console.log(item)
+            }
+            this.getChartData(item, index, this.filter)
+            this.setChartSize(item, index)
+          })
+        })
+      }
+    },
+    filterParent: {
+      immediate: true,
+      handler (n) {
+        console.log(n)
+        this.filter = { ...n }
+        this.pagePanelId = this.filter.panelId
+      }
+    }
+  },
+  data () {
+    return {
+      filter: {},
+      dataList: [], // 看板中所有图表信息
+      dataListDragTmp: [],
+      time: {
+        start: '',
+        end: ''
+      },
+      extraMarginBottom: 0, // dom额外的margin
+      panelId: '',
+      timer: null,
+      dataTotalList: [], // 懒加载：总记录数
+      dataTotalListBak: [], // 用于查询：懒加载，总记录备份
+      isPage: false, // 是否分页懒加载
+      currentRecordNum: 0, // 懒加载：本次取记录的index，第一次从0开始取，每次取3行
+      lineNum: 3, // 每页加载的行数
+      pagePanelId: '', // 当前分页的panelId
+      dragging: null,
+      // chartDataCacheGroup:new Map,//图表数据缓存，用于查询：id:{}
+      stepHeight: 50,
+
+      tempDom: { height: '', width: '' }
+      // showShadow:false,
+    }
+  },
+  methods: {
+    dropmenuChange (id, show) {
+      if (show) {
+        const chart = this.$refs['chart' + id][0]
+        const container = this.$refs.listContainer
+        const heightDifference = container.offsetHeight - chart.offsetTop
+        if (heightDifference < 235) {
+          this.extraMarginBottom = 235 - heightDifference
+          this.$nextTick(() => {
+            container.scrollTop = container.offsetHeight
+          })
+        }
+      } else {
+        this.extraMarginBottom = 0
+      }
+    },
+    tempDomInit () {
+      const span = document.querySelector('.temp-dom')
+      this.tempDom.width = span.offsetWidth
+    },
+    start (event) {
+      // console.log('start', event, this.dataList);
+      event.item.querySelector('.chartTitle').style.background = '#d8dce1'
+      const projectAndAssetFeatureInfos = event.item.querySelectorAll('.feature-content')
+      if (projectAndAssetFeatureInfos && projectAndAssetFeatureInfos.length > 0) {
+        projectAndAssetFeatureInfos.forEach(item => {
+          item.classList.remove('unfold')
+          item.classList.remove('fold')
+        })
+      }
+      this.dataListDragTmp = [...this.dataList]
+    },
+    end (event) {
+      if (event.oldIndex !== event.newIndex) {
+        const newWeights = []
+        this.dataList.forEach((item, index) => {
+          item.weight = index
+          newWeights.push({ id: item.id, weight: index })
+        })
+        this.$put('panel/' + this.pagePanelId + '/charts/weights', newWeights)
+        // 处理所有group数据后 调用上层移动 保存
+      }
+    },
+    move (event, orgin) {
+      const dragClass = document.querySelector('.drag-chart-class')// drag-chart-class:yellow chart-ghost:green  fallback-class choose-class:purple
+
+      const chartTitle = dragClass.querySelector('.chartTitle')
+      chartTitle.style.background = '#d8dce1'
+    },
+    clone (event) {
+      // console.log('clone',event );
+      const canvas = event.item.querySelector('canvas')
+      // console.log('clone-canvas',canvas);
+      const canvasclone = event.clone.querySelector('canvas')
+      canvasclone.style.border = 'solid 1px yellow'
+      // console.log('clone-canvasclone',canvasclone);
+      if (canvas && canvasclone) {
+        const image = new Image()
+        image.src = canvas.toDataURL()
+        // console.log('clone-image',image);
+        const ctxClone = canvasclone.getContext('2d')
+        // ctxClone.drawImage(image,0,0);
+        image.onload = function () {
+          ctxClone.drawImage(image, 0, 0)
+        }
+      }
+    },
+    dragPosition (e) {
+      const odiv = e// 目标元素e.target
+      // var targetDiv= document.getElementById('lineChartDiv'+this.chartIndex); //
+      // 得到点击时该容器的：
+      /* const startY = e.clientY
+      const startX = e.clientX
+      const _this = this */
+      // 鼠标相对元素的位置
+      const distY = e.clientY - odiv.offsetLeft
+      const distX = e.clientX - odiv.offsetTop
+      document.onmousemove = function (e) {
+        e.preventDefault()
+        const left = e.clientX - distX
+        const top = e.clientY - distY
+        odiv.style.top = top + 'px'
+        odiv.style.left = left + 'px'
+      }
+
+      document.onmouseup = function () {
+        document.onmousemove = null
+        document.onmouseup = null
+      }
+    },
+    handleDragStart (e, item) {
+      this.dragging = item
+    },
+    handleDragEnd (e, item) {
+      this.dragging = null
+    },
+    // 首先把div变成可以放置的元素，即重写dragenter/dragover
+    handleDragOver (e) {
+      e.dataTransfer.dropEffect = 'move'// e.dataTransfer.dropEffect="move";//在dragenter中针对放置目标来设置!
+    },
+    handleDragEnter (e, item) {
+      e.dataTransfer.effectAllowed = 'move'// 为需要移动的元素设置dragstart事件
+      if (item === this.dragging) {
+        return
+      }
+      const newItems = [...this.dataList]
+      const src = newItems.indexOf(this.dragging)
+      const dst = newItems.indexOf(item)
+
+      newItems.splice(dst, 0, ...newItems.splice(src, 1))
+
+      this.dataList = newItems
+    },
+    initCurrentRecordNum () {
+      this.currentRecordNum = 0
+    },
+    cleanData () {
+      this.dataList = []
+      this.chartDataCacheGroup.clear()
+    },
+    initData (filter) {
+      this.cleanData()
+      // 内含 panelId,开始时间,结束时间
+      this.filter = filter
+      this.pagePanelId = this.filter.panelId
+      this.getData(this.filter)
+    },
+    searchCharts (searchName) {
+      // this.dataList = [];
+      // this.dataTotalList = [];
+      const chartListTmp = []
+      if (searchName && searchName.trim() !== '') {
+        this.dataTotalListBak.forEach((item) => {
+          if (item.title.indexOf(searchName) > -1) {
+            item.isLoaded = false
+            item.isHide = false
+            chartListTmp.push(item)
+          } else {
+            item.isLoaded = true
+            item.isHide = true
+            chartListTmp.push(item)
+          }
+        })
+      } else {
+        this.dataTotalListBak.forEach((item) => {
+          item.isLoaded = false
+          item.isHide = false
+          chartListTmp.push(item)
+        })
+      }
+
+      this.dataTotalList = [...chartListTmp]
+      this.dataList = [...this.dataTotalList]
+
+      this.$nextTick(() => {
+        if (this.dataList.length > 0) {
+          this.dataList.forEach((item, index) => {
+            this.$refs['editChart' + item.id][0].showLoad(item)// 之后要实现
+            this.setChartSize(item.span, index)// 设置该图表宽度
+            if (!item.isLoaded) {
+              // 获得当前显示在浏览器的图表，从后台获取数据
+              const chartBox = document.getElementById('chart-group-' + item.id)// this.$refs['editChart'+item.id][0];
+              this.handleElementInViewport(chartBox, 0, item, index, true)
+            }
+          })
+        }
+      })
+    },
+    pageDataList (isAdd, panelId, isSearch) {
+      if (panelId !== this.pagePanelId) {
+        this.currentRecordNum = 0
+      }
+      if (this.dataTotalList && this.dataTotalList.length > 0) {
+        if (this.currentRecordNum >= this.dataTotalList.length) {
+          // alert('数据加载完毕！');
+        } else {
+          const dataTmpList = []
+          let spanSum = 0
+          let line = 0// 行数
+          let isDataFull = false
+          const curRecNum = this.currentRecordNum
+          const len = this.dataTotalList.length
+          for (let i = curRecNum; !isDataFull && i < len; i++) {
+            if (line < this.lineNum) {
+              const item = this.dataTotalList[i]
+              const span = item.span
+              const sumTmp = spanSum + span
+              if (sumTmp <= 12) {
+                spanSum = sumTmp
+              } else { // 大于12表示够1行了，
+                line = line + 1
+                spanSum = span
+              }
+              if (line < this.lineNum) {
+                dataTmpList.push(item)
+                this.currentRecordNum = i + 1
+              } else {
+                this.currentRecordNum = i
+                break
+              }
+            } else { // 数据加载够了
+              isDataFull = true
+              this.currentRecordNum = i
+              break
+            }
+          }
+          if (isAdd) {
+            const oldDataListLen = this.dataList.length
+            const dataListTmp = [...this.dataList]
+            this.dataList = [...dataListTmp.concat(dataTmpList)]
+            this.$nextTick(() => {
+              this.dataSetFirst(dataTmpList, oldDataListLen, isSearch)
+            })
+          } else {
+            this.dataList = [...dataTmpList]
+          }
+        }
+      }
+    },
+
+    // 获取panel详情数据,获取panel下所有chart列表
+    getData (params) {
+      const param = {
+        panelId: params.panelId,
+        query: params.query,
+        from: params.from
+      }
+      // alert-rule单独处理
+      if (param.from == this.$CONSTANTS.fromRoute.rule) {
+        this.dataList = []
+        this.dataList.push({
+          id: -10,
+          panelId: 0,
+          title: this.$t('alert.config.chart.affectEntity'),
+          span: 4,
+          height: 350,
+          type: 'alertRuleInfo',
+          prev: 0,
+          next: -9,
+          buildIn: 1,
+          draggable: false,
+          resizable: false,
+          editable: false
+        })
+        this.dataList.push({
+          id: -9,
+          panelId: 0,
+          title: this.$t('alert.config.chart.alertNumTrend'),
+          span: 8,
+          height: 350,
+          type: 'line',
+          prev: -10,
+          next: -1,
+          unit: 1,
+          buildIn: 1,
+          elements: [{
+            id: '',
+            expression: `nz_alert_nums{id="${this.detail.id}"}`,
+            type: ''
+          }]
+        })
+        this.$set(this.filter, 'start_time', bus.timeFormate(new Date().getTime() - 24 * 60 * 60 * 1000, 'yyyy-MM-dd hh:mm:ss'))
+        this.$set(this.filter, 'end_time', bus.timeFormate(new Date().getTime(), 'yyyy-MM-dd hh:mm:ss'))
+        this.$nextTick(() => {
+          this.dataList.forEach((item, index) => {
+            this.$set(item, 'from', params.from)
+            this.setChartSize(item, index)// 设置该图表宽度
+            const chartBox = document.getElementById('chart-group-' + item.id)
+            this.handleElementInViewport(chartBox, 0, item, index)
+          })
+        })
+        return
+      }
+      // endpoint单独处理
+      if (param.from == this.$CONSTANTS.fromRoute.endpoint) {
+        this.dataList = []
+        // this.dataList.push({
+        //   id: -8,
+        //   panelId: 0,
+        //   title: this.$t("alert.alertList"),
+        //   span: 8,
+        //   height: 700,
+        //   type: "alertList",
+        //   prev: -9,
+        //   next: -1,
+        //   buildIn: 1,
+        //   draggable: false,
+        //   resizable: false,
+        //   editable: false,
+        // });
+        this.dataList.push({
+          id: -10,
+          panelId: 0,
+          dataId: this.additionalInfo.id,
+          title: this.$t('project.chart.endpointInfo'),
+          span: 6,
+          height: 350,
+          type: 'endpointInfo',
+          prev: 0,
+          next: -9,
+          buildIn: 1,
+          elements: [{
+            expression: `up{endpoint="${this.additionalInfo.id}"}`
+          }],
+          draggable: false,
+          resizable: false,
+          editable: false
+        })
+        this.dataList.push({
+          id: -9,
+          panelId: 0,
+          title: this.$t('asset.assetInfo'),
+          span: 6,
+          height: 350,
+          type: 'assetInfo',
+          prev: -10,
+          next: -8,
+          buildIn: 1,
+          draggable: false,
+          resizable: false,
+          editable: false
+        })
+        this.$nextTick(() => {
+          this.dataList.forEach((item, index) => {
+            this.$set(item, 'from', params.from)
+            this.setChartSize(item, index)// 设置该图表宽度
+            const chartBox = document.getElementById('chart-group-' + item.id)
+            this.handleElementInViewport(chartBox, 0, item, index)
+          })
+        })
+        return
+      }
+      if (!param.query) delete param.query
+      // 根据panelId获得panel下的所有图表
+      this.$get('panel/' + params.panelId + '/charts').then(response => {
+        if (response.code === 200) {
+          response.data.list.forEach((item, index) => {
+            item.isLoaded = false
+          })
+
+          if (response.data.list) {
+            this.dataTotalListBak = response.data.list
+          } else {
+            this.dataTotalListBak = response.data
+          }
+
+          let chartListTmp = []
+          // 查询条件带name
+          if (this.filter.searchName && this.filter.searchName != '') {
+            const searchTitleStr = this.filter.searchName
+            this.dataTotalListBak.forEach((item) => {
+              if (item.title.indexOf(searchTitleStr) > -1) {
+                chartListTmp.push(item)
+              }
+            })
+          } else {
+            chartListTmp = this.dataTotalListBak
+          }
+          this.dataTotalList = [...chartListTmp]
+
+          this.dataList = [...this.dataTotalList]
+          console.log(this.dataList)
+          this.dataList.push({
+            ...this.dataList[0],
+            group: {
+              id: 1,
+              name: 'chart group'
+            },
+            type: 'group',
+            span: 12,
+            height: -1,
+            children: [...this.dataList]
+          })
+          // this.showShadow=false;
+          this.$nextTick(() => {
+            if (this.dataList.length > 0) {
+              this.dataList.forEach((item, index) => {
+                this.setChartSize(item, index)// 设置该图表宽度
+                this.$set(item, 'from', params.from)
+                if (param.from == this.$CONSTANTS.fromRoute.asset) {
+                  if (item.type == 'assetInfo') {
+                    this.$set(item, 'draggable', true)
+                    this.$set(item, 'resizable', true)
+                  }
+                } else if (param.from == this.$CONSTANTS.fromRoute.project) {
+                  if (item.type == 'projectInfo') {
+                    this.$set(item, 'draggable', true)
+                    this.$set(item, 'resizable', true)
+                  }
+                } else if (!param.from) {
+                  this.$set(item, 'draggable', true)
+                  this.$set(item, 'resizable', true)
+                  this.$set(item, 'editable', true)
+                }
+                if (!item.isLoaded) {
+                  // 获得当前显示在浏览器的图表，从后台获取数据
+                  const chartBox = document.getElementById('chart-group-' + item.id)
+                  this.handleElementInViewport(chartBox, 0, item, index)
+                }
+              })
+            }
+          })
+        }
+      })
+    },
+    loadChartData (scrollTop) {
+      if (this.dataList.length > 0) {
+        this.dataList.forEach((item, index) => {
+          if (!item.isLoaded) {
+            // 获得当前显示在浏览器的图表，从后台获取数据
+            const chartBox = document.getElementById('chart-group-' + item.id)// this.$refs['editChart'+item.id][0];
+            this.handleElementInViewport(chartBox, scrollTop, item, index)
+          }
+        })
+      }
+    },
+    // arr: 该panel下图表list,生成该看板下所有图表
+    dataSetFirst (arr, oldDataListLen, isSearch) {
+      if (arr.length) {
+        arr.forEach((item, index) => {
+          let realIndex = index
+          if (oldDataListLen) {
+            realIndex += oldDataListLen
+          }
+          const chartType = item.type
+          if (chartType !== 'url') {
+            if (isSearch) {
+              this.getChartDataForSearch(item, realIndex)
+            } else {
+              this.getChartData(item, realIndex)
+            }
+          } else {
+            if (!isSearch && this.$refs['editChart' + item.id] && this.$refs['editChart' + item.id][0]) {
+              this.$refs['editChart' + item.id][0].showLoad(item)
+            }
+            this.setChartSize(item, realIndex) // 设置该图表宽度
+          }
+        })
+      }
+    },
+    getChartDataForSearch (chartItem, realIndex) {
+      let chartData = this.chartDataCacheGroup.get(chartItem.id)
+      if (chartData) {
+        const filterType = chartData.filterType
+        const errorMsg = chartData.errorMsg
+        const tableData = chartData.tableData
+        const panelId = chartData.panelId
+        const filter = chartData.filter
+        const legend = chartData.legend
+        const series = chartData.series
+        const singleStatRlt = chartData.singleStatRlt
+        if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
+          if (chartItem.type === 'table') { // 表格
+            if (filterType === 'showFullScreen') { // 全屏查询
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, tableData,
+                panelId, filter, filterType, errorMsg)
+            } else {
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, tableData,
+                panelId, filter, '', errorMsg)
+            }
+          } else if (chartItem.type === 'line' || chartItem.type === 'bar' || chartItem.type === 'stackArea' || chartItem.type === 4 || chartItem.type === 'pie') {
+            if (filterType === 'showFullScreen') { // 全屏查询
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, series,
+                panelId, filter, legend, filterType, errorMsg)
+            } else {
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, series,
+                panelId, filter, legend, '', errorMsg)
+            }
+          } else if (chartItem.type === 'singleStat') {
+            if (filterType === 'showFullScreen') { // 全屏查询
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, singleStatRlt,
+                this.filter.panelId, this.filter, filterType, errorMsg)
+            } else {
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, singleStatRlt,
+                this.filter.panelId, this.filter, '', errorMsg)
+            }
+          } else if (chartItem.type == 'text') {
+            if (filterType === 'showFullScreen') { // 全屏查询
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, null,
+                panelId, filter, null, filterType)
+            } else {
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, null,
+                panelId, filter, null, '')
+            }
+          }
+        }
+      } else {
+        this.getChartData(chartItem, realIndex)
+      }
+      chartData = null
+    },
+    // 获取一个图表具体数据,图表信息，图表位置index
+    getChartData (chartInfo, pos, filterType) {
+      const chartItem = chartInfo
+      if (chartItem.type === 'assetInfo') {
+        if (chartItem.from != this.$CONSTANTS.fromRoute.endpoint) {
+          this.$set(chartItem, 'draggable', true)
+          this.$set(chartItem, 'resizable', true)
+        }
+        this.getAssetInfoChartData(chartItem)
+        return
+      }
+      if (chartItem.type === 'endpointInfo') {
+        this.getEndpointInfoChartData(chartItem)
+        return
+      }
+      if (chartItem.type == 'projectInfo') {
+        chartItem.title = this.$t('project.chart.projectInfo')
+        this.getProjectInfoChartData(chartItem)
+        return
+      }
+      if (chartItem.type === 'alertList') {
+        this.getAlertListChartData(chartItem, filterType)
+        return
+      }
+      if (chartItem.type === 'alertRuleInfo') {
+        this.getAlertRuleChartData(chartItem)
+        return
+      }
+
+      if (chartItem.type == 'text') {
+        if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
+          if (filterType === 'showFullScreen') { // 全屏查询
+            this.$refs['editChart' + chartItem.id][0].setData(chartItem, null,
+              this.filter.panelId, null, filterType)
+          } else {
+            this.$refs['editChart' + chartItem.id][0].setData(chartItem, null,
+              this.filter.panelId, null, '')
+          }
+        }
+        return
+      }
+
+      if (this.isModel) {
+        this.modelStaticData(chartInfo, filterType)
+      } else {
+        // 没有数据的设置提示信息暂无数据-针对每一个图
+        const len = chartItem.elements.length
+        if (len === 0) {
+          this.$nextTick(() => {
+            if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
+              this.$refs['editChart' + chartItem.id][0].setData(chartItem, [], this.filter.panelId, this.filter)// ????怎么设置的无数据？？
+            }
+          })
+        } else {
+          let startTime = ''
+          let endTime = ''
+          if (filterType === 'refresh') { // 刷新
+            const now = new Date(bus.computeTimezone(new Date().getTime()))
+            const origin = new Date(this.filter.end_time)
+            const numInterval = now.getTime() - origin.getTime()
+            if (numInterval >= 60000) { // 大于1分钟，则start、end均往后移numInterval，否则时间不变
+              startTime = this.getNewTime(this.filter.start_time, numInterval)
+              endTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss')
+            } else {
+              startTime = this.filter.start_time
+              endTime = this.filter.end_time
+            }
+          } else if (filterType === 'showFullScreen') { // 全屏时间查询
+            startTime = this.filter.start_time
+            endTime = this.filter.end_time
+            // this.$parent.refreshTime(startTime,endTime);全屏查询，不更新panel列表的时间条件
+          } else {
+            startTime = this.filter.start_time
+            endTime = this.filter.end_time
+          }
+
+          const step = bus.getStep(startTime, endTime)
+          this.$nextTick(() => {
+            const axiosArr = chartItem.elements.map((ele) => {
+              const filterItem = ele
+              let query = encodeURIComponent(filterItem.expression)
+              if ((chartInfo.type === 'line' || chartInfo.type === 'bar' || chartInfo.type === 'stackArea' || chartInfo.type === 'table') && chartInfo.param) { // 如果是这三个 默认给connected
+                chartInfo.param.nullType = chartInfo.param.nullType || 'connected'
+                query += '&nullType=' + chartInfo.param.nullType
+              }
+              // if(chartInfo.type === 'table'&&chartInfo.param&&chartInfo.param.last == 1){
+              //   return this.$get('/prom/api/v1/query_range?query=' + query + "&start=" + this.$stringTimeParseToUnix(endTime) + "&end=" + this.$stringTimeParseToUnix(endTime) + '&step=' + step);
+              // }
+              return this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=' + step)
+            })
+            // 一个图表的所有element单独获取数据
+            axios.all(axiosArr).then((res) => {
+              if (res.length > 0) {
+                const series = []
+                let singleStatRlt = ''
+                const legend = []
+                const tableData = []
+                /* let sumData = {
+                    name: 'sum',
+                    data: [],
+                    visible: true,
+                    threshold: null,
+                  }; */
+                let errorMsg = ''
+                let pieSeries
+                if (chartInfo.type === 'pie') {
+                  pieSeries = {
+                    type: 'pie',
+                    radius: '100%',
+                    center: ['50%', '50%'],
+                    top: '20%',
+                    bottom: '20%',
+                    // roseType: 'radius',
+                    minAngle: 10,
+                    itemStyle: {
+                      borderRadius: 5,
+                      borderColor: '#fff',
+                      borderWidth: 1
+                    },
+                    label: {
+                      show: false
+                    },
+                    emphasis: {
+                      label: {
+                        show: false
+                      }
+                    },
+                    data: []
+                  }
+                }
+                res.forEach((response, innerPos) => {
+                  if (response.status === 'success') {
+                    errorMsg = ''
+                    if (response.data.result) {
+                      // 循环处理每个elements下获取的数据列
+                      if (chartItem.type === 'singleStat') {
+                        if (response.data.result.length === 1) {
+                          const statistics = chartItem.param.statistics
+                          if (response.data.result[0].values) {
+                            singleStatRlt = bus.getSingleStatRlt(statistics, response.data.result[0].values)
+                          }
+                        } else if (response.data.result.length > 1) {
+                          singleStatRlt = this.$t('dashboard.panel.singleStatErrorTip')
+                        }
+                      } else {
+                        response.data.result.forEach((queryItem, resIndex) => {
+                          let seriesItem = {
+                            theData: {
+                              name: '',
+                              symbol: 'emptyCircle', // 去掉点
+                              symbolSize: [2, 2],
+                              smooth: 0.2, // 曲线变平滑
+                              showSymbol: false,
+                              data: [],
+                              lineStyle: {
+                                width: 1,
+                                opacity: 0.9
+                              },
+                              animation: false,
+                              type: chartInfo.type
+                            },
+                            metric_name: ''
+                          }
+
+                          if (chartInfo.type === 'stackArea') {
+                            seriesItem.theData.type = 'line'
+                            seriesItem.theData.stack = chartInfo.title
+                            seriesItem.theData.areaStyle = { opacity: 0.3 }
+                          }
+                          if ((chartInfo.type === 'line' || chartInfo.type === 'stackArea' || chartInfo.type === 'bar') && chartInfo.param && chartInfo.param.threshold) {
+                            seriesItem.theData.markLine = {
+                              silent: true,
+                              symbol: ['circle', 'circle'],
+                              label: {
+                                distance: this.computeDistance(chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(chartInfo.param.threshold)),
+                                formatter (params) {
+                                  return chartDataFormat.getUnit(chartInfo.unit ? chartInfo.unit : 2).compute(params.value)
+                                }
+                              },
+                              lineStyle: {
+                                color: '#d64f40',
+                                width: 2,
+                                type: 'dotted'
+                              },
+                              data: [{
+                                yAxis: Number(chartInfo.param.threshold)
+                              }]
+                            }
+                          }
+                          // 图表中每条线的名字,后半部分
+                          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"]
+                          // 设置时间-数据格式对
+                          let tempArr = []
+                          let dpsArr = []
+                          tempArr = queryItem.values
+                          dpsArr = Object.entries(queryItem.values)// [ ["0",[1577959830.781,"0"]], ["1",[1577959845.781,"0"]] ]
+                          dpsArr = dpsArr.map(item => {
+                            return [item[0], [item[1][0], Number(item[1][1])]]
+                          })
+                          // 判断是否有数据, && tagsArr.length > 0
+                          if (dpsArr.length > 0 && this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
+                            tagsArr.forEach((tag, i) => {
+                              if (tag !== '__name__') {
+                                host += `${tag}="${queryItem.metric[tag]}",`
+                              }
+                            })
+                            if (host.endsWith(',')) {
+                              host = host.substr(0, host.length - 1)
+                            }
+                            if (queryItem.metric.__name__) {
+                              host += '}'
+                            }
+                            if (!host || host === '') {
+                              host = chartItem.elements[innerPos].expression
+                            }
+                            // 处理legend别名
+                            let alias = this.$refs['editChart' + chartItem.id][0].dealLegendAlias(host, chartItem.elements[innerPos].legend)
+                            if (!alias || alias === '') {
+                              alias = host
+                            }
+                            legend.push({ name: host + '-' + chartItem.elements[innerPos].id + '-' + resIndex, alias: alias })
+                            // 图表中每条线的名字,去掉最后的逗号与空格:metric名称,  标签1=a,标签2=c
+
+                            seriesItem.theData.name = host + '-' + chartItem.elements[innerPos].id + '-' + resIndex
+                            // alert(seriesItem.theData.name);
+                            seriesItem.metric_name = seriesItem.theData.name
+                            // 将秒改为毫秒
+                            // alert('table=='+JSON.stringify(queryItem))
+                            seriesItem.theData.data = tempArr.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]];
+                                }
+                                */
+                              // let t_date = new Date(dpsItem[0] * 1000);
+                              // let timeTmp = bus.timeFormate(t_date, 'yyyy-MM-dd hh:mm:ss');
+                              tableData.push({ // 表格数据
+                                // label: host.slice(host.indexOf('{') + 1,host.indexOf('}')),//label
+                                // metric: queryItem.metric.__name__?queryItem.metric.__name__:'',//metric列
+                                element: { element: host, alias: alias },
+                                // time: timeTmp,//采集时间
+                                // value: dpsItem[1],//数值
+                                data: [dpsItem[0] * 1000, dpsItem[1]]
+                              })
+                              return [dpsItem[0] * 1000, dpsItem[1]]
+                            })
+                            if (chartInfo.type === 'pie') {
+                              pieSeries.data.push({ value: bus.getSingleStatRlt(chartInfo.param.statistics, seriesItem.theData.data), name: host + '-' + chartItem.elements[innerPos].id + '-' + resIndex })
+                            } else {
+                              series.push(seriesItem.theData)
+                              seriesItem = null
+                            }
+                          } else if (chartItem.elements && chartItem.elements[innerPos]) {
+                            // 无数据提示
+                            /*
+                              const currentInfo = chartItem.elements[innerPos];
+                              const errorMsg = `图表 ${chartItem.title} 中 ${currentInfo.metric},${currentInfo.tags} 无数据`;
+                              this.$message.warning({
+                                duration: 15,
+                                content: errorMsg,
+                                closable: true,
+                              });
+                              */
+                          }
+                        })
+                      }
+                    }
+                  } else {
+                    if (response.msg) {
+                      // this.$message.error(response.msg);
+                      errorMsg = response.msg
+                    } else if (response.error) {
+                      // this.$message.error(response.error);
+                      errorMsg = response.error
+                    } else {
+                      // this.$message.error(response);
+                      errorMsg = response
+                    }
+                  }
+                })
+
+                if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
+                  if (chartInfo.type === 'pie') {
+                    series.push(pieSeries)
+                  }
+                  const chartData = {
+                    chartItem: chartItem,
+                    series: series,
+                    singleStatRlt: singleStatRlt,
+                    legend: legend,
+                    tableData: tableData,
+                    panelId: this.filter.panelId,
+                    filter: this.filter,
+                    filterType: filterType,
+                    errorMsg: errorMsg
+                  }
+                  this.chartDataCacheGroup.set(chartInfo.id, chartData)
+                  if (chartItem.type === 'table') { // 表格
+                    if (filterType === 'showFullScreen') { // 全屏查询
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, tableData,
+                        this.filter.panelId, this.filter, filterType, errorMsg)
+                    } else {
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, tableData,
+                        this.filter.panelId, this.filter, '', errorMsg)
+                    }
+                  } else if (chartItem.type === 'line' || chartItem.type === 'bar' || chartItem.type === 'stackArea' || chartItem.type === 4 || chartItem.type == 'pie') {
+                    if (series.length && chartItem.type === 4) { // 曲线汇总
+                      // series.push(sumData);//后续需要
+                    }
+                    if (filterType === 'showFullScreen') { // 全屏查询
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, series,
+                        this.filter.panelId, this.filter, legend, filterType, errorMsg)
+                    } else {
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, series,
+                        this.filter.panelId, this.filter, legend, '', errorMsg)
+                    }
+                  } else if (chartItem.type === 'singleStat') {
+                    if (filterType === 'showFullScreen') { // 全屏查询
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, singleStatRlt,
+                        this.filter.panelId, this.filter, filterType, errorMsg)
+                    } else {
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, singleStatRlt,
+                        this.filter.panelId, this.filter, '', errorMsg)
+                    }
+                  }
+                }
+              } else {
+                const type = chartItem.type
+                if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
+                  if (type === 'table') {
+                    if (filterType === 'showFullScreen') { // table的全屏查询
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, [], this.filter.panelId,
+                        this.filter, filterType)
+                    } else {
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, [], this.filter.panelId,
+                        this.filter)
+                    }
+                  } else if (type === 'line' || type === 'bar' || type === 'stackArea' || chartItem.type === 4 || chartItem.type === 'pie') {
+                    if (filterType === 'showFullScreen') { // table的全屏查询
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, [], this.filter.panelId,
+                        this.filter, filterType)
+                    } else {
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, [], this.filter.panelId,
+                        this.filter)
+                    }
+                  } else if (chartItem.type === 'singleStat') {
+                    if (filterType === 'showFullScreen') { // 全屏查询
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, '',
+                        this.filter.panelId, this.filter, filterType)
+                    } else {
+                      this.$refs['editChart' + chartItem.id][0].setData(chartItem, '',
+                        this.filter.panelId, this.filter)
+                    }
+                  }
+                }
+              }
+            }).catch((error) => {
+              if (error) {
+                this.$message.error(error.toString())
+                console.error(error)
+              }
+            })
+          })
+        }
+      }
+    },
+    computeDistance (str) {
+      const span = document.querySelector('.temp-dom')
+      if (span) {
+        span.textContent = str
+        const txtWidth = parseFloat(window.getComputedStyle(span).width)
+        return Number('-' + (txtWidth + 5))
+      }
+    },
+    modelStaticData (chartInfo, filterType) {
+      const series = []
+      const legend = []
+      const tableData = []
+      const singleStatRlt = 999
+      if (chartInfo.type === 'singleStat') {
+        // const statistics = chartInfo.param.statistics
+      } else {
+        const seriesItem = {
+          theData: {
+            name: '',
+            symbol: 'emptyCircle', // 去掉点
+            symbolSize: [2, 2],
+            smooth: 0.2, // 曲线变平滑
+            showSymbol: false,
+            data: [],
+            lineStyle: {
+              width: 1,
+              opacity: 0.9
+            },
+            type: chartInfo.type
+          },
+          // visible: true,
+          // threshold: null,
+          metric_name: ''
+        }
+        if (chartInfo.type === 'stackArea') {
+          seriesItem.theData.type = 'line'
+          seriesItem.theData.stack = chartInfo.title
+          seriesItem.theData.areaStyle = { opacity: 0.3 }
+        }
+        // 图表中每条线的名字,后半部分
+        let host = 'host'// up,
+        const queryItem = { metric: { item1: 'item1', item2: 'item2', item3: 'item3' }, values: [] }
+        const tagsArr = Object.keys(queryItem.metric)// ["__name__","asset","idc","instance","job","module","project"]
+        // 设置时间-数据格式对
+        const tempArr = []
+        const dpsArr = []
+        const timeStamp = Math.floor(new Date().getTime() / 1000)
+        for (let i = 0; i < 20; i++) {
+          tempArr.push([timeStamp - (20 - i) * 15, Math.floor(Math.random() * 10) + ''])
+          queryItem.values.push(tempArr[i])
+          dpsArr.push([i + '', tempArr[i]])
+        }
+        // 判断是否有数据, && tagsArr.length > 0
+        if (dpsArr.length > 0 && this.$refs['editChart' + chartInfo.id] && this.$refs['editChart' + chartInfo.id].length > 0) {
+          tagsArr.forEach((tag, i) => {
+            if (tag !== '__name__') {
+              host += `${tag}="${queryItem.metric[tag]}",`
+            }
+          })
+          if (queryItem.metric.__name__) {
+            host += '}'
+          }
+          // 处理legend别名
+          let alias = this.$refs['editChart' + chartInfo.id][0].dealLegendAlias(host, chartInfo.elements[0].legend)
+          if (!alias || alias === '') {
+            alias = host
+          }
+          legend.push({ name: host, alias: alias })
+          // 图表中每条线的名字,去掉最后的逗号与空格:metric名称,  标签1=a,标签2=c
+          seriesItem.theData.name = host
+          // alert(seriesItem.theData.name);
+          seriesItem.metric_name = seriesItem.theData.name
+          // 将秒改为毫秒
+          // alert('table=='+JSON.stringify(queryItem))
+          seriesItem.theData.data = tempArr.map((dpsItem, dpsIndex) => {
+            const tData = new Date(dpsItem[0] * 1000)
+            const timeTmp = bus.timeFormate(tData, 'yyyy-MM-dd hh:mm:ss')
+            tableData.push({ // 表格数据
+              // label: host.slice(host.indexOf('{') + 1,host.indexOf('}')),//label
+              // metric: queryItem.metric.__name__?queryItem.metric.__name__:'',//metric列
+              element: { element: host, alias: alias },
+              time: timeTmp, // 采集时间
+              value: dpsItem[1]// 数值
+            })
+            return [dpsItem[0] * 1000, dpsItem[1]]
+          })
+          series.push(seriesItem.theData)
+        }
+      }
+      if (this.$refs['editChart' + chartInfo.id] && this.$refs['editChart' + chartInfo.id].length > 0) {
+        const errorMsg = ''
+        const chartData = {
+          chartItem: chartInfo,
+          series: series,
+          singleStatRlt: singleStatRlt,
+          legend: legend,
+          tableData: tableData,
+          panelId: this.filter.panelId,
+          filter: this.filter,
+          filterType: filterType,
+          errorMsg: errorMsg
+        }
+        this.chartDataCacheGroup.set(chartInfo.id, chartData)
+        if (chartInfo.type === 'table') { // 表格
+          if (filterType === 'showFullScreen') { // 全屏查询
+            this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, tableData,
+              this.filter.panelId, this.filter, filterType, '')
+          } else {
+            this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, tableData,
+              this.filter.panelId, this.filter, '', '')
+          }
+        } else if (chartInfo.type === 'line' || chartInfo.type === 'bar' || chartInfo.type === 'stackArea' || chartInfo.type === 4) {
+          if (series.length && chartInfo.type === 4) { // 曲线汇总
+            // series.push(sumData);//后续需要
+          }
+          if (filterType === 'showFullScreen') { // 全屏查询
+            this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, series,
+              this.filter.panelId, this.filter, legend, filterType, errorMsg)
+          } else {
+            this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, series,
+              this.filter.panelId, this.filter, legend, '', errorMsg)
+          }
+        } else if (chartInfo.type === 'singleStat') {
+          if (filterType === 'showFullScreen') { // 全屏查询
+            this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, singleStatRlt,
+              this.filter.panelId, this.filter, filterType, errorMsg)
+          } else {
+            this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, singleStatRlt,
+              this.filter.panelId, this.filter, '', errorMsg)
+          }
+        }
+      }
+    },
+    getEndpointInfoChartData (chartInfo) {
+      const detail = []
+      this.$refs['editChart' + chartInfo.id][0].showLoad()
+      chartInfo.title = this.$t('project.chart.endpointInfo')
+
+      const basicInfo = JSON.parse(JSON.stringify(this.detail))
+      const basicInfoReq = new Promise((resolve, reject) => {
+        const now = new Date()
+        const startTime = bus.timeFormate(new Date(now).setHours(now.getHours() - 1), 'yyyy-MM-dd hh:mm:ss')
+        const endTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss')
+        // const step = bus.getStep(startTime, endTime)
+        this.$nextTick(() => {
+          let query = chartInfo.elements[0].expression
+          if ((chartInfo.type === 'line' || chartInfo.type === 'bar' || chartInfo.type === 'stackArea') && chartInfo.param) {
+            chartInfo.param.nullType = chartInfo.param.nullType || 'connected'
+            query += '&nullType=' + chartInfo.param.nullType
+          }
+          this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=5m').then(response => {
+            if (response.status === 'success') {
+              if (response.data.result) {
+                const series = {
+                  name: '',
+                  symbol: 'emptyCircle', // 去掉点
+                  symbolSize: 4,
+                  smooth: 0.2, // 曲线变平滑
+                  showSymbol: false,
+                  data: [],
+                  type: 'line',
+                  lineStyle: {
+                    width: 1,
+                    opacity: 0.9
+                  },
+                  itemStyle: {
+                    color (params) {
+                      if (params.data[1] == '1') {
+                        return '#50d050'
+                      } else {
+                        return '#d64f40'
+                      }
+                    }
+                  }
+                }
+                response.data.result.forEach((queryItem, resInnerPos) => {
+                  // 将秒改为毫秒
+                  series.data = queryItem.values.map((dpsItem, dpsIndex) => {
+                    return [dpsItem[0] * 1000, dpsItem[1]]
+                  })
+                })
+                basicInfo.stateSeries = [series]
+                basicInfo.state = ''
+                resolve({ title: this.$t('project.chart.basicTitle'), data: basicInfo, type: 'endpointInfo' })
+              }
+            }
+          })
+        })
+      })
+
+      const endpointId = this.additionalInfo.id
+      const alertMsg = new Promise((resolve, reject) => {
+        this.$get('/alert/message?endpointId=' + endpointId + '&state=1&pageSize=-1').then(response => {
+          if (response.code == 200) {
+            const alerts = {}
+            if (response.data) {
+              response.data.list.forEach(t => {
+                const alertRule = t.alertRule.alertName
+                if (alerts[alertRule]) {
+                  alerts[alertRule]++
+                } else {
+                  alerts[alertRule] = 1
+                }
+              })
+            }
+            resolve({ title: this.$t('overall.alert'), data: alerts })
+          }
+        })
+      })
+      Promise.all([basicInfoReq, alertMsg]).then(resolves => {
+        resolves.forEach(t => detail.push(t))
+        this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, detail)
+      })
+    },
+    getAssetInfoChartData (chartInfo) {
+      const vm = this
+      chartInfo.title = this.$t('asset.assetInfo')
+      const detail = []
+      if (!this.isModel) {
+        this.$refs['editChart' + chartInfo.id][0].showLoad()
+        const assetId = this.additionalInfo.assetId ? this.additionalInfo.assetId : this.additionalInfo.id
+        this.$get('/asset/info?id=' + assetId).then(response => {
+          if (response.code == 200) {
+            response.data && (function () {
+              response.data.Basic && detail.push({
+                title: vm.$t('project.chart.basicTitle'),
+                type: 'basic',
+                data: response.data.Basic
+              })
+              response.data.Attribute && detail.push({
+                title: vm.$t('asset.featureTitle'),
+                type: 'attribute',
+                data: response.data.Attribute
+              })
+            }())
+          }
+          this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, detail, this.filter.panelId, this.filter)
+        })
+      } else {
+        detail.push({
+          title: vm.$t('project.chart.basicTitle'),
+          type: 'basic',
+          data: {
+            sn: 'assetInfo Test',
+            host: '192.168.40.42',
+            pingStatus: 1,
+            pingRtt: 80,
+            cpuNum: '8',
+            memery: '12GB',
+            memery$_$free: '3GB'
+          }
+        })
+        detail.push({
+          title: vm.$t('asset.featureTitle'),
+          type: 'feature',
+          data: {
+            CPU: 'Intel E500',
+            Memory: '256GB',
+            NetworkInterface: ['eth0', 'eth1'],
+            Disk: [{
+              mount: '/',
+              total: '256GB',
+              free: '128GB',
+              usageRate: '50%'
+            }]
+          }
+        })
+        this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, detail, this.filter.panelId, this.filter)
+      }
+    },
+    getProjectInfoChartData (chartInfo) {
+      const vm = this
+      const detail = []
+      if (!this.isModel) {
+        this.$refs['editChart' + chartInfo.id][0].showLoad(chartInfo)
+        this.$get('/project/info?id=' + this.additionalInfo.id).then(response => {
+          if (response.code == 200) {
+            response.data && (function () {
+              response.data.basic && detail.push({
+                title: vm.$t('project.chart.basicTitle'),
+                data: response.data.basic,
+                type: 'project'
+              })
+              response.data.module && (function () {
+                response.data.module.forEach(d => {
+                  detail.push({
+                    title: `${vm.$t('project.module.module')}：${d.name}`,
+                    data: d,
+                    type: 'module'
+                  })
+                })
+              }())
+            }())
+          }
+          this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, detail, this.filter.panelId, this.filter, response.msg)
+        })
+      } else {
+        detail.push({
+          title: 'system',
+          data: {
+            id: 1,
+            name: 'system',
+            remark: '描述信息',
+            alertStat: [1, 2, 3]
+          }
+        })
+        detail.push({
+          title: `${this.$t('project.module.module')}：kafka`,
+          data: {
+            id: 1,
+            name: 'kafka',
+            type: 'http',
+            remark: '描述信息',
+            endpointStat: [3, 23],
+            alertStat: [2, 3, 4]
+          }
+        })
+        detail.push({
+          title: `${this.$t('project.module.module')}：kafkakafkakafkakafkakafkakafkakafka`,
+          data: {
+            id: 2,
+            name: 'kafkakafkakafkakafkakafkakafkakafka',
+            type: 'http',
+            remark: '描述信息',
+            endpointStat: [3, 23],
+            alertStat: [2, 0, 4]
+          }
+        })
+        detail.push({
+          title: `${this.$t('project.module.module')}：kafkakafka`,
+          data: {
+            id: 3,
+            name: 'kafkakafka',
+            type: 'snmp',
+            remark: '描述信息',
+            endpointStat: [3, 0],
+            alertStat: [2, 3, 4]
+          }
+        })
+        this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, detail, this.filter.panelId, this.filter)
+      }
+    },
+    getAlertListChartData (chartInfo, filterType) {
+      if (this.additionalInfo) {
+        this.$set(chartInfo, 'param', { endpointId: this.additionalInfo.id })
+      }
+      console.log(this.$refs['editChart' + chartInfo.id])
+      this.$refs['editChart' + chartInfo.id][0].getAlertList(filterType)
+    },
+    getAlertRuleChartData (chartInfo) {
+      const vm = this
+      const detail = []
+      const req = new Promise((resolve, reject) => {
+        this.$get('alert/rule/stat?id=' + this.additionalInfo.id).then(response => {
+          if (response.code == 200) {
+            response.data && (function () {
+              if (response.data.project && response.data.project.length > 0) {
+                detail.push({ title: vm.$t('overall.entity'), data: convert(response.data.project) })
+              }
+              /* if (response.data.module && response.data.module.length > 0) {
+                  detail.push({title: vm.$t("project.module.module"), data: convert(response.data.module)});
+                }
+                if (response.data.endpoint && response.data.endpoint.length > 0) {
+                  detail.push({title: vm.$t("project.endpoint.endpoint"), data: convert(response.data.endpoint)});
+                } */
+              if (response.data.asset && response.data.asset.length > 0) {
+                detail.push({ title: vm.$t('asset.asset'), data: convert(response.data.asset) })
+              }
+            }())
+            resolve(true)
+          }
+        })
+      })
+      req.then(result => {
+        this.$refs['editChart' + chartInfo.id][0].setData(chartInfo, detail)
+      })
+
+      function convert (d) {
+        const data = {}
+        d.forEach(item => {
+          data[item.name] = item.nums
+          !data._module_ && (data._module_ = {})
+          if (item.module && item.module instanceof Array && item.module.length > 0) {
+            data._module_[item.name] = {}
+            item.module.forEach(m => {
+              data._module_[item.name][m.name] = m.nums
+              !data._module_[item.name]._endpoint_ && (data._module_[item.name]._endpoint_ = {})
+              if (m.endpoint && m.endpoint instanceof Array && m.endpoint.length > 0) {
+                data._module_[item.name]._endpoint_[m.name] = {}
+                m.endpoint.forEach(e => {
+                  data._module_[item.name]._endpoint_[m.name][e.name] = e.nums
+                })
+              }
+            })
+          }
+        })
+        return data
+      }
+    },
+
+    // 设置图表的尺寸
+    setChartSize (item, index) {
+      this.$nextTick(() => {
+        const chartBox = document.getElementById('chart-group-' + item.id)
+        if (chartBox) {
+          chartBox.style.width = `${(item.span / 12) * 100}%`
+          chartBox.style.height = `${item.height}px`
+        }
+      })
+    },
+    getNewTime (time, num) {
+      const date = new Date(time)
+      const newDate = new Date(parseInt(date.getTime(), 10) + num)
+      return bus.timeFormate(newDate, 'yyyy-MM-dd hh:mm:ss')
+    },
+    // 删除图表
+    removeChart (chartId) { // from 区分从哪里点击的删除 1.从图表面板 2.从编辑框
+      const chart = this.dataList.find(item => item.id === chartId)
+      if (chart) {
+        this.$emit('on-remove-chart', chart)
+      }
+    },
+    // 复制图表
+    duplicateChart (chartId, duplicateChartBack) {
+      const duplicateChartId = duplicateChartBack.id
+      let chart
+      let chartIndex = -1
+      this.dataList.forEach((item, index) => {
+        if (item.id === chartId) {
+          chartIndex = index
+          chart = item
+        }
+      })
+      let chartNext
+      const chartNextIndex = chartIndex + 1
+      if (chartNextIndex <= (this.dataList.length - 1)) {
+        chartNext = this.dataList[chartNextIndex]
+      }
+
+      if (chart) {
+        chart.next = duplicateChartId
+        const duplicateChart = JSON.parse(JSON.stringify(chart))
+        duplicateChart.id = duplicateChartId
+        duplicateChart.prev = duplicateChartBack.prev
+        duplicateChart.next = duplicateChartBack.next
+        duplicateChart.title = duplicateChartBack.title
+        duplicateChart.elements = duplicateChartBack.elements
+        if (chartNext) {
+          chartNext.prev = duplicateChartId
+        }
+
+        this.dataList.splice(chartNextIndex, 0, duplicateChart)
+
+        const indexInTotal = this.dataTotalList.indexOf(chart)
+        this.dataTotalList.splice(indexInTotal + 1, 0, duplicateChart)
+        const chartInTotal = this.dataTotalList.find(item => item.id === chartId)
+        chartInTotal.next = duplicateChartId
+        if (chartNext) {
+          const chartNextInTotal = this.dataTotalList.find(item => item.id === chartNext.id)
+          chartNextInTotal.prev = chartNext.prev
+        }
+
+        const indexInTotalBak = this.dataTotalListBak.indexOf(chart)
+        this.dataTotalListBak.splice(indexInTotalBak + 1, 0, duplicateChart)
+        const chartInTotalBak = this.dataTotalListBak.find(item => item.id === chartId)
+        chartInTotalBak.next = duplicateChartId
+        if (chartNext) {
+          const chartNextInTotalBak = this.dataTotalListBak.find(item => item.id === chartNext.id)
+          chartNextInTotalBak.prev = chartNext.prev
+        }
+
+        this.currentRecordNum = this.currentRecordNum + 1
+        const chartData = this.chartDataCacheGroup.get(chart.id)
+        // console.log("__chartItem00__", chartData)
+        if (duplicateChartBack.type === 'alertList') {
+          this.$nextTick(() => {
+            this.getAlertListChartData(duplicateChartBack)
+            this.setChartSize(duplicateChart, chartNextIndex) // 设置该图表宽度
+          })
+        } else {
+          let duplicateChartData = {}
+          try {
+            duplicateChartData = JSON.parse(JSON.stringify(chartData))
+          } catch (e) {
+            console.warn(e)
+          }
+          duplicateChartData.chartItem = duplicateChart
+          this.chartDataCacheGroup.set(duplicateChartId, duplicateChartData)
+          this.$nextTick(() => {
+            if (this.$refs['editChart' + duplicateChartId][0]) {
+              this.$refs['editChart' + duplicateChartId][0].showLoad(duplicateChart)// 之后要实现
+            }
+
+            const chartType = duplicateChart.type
+            if (chartType !== 'url') {
+              this.getChartDataForSearch(duplicateChart, chartNextIndex)
+            }
+            this.setChartSize(duplicateChart, chartNextIndex) // 设置该图表宽度
+          })
+        }
+      }
+    },
+    // 编辑图表
+    editData (chartId) {
+      // 获取该id下chart的相关信息
+      const chart = this.dataList.find(item => item.id === chartId)
+      if (chart) {
+        this.$emit('on-edit-chart', chart)
+      }
+    },
+
+    editChartForDrag (chartItem) {
+      const chart = this.dataList.find(item => item.id === chartItem.id)
+      chart.span = chartItem.span
+      chart.height = chartItem.height
+    },
+    // 刷新列表中的一个图表
+    refreshChart (chartId, searchTime) {
+      this.dataList.forEach((item, index) => {
+        if (item.id === chartId) {
+          this.getChartData(item, index, 'refresh')
+        }
+      })
+    },
+    refresh () {
+      this.dataList.forEach((item, index) => {
+        this.getChartData(item, index, this.filter)
+      })
+    },
+    searchData (chartId, searchTime) {
+      if (searchTime) { // 全屏时间查询
+        this.filter.start_time = bus.timeFormate(searchTime[0], 'yyyy-MM-dd hh:mm:ss')
+        this.filter.end_time = bus.timeFormate(searchTime[1], 'yyyy-MM-dd hh:mm:ss')
+      }
+      this.dataList.forEach((item, index) => {
+        if (item.id === chartId) {
+          this.getChartData(item, index, 'showFullScreen')
+        }
+      })
+    },
+    // 懒加载，判断网页区域，加载可见区的prom数据
+    handleElementInViewport (ele, scrollTop, item, index, isSearch) {
+      /*
+        网页被卷去的高：document.body.scrollTop
+        网页正文全文高：document.body.scrollHeight
+        网页可见区域高（包括边线的高）：document.body.offsetHeight；
+        网页可见区域高：document.body.clientHeight
+        */
+      const that = this
+      setTimeout(function () {
+        const itemHeight = item.height
+        // 1.元素距离页面顶部的距离
+        const mainOffsetTop = ele.offsetTop// offsetTop: 当前元素顶部距离最近父元素顶部的距离,和有没有滚动条没有关系。单位px，只读元素。
+        // 2.元素的高度
+        const mainHeight = itemHeight// ele.offsetHeight;//itemHeight;
+        // 3.页面滚动的距离
+        const windowScrollTop = scrollTop// document.documentElement.scrollTop || document.body.scrollTop;
+        // 4.浏览器可见区域的高度
+        const windowHeight = (window.innerHeight || document.documentElement.clientHeight) - 50 - 42
+
+        /*
+          * 在窗口上下滚动的情况下, 一个页面元素的状态有下面3种：
+          1.向上滚动超出可见区域
+          2.向下滚动超出可视区域
+          3.在可视区域内
+          * 第一种情况   由于元素随页面向上滚动, 整个页面滚动的距离  大于 （元素距离页面顶部的距离 + 元素本身的高度 ）-> 超出
+          * 第二种情况   由于元素随页面向下滚动, 整个页面滚动的距离  小于 （元素距离页面顶部的距离 - 浏览器可见区域高度 ）-> 超出
+          * */
+        /* console.log("___isInView____","元素距离页面顶部的距离mainOffsetTop="+mainOffsetTop)//不变
+          console.log("___isInView____","元素高度mainHeight="+mainHeight)//不变
+          console.log("___isInView____","scrollTop页面滚动的距离windowScrollTop="+windowScrollTop)//变
+          console.log("___isInView____","浏览器可见区域高度windowHeight="+windowHeight)//不变
+          console.log(item.title,(mainOffsetTop+mainHeight/3),"<",(windowScrollTop+windowHeight),((mainOffsetTop+mainHeight/3) < (windowScrollTop+windowHeight))) */
+        if ((mainOffsetTop + mainHeight / 3) < (windowScrollTop + windowHeight)) {
+          const chartType = item.type
+          item.isLoaded = true
+          if (chartType !== 'url') {
+            that.getChartDataForSearch(item, index)
+          } else {
+            that.$refs['editChart' + item.id][0].showLoad(item)
+          }
+        }
+      }, 500)
+    }
+  },
+  created () {
+    this.chartDataCacheGroup = new Map()
+  },
+  mounted () {
+    this.tempDomInit()
+  }
+
+}
+
+</script>
diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 943602b14..4ce04c9b7 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -170,6 +170,21 @@
                             :panel-id="filter.panelId"
                             @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
                             :chart-index="index"></chart-pie>
+        <chart-group  :from="from" :key="'inner' + item.id" :ref="'editChart'+item.id" v-if="item.type === 'group'"
+                      @on-refresh-data="refreshChart"
+                      @on-search-data="searchData"
+                      @on-remove-chart-block="removeChart"
+                      @on-duplicate-chart-block="duplicateChart"
+                      @on-drag-chart="editChartForDrag"
+                      :is-lock="panelLock"
+                      :panelLock="panelLock"
+                      :filter="filter"
+                      @on-edit-chart-block="editData"
+                      :panel-id="filter.panelId"
+                      :chart-data="item"
+                      :dataList='dataList'
+                      @dropmenu-change="(show) => {dropmenuChange(item.id, show)}"
+                      :chart-index="index"></chart-group>
       </div>
    </draggable>
     <el-row v-if="dataList.length === 0"  class="noData"></el-row>
@@ -190,6 +205,7 @@ import chartDataFormat from './chartDataFormat'
 import chartAlertList from './chart-alert-list'
 import textChart from './text-chart'
 import chartPie from './chart-pie'
+import chartGroup from './chart-group'
 // import visNetwork from './visNetwork'
 export default {
   name: 'chartList',
@@ -199,7 +215,8 @@ export default {
     draggable: { type: Boolean, default: true },
     detail: Object,
     from: { type: String },
-    panelLock: { type: Boolean, default: false }
+    panelLock: { type: Boolean, default: false },
+    hasGroup: { type: Boolean, default: true }
   },
 
   components: {
@@ -211,7 +228,8 @@ export default {
     chartSingleStat,
     draggable,
     textChart,
-    chartPie
+    chartPie,
+    chartGroup
     // visNetwork,
   },
   data () {
@@ -573,7 +591,7 @@ export default {
       }
       if (!param.query) delete param.query
       // 根据panelId获得panel下的所有图表
-      this.$get('panel/' + params.panelId + '/charts').then(response => {
+      this.$get('visual/panel/chart?id=' + params.panelId).then(response => {
         if (response.code === 200) {
           response.data.list.forEach((item, index) => {
             item.isLoaded = false
@@ -600,6 +618,28 @@ export default {
           this.dataTotalList = [...chartListTmp]
 
           this.dataList = [...this.dataTotalList]
+          console.log(this.dataList)
+          // this.dataList.push({
+          //   ...this.dataList[0],
+          //   group: {
+          //     id: 1,
+          //     name: 'chart group'
+          //   },
+          //   type: 'group',
+          //   span: 12,
+          //   height: 600,
+          //   id: 999999,
+          //   children: [...this.dataList]
+          // })
+          let addGroupIndex = 0
+          this.dataList.forEach((item) => {
+            if (item.type === 'group') {
+              item.children.forEach(chart => {
+                addGroupIndex++
+                chart.chartIndex = this.dataList.length + addGroupIndex
+              })
+            }
+          })
           // this.showShadow=false;
           this.$nextTick(() => {
             if (this.dataList.length > 0) {
@@ -721,6 +761,9 @@ export default {
     // 获取一个图表具体数据,图表信息，图表位置index
     getChartData (chartInfo, pos, filterType) {
       const chartItem = chartInfo
+      if (chartItem.type === 'group') {
+        return
+      }
       if (chartItem.type === 'assetInfo') {
         if (chartItem.from != this.$CONSTANTS.fromRoute.endpoint) {
           this.$set(chartItem, 'draggable', true)
@@ -938,6 +981,7 @@ export default {
                               host = chartItem.elements[innerPos].expression
                             }
                             // 处理legend别名
+                            console.log(chartItem.id)
                             let alias = this.$refs['editChart' + chartItem.id][0].dealLegendAlias(host, chartItem.elements[innerPos].legend)
                             if (!alias || alias === '') {
                               alias = host
@@ -1497,6 +1541,9 @@ export default {
         if (chartBox) {
           chartBox.style.width = `${(item.span / 12) * 100}%`
           chartBox.style.height = `${item.height}px`
+          if (item.type === 'group') {
+            chartBox.style.height = 'auto'
+          }
         }
       })
     },
diff --git a/nezha-fronted/src/components/charts/text-chart.vue b/nezha-fronted/src/components/charts/text-chart.vue
index 6c3561b62..cfec0db0a 100644
--- a/nezha-fronted/src/components/charts/text-chart.vue
+++ b/nezha-fronted/src/components/charts/text-chart.vue
@@ -208,6 +208,7 @@ export default {
     },
     // 设置数据, filter区分
     setData (chartItem, seriesItem, panelId, filter, area) {
+      console.log(chartItem);
       this.$nextTick(() => {
         this.resize(chartItem)
       })
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index c45091578..de4d49411 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -349,6 +349,7 @@ export const chartResizeTool = {
     return height - this.chartBlankHeight
   },
   start (vm, originalData, event, chartIndexs) {
+    console.log(vm, originalData, event, chartIndexs)
     const $self = this
     const data = JSON.parse(JSON.stringify(originalData)) // 将初始对象复制，后续操作使用复制对象
     let shadow = vm.$refs.resizeShadow // 缩放时底部阴影dom
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 5e05e1a42..8497a89ff 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -221,6 +221,9 @@ const cn = {
           },
           text: {
             label: '文本'
+          },
+          group: {
+            label: '组'
           }
         },
         statisticsVal: {
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 6fadd15ca..e8091ef2f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -234,6 +234,9 @@ const en = {
           },
           text: {
             label: 'Text'
+          },
+          group: {
+            label: 'group'
           }
         },
         statisticsVal: {
diff --git a/nezha-fronted/src/components/common/multipleTime.vue b/nezha-fronted/src/components/common/multipleTime.vue
index 362816d6b..d755c0975 100644
--- a/nezha-fronted/src/components/common/multipleTime.vue
+++ b/nezha-fronted/src/components/common/multipleTime.vue
@@ -313,7 +313,7 @@ export default {
     }
   },
   mounted () {
-    console.log(this.searchTime, 'this.searchTime')
+    // console.log(this.searchTime, 'this.searchTime')
   },
   methods: {
     dateChange (val) {
diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index 205bd06a1..d183b1a6c 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -115,7 +115,7 @@ export default {
         })
       }
 
-      this.$put('/panel/tree', toUpdate)
+      this.$put('visual/panel/tree', toUpdate)
     },
     deletePanel (data) {
       this.$emit('deletePanel', data)
diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index 570923d69..54c346353 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -69,7 +69,7 @@ export default {
         cancelButtonText: this.$t('tip.no'),
         type: 'warning'
       }).then(() => {
-        this.$delete('panel?ids=' + u.id).then(response => {
+        this.$delete('visual/panel?ids=' + u.id).then(response => {
           if (response.code === 200) {
             this.esc()
             this.$message({ duration: 1000, type: 'success', message: this.$t('tip.deleteSuccess') })
@@ -85,7 +85,7 @@ export default {
         if (valid) {
           this.prevent_opt.save = true
           if (this.panel.id) {
-            this.$put('panel', this.panel).then(response => {
+            this.$put('visual/panel', this.panel).then(response => {
               if (response.code === 200) {
                 this.esc()
                 this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
@@ -96,7 +96,7 @@ export default {
               this.prevent_opt.save = false
             })
           } else {
-            this.$post('panel', this.panel).then(response => {
+            this.$post('visual/panel', this.panel).then(response => {
               if (response.code === 200) {
                 this.esc()
                 this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
diff --git a/nezha-fronted/src/components/common/rightBox/roleBox.vue b/nezha-fronted/src/components/common/rightBox/roleBox.vue
index 6f8aa0c1e..596b06d16 100644
--- a/nezha-fronted/src/components/common/rightBox/roleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/roleBox.vue
@@ -142,7 +142,6 @@ export default {
       this.$get('sys/menu').then(response => {
         if (response.code == 200) {
           this.menus = response.data.list
-
         } else {
           this.$message.error('load menu faild')
         }
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index aaef0d6ee..f57f7e15f 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -183,7 +183,7 @@
 
           </el-form-item>
           <el-form-item :label='$t("dashboard.panel.chartForm.chartName")' prop="title">
-            <el-input maxlength="64" show-word-limit size="small" v-model="editChart.title" id="chart-box-title"></el-input>
+            <el-input maxlength="64" show-word-limit size="small" v-model="editChart.name" id="chart-box-title"></el-input>
           </el-form-item>
 
           <div class="right-box-sub-title">{{$t('dashboard.panel.chartForm.option')}}</div>
@@ -198,6 +198,15 @@
             </el-select>
           </el-form-item>
 
+          <!--group-->
+          <el-form-item :label="$t('dashboard.panel.chartForm.group')" class="half-form-item" prop="type">
+            <el-select @change="chartTypeChange" class="right-box-row-with-btn" placeholder="" popper-class="chart-box-dropdown-small" size="mini" v-model="editChart.type" value-key="chartType" id="chart-box-group">
+              <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in chartTypeList">
+                <span class="panel-dropdown-label-txt" >{{item.name}}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+
           <el-form-item :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" prop="unit" v-show="editChart.type !='text' && editChart.type !=='url'">
             <el-cascader :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" @change="unitSelected"  filterable id="chart-box-unit"
                          placeholder=""
@@ -260,9 +269,9 @@
             <el-switch :active-value="1" :inactive-value="0" active-color="#ee9d3f" class="exporter-switch" v-model="editChart.param.last" id="chart-box-last"></el-switch>
           </el-form-item>-->
 
-          <!--<el-form-item :label="$t('dashboard.panel.chartForm.sync')" v-if="showPanel.type && showPanel.type == 'model'">-->
-          <!--<el-switch class="exporter-switch" v-model="editChart.sync" active-color="#ee9d3f" :active-value="1" :inactive-value="0"></el-switch>-->
-          <!--</el-form-item>-->
+          <el-form-item :label="$t('dashboard.panel.chartForm.remark')">
+           <el-input type="textarea" v-model="editChart.remark"/>
+          </el-form-item>
 
           <div class="right-box-sub-title" style="margin-bottom: 20px" v-if="!isUrl&&!isAlert&& editChart.type != 'text'">
             <span>{{$t('alert.config.expr')}}</span>
@@ -498,7 +507,7 @@ export default {
         panelName: [
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ],
-        title: [
+        name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         url: [
@@ -511,6 +520,7 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ]
       },
+      groupArr: [],
       chartTypeList: [
         {
           id: 'line',
@@ -547,6 +557,10 @@ export default {
         {
           id: 'url',
           name: this.$t('dashboard.panel.chartForm.typeVal.url.label')
+        },
+        {
+          id: 'group',
+          name: this.$t('dashboard.panel.chartForm.typeVal.group.label')
         }
 
       ],
@@ -634,7 +648,7 @@ export default {
         cancelButtonText: this.$t('tip.no'),
         type: 'warning'
       }).then(() => {
-        this.$delete('panel?ids=' + panel.id).then(response => {
+        this.$delete('visual/panel?ids=' + panel.id).then(response => {
           if (response.code === 200) {
             this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') })
             if (this.panelId == panel.id) {
@@ -701,7 +715,7 @@ export default {
       this.$refs.chartForm.validate((valid) => {
         if (valid) {
           if (this.editChart.id) { // 修改
-            this.$put('panel/' + this.editChart.id + '/charts').then(response => {
+            this.$put('visual/panel/chart', this.editChart).then(response => {
               if (response.code === 200) {
                 this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
                 this.esc(true)
@@ -710,7 +724,7 @@ export default {
               }
             })
           } else { // 新增
-            this.$post('panel/charts', this.editChart).then(response => {
+            this.$post('visual/panel/chart', this.editChart).then(response => {
               if (response.code === 200) {
                 this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
                 this.esc(true)
@@ -850,12 +864,18 @@ export default {
 
       // panelPromise.then(()=>{
       if (this.panelId) {
-        this.$post('panel/' + this.panelId + '/charts', params || this.editChart).then(response => {
+        const chartParams = params || this.editChart
+        chartParams.panelId = this.panelId
+        if (!chartParams.groupId) {
+          chartParams.groupId = -1
+        }
+        delete chartParams.panel
+        this.$post('visual/panel/chart', chartParams).then(response => {
           if (response.code === 200) {
             this.esc()
             this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
             this.$refs.chartForm.resetFields()// 清空表单
-            this.$emit('on-create-success', 'create', response.data, params, { id: this.panelId, name: this.panelName })
+            this.$emit('on-create-success', 'create', response.data, chartParams, { id: this.panelId, name: this.panelName })
           } else {
             if (response.msg) {
               this.$message.error(response.msg)
@@ -871,12 +891,18 @@ export default {
     // 更新图表
     updateCharts (params) {
       const panelId = this.panelId ? this.panelId : this.chart.panelId
-      this.$put('panel/' + panelId + '/charts', params || this.editChart).then(response2 => {
+      const chartParams = params || this.editChart
+      chartParams.panelId = panelId
+      if (!chartParams.groupId) {
+        chartParams.groupId = -1
+      }
+      delete chartParams.panel
+      this.$put('visual/panel/chart', chartParams).then(response2 => {
         if (response2.code === 200) {
           this.esc()
           this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
           // this.$refs.chartForm.resetFields();//清空表单
-          this.$emit('on-create-success', 'update', response2.data, params)
+          this.$emit('on-create-success', 'update', response2.data, chartParams)
         } else {
           if (response2.msg) {
             this.$message.error(response2.msg)
@@ -895,7 +921,7 @@ export default {
           const params = {
             // productId: this.productId,
             // panelId: this.panelId,
-            title: this.editChart.title, // this.editChart
+            name: this.editChart.name, // this.editChart
             span: this.editChart.span,
             height: this.editChart.height,
             type: this.editChart.type,
@@ -960,13 +986,14 @@ export default {
     getAlertParam: function (param, opType) {
       this.$refs.chartForm.validate((valid) => {
         const params = {
-          title: this.editChart.title, // this.editChart
+          name: this.editChart.name, // this.editChart
           span: this.editChart.span,
           height: this.editChart.height,
           type: this.editChart.type,
           unit: this.editChart.unit,
           param: param,
-          sync: this.editChart.sync
+          sync: this.editChart.sync,
+          remark: this.editChart.remark
         }
         if (valid) {
           if (opType === 'preview') {
@@ -1025,7 +1052,7 @@ export default {
         if (this.editChart.type == 'url') {
           this.$refs.chartForm.validate((valid) => {
             const params = {
-              title: this.editChart.title, // this.editChart
+              name: this.editChart.name, // this.editChart
               span: this.editChart.span,
               height: this.editChart.height,
               type: this.editChart.type,
@@ -1033,7 +1060,8 @@ export default {
               param: {
                 url: this.editChart.param.url
               },
-              sync: this.editChart.sync
+              sync: this.editChart.sync,
+              remark: this.editChart.remark
             }
 
             if (valid) {
@@ -1053,14 +1081,15 @@ export default {
               valid = false
             }
             const params = {
-              title: this.editChart.title, // this.editChart
+              name: this.editChart.name, // this.editChart
               span: this.editChart.span,
               height: this.editChart.height,
               type: this.editChart.type,
               param: {
                 text: text
               },
-              sync: this.editChart.sync
+              sync: this.editChart.sync,
+              remark: this.editChart.remark
             }
 
             if (valid) {
@@ -1193,11 +1222,12 @@ export default {
       this.editInfo = data
       // 图表信息获取
       this.editChart.id = data.id
-      this.editChart.title = data.title
+      this.editChart.name = data.name
       this.editChart.span = data.span
       this.editChart.height = data.height + ''
       this.editChart.type = data.type
       this.editChart.unit = data.unit
+      this.editChart.remark = data.remark
       this.editChart.elements = data.elements
       if (this.editChart.type === 'url') {
         this.editChart.param.url = data.param.url
@@ -1252,11 +1282,13 @@ export default {
 
     // 初始化信息
     initInfo (unit) {
-      this.editChart.title = ''
+      this.editChart.name = ''
       this.editChart.type = 'line'
       this.editChart.span = 12
       this.editChart.height = 400 + ''
       this.editChart.unit = unit || 2
+      this.editChart.remark = ''
+      this.editChart.groupId = ''
       const param = {}
       param.last = 0
       param.url = ''
@@ -1394,13 +1426,15 @@ export default {
             const params = {
               // productId: this.productId,
               // panelId: this.panelId,
-              title: this.editChart.title, // this.editChart
+              name: this.editChart.name, // this.editChart
               span: this.editChart.span,
               height: this.editChart.height,
               type: this.editChart.type,
               unit: this.editChart.unit,
               param: this.editChart.param,
-              sync: this.editChart.sync
+              sync: this.editChart.sync,
+              remark: this.editChart.remark,
+              groupId: this.editChart.groupId
             }
             if (this.editChart.type === 'singleStat' || this.editChart.type === 'table') {
               // params.param.statistics=this.statistics;
@@ -1439,14 +1473,16 @@ export default {
       } else if (this.editChart.type == 'url') {
         this.$refs.chartForm.validate((valid) => {
           const params = {
-            title: this.editChart.title, // this.editChart
+            name: this.editChart.name, // this.editChart
             span: this.editChart.span,
             height: this.editChart.height,
             type: this.editChart.type,
             unit: this.editChart.unit,
             param: {
               url: this.editChart.param.url
-            }
+            },
+            remark: this.editChart.remark,
+            groupId: this.editChart.groupId
           }
 
           if (valid) {
@@ -1463,14 +1499,16 @@ export default {
             valid = false
           }
           const params = {
-            title: this.editChart.title, // this.editChart
+            name: this.editChart.name, // this.editChart
             span: this.editChart.span,
             height: this.editChart.height,
             type: this.editChart.type,
             unit: this.editChart.unit,
             param: {
               text: text
-            }
+            },
+            remark: this.editChart.remark,
+            groupId: this.editChart.groupId
           }
 
           if (valid) {
@@ -1626,10 +1664,14 @@ export default {
           })
         }
 
-        if (n.title) {
+        if (n.name) {
           this.isEdit = true
         }
+
         this.editChart = JSON.parse(JSON.stringify(n))
+        if (!n.groupId || n.groupId == -1) {
+          this.editChart.groupId = ''
+        }
         if (!n.param.nullType) {
           this.editChart.param.nullType = 'connected'
         }
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index c9af034fb..0c9b201fd 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -238,7 +238,7 @@ export default {
         cancelButtonText: this.$t('tip.no'),
         type: 'warning'
       }).then(() => {
-        this.$delete('panel?ids=' + u.id).then(response => {
+        this.$delete('visual/panel?ids=' + u.id).then(response => {
           if (response.code === 200) {
             this.$message({
               duration: 1000,
@@ -317,7 +317,7 @@ export default {
         cancelButtonText: this.$t('tip.no'),
         type: 'warning'
       }).then(() => {
-        this.$delete('panel/' + data.panelId + '/charts?ids=' + data.id).then(response => {
+        this.$delete('visual/panel/chart?ids=' + data.id).then(response => {
           if (response.code === 200) {
             this.$message({
               duration: 2000,
@@ -434,7 +434,7 @@ export default {
       if (!this.hasButton('panel_view')) {
         return
       }
-      this.$get('panel').then(response => {
+      this.$get('visual/panel?pageSize=-1').then(response => {
         if (response.code === 200) {
           this.panelData = response.data.list
           for (let i = 0; i < this.panelData.length; i++) {
@@ -450,7 +450,7 @@ export default {
     getTableData (clearShowPanel) {
       const vm = this
 
-      this.$get('panel?type=dashboard').then(response => {
+      this.$get('visual/panel?type=dashboard&pageSize=-1').then(response => {
         if (response.code === 200) {
           this.panelData = response.data.list
           let isInitData = false
diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json
index ca9183fea..66c3c57ef 100644
--- a/nezha-fronted/static/config.json
+++ b/nezha-fronted/static/config.json
@@ -1 +1 @@
-{"baseUrl":"", "version": "1.2.2020.11.10.14.10"}
+{"baseUrl":"http://192.168.40.42:8080/nz-admin/", "version": "1.2.2020.11.10.14.10"}