fix：修改 legend显示不正常的问题

2021-12-23 11:29:29 +08:00
parent 8c46345aa1
commit db89eb8417
8 changed files with 13 additions and 17 deletions
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -73,7 +73,6 @@ export default {
      this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
      this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss')
      this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss')
-      console.log(this.filter)
      this.filter.value = this.searchTime[2]
      this.filter.id = this.$refs.pickTime.$refs.timePicker.showTime.id
      setTimeout(() => {
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -69,7 +69,6 @@ export default {
  },
  methods: {
    initChart (chartOption = this.chartOption) {
-      console.log(123)
      this.legends = []
      chartOption.series = this.handleTimeSeries(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends
      if (this.isNoData) {
--- a/nezha-fronted/src/components/chart/chartHeader.vue
+++ b/nezha-fronted/src/components/chart/chartHeader.vue
@@ -13,7 +13,7 @@
           </span>
          </el-popover>
    </span>
-    <span v-if="!isError&&!showAllData&&allDataLength>10" class="chart-header-error moreTitle">
+    <span v-if="!isError&&!showAllData&&allDataLength>20" class="chart-header-error moreTitle">
     <el-popover
       placement="top-start"
       :close-delay=10
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -155,7 +155,6 @@ export default {
      }
      if (dom) {
        this.stepWidth = Math.floor(dom.offsetWidth / 12)
-        console.log(this.stepWidth)
        if (!this.isGroup) {
          const headerH = 50 / this.stepWidth
          const headerHPadding = 50 / this.stepWidth
@@ -217,7 +216,6 @@ export default {
    },
    changeGroupHeight (copyList, group, flag) {
      const height = getGroupHeight(copyList)
-      console.log(height,copyList[0].h, group, flag)
      // console.log(this.$refs.layout)
      const groupFind = this.copyDataList.find(item => item.id == group.id)
      if (group && groupFind) {
@@ -300,7 +298,6 @@ export default {
            let top = dom.style.transform.split(',')[1]
            top = top.substring(0, top.length - 2)
            const mainOffsetTop = top - this.stepWidth + 14// transform: grid组件 通过 tranfrom 控制位置 中间的为y的值 通过截取获得 - 父元素 marginTop的 值。
-            console.log(mainOffsetTop)
            // 2.元素的高度
            const mainHeight = itemHeight // ele.offsetHeight;//itemHeight;
            // 3.页面滚动的距离
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -44,7 +44,6 @@ export default {
      let colorIndex = 0
      originalDatas.forEach((originalData, expressionIndex) => {
        originalData.forEach((data, dataIndex) => {
-          console.log(this.showAllData)
          if (colorIndex >= 20 && !this.showAllData) {
            colorIndex++
            return
@@ -114,6 +113,9 @@ export default {
      if (!alias) {
        alias = legend
      }
+      if (alias == 'Previous ') {
+        alias += legend
+      }
      // proj_status_
      const name = alias + '-' + dataIndex

@@ -130,6 +132,7 @@ export default {
        this.colorList.push(colorRandom)
        this.chartOption.color.push(colorRandom)
      }
+      // console.log(name, alias, statistics)
      this.legends.push({ name, alias, statistics, color: this.colorList[colorIndex] })
      return {
        name,
@@ -150,6 +153,9 @@ export default {
        })
        return labelValue
      } else {
+        if (!aliasExpression) {
+          return ''
+        }
        return aliasExpression
      }
    },
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -100,7 +100,6 @@ export default {
  methods: {
    isGroup,
    dateChange (filter, multipleTime) {
-      console.log(filter, multipleTime)
      this.loading = true
      // TODO assetInfo、endpointInfo、echarts等进行不同的处理
      let startTime = filter.start_time
@@ -174,7 +173,6 @@ export default {
              return this.$get(query)
            })
            if (this.multipleTime) {
-              console.log(123)
              const multipleRequests = elements.map((element) => {
                if (this.from === fromRoute.chartTemp) {
                  return chartTempData
@@ -190,7 +188,6 @@ export default {
                return this.$get(query)
              })
              requests = requests.concat(multipleRequests)
-              console.log(requests)
            }
            const chartData = []
            axios.all(requests).then((res) => {
@@ -207,7 +204,6 @@ export default {
                  }
                } else {
                  if (r.status === 'success') {
-                    console.log(r.data.result)
                    r.data.result.forEach(item => {
                      this.allDataLength++
                      item.values.forEach(values => {
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -12,7 +12,6 @@ export default {
        setTimeout(() => {
          this.setSearchInput(val, qv)
        }, 200)
-        console.log()
        qv && this.$set(val.target, val.propertyName, qv)
      })
    },
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -34,11 +34,11 @@
              </select-panel>
            </div>
            <div class="top-tool-right">
-              <div class="top-tool-search margin-r-20">
-                <el-input id="queryPanel" ref="queryPanel" v-model="filter.searchName" class="query-input-inactive"  clearable size="small" @blur="blurInput" @clear="clearInput" @focus="focusInput">
-                  <i slot="suffix" class="el-input__icon nz-icon nz-icon-search" style="float: right" @click="focusInput"></i>
-                </el-input>
-              </div>
+<!--              <div class="top-tool-search margin-r-20">-->
+<!--                <el-input id="queryPanel" ref="queryPanel" v-model="filter.searchName" class="query-input-inactive"  clearable size="small" @blur="blurInput" @clear="clearInput" @focus="focusInput">-->
+<!--                  <i slot="suffix" class="el-input__icon nz-icon nz-icon-search" style="float: right" @click="focusInput"></i>-->
+<!--                </el-input>-->
+<!--              </div>-->

              <pick-time id="panel" ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false" class="margin-r-10"></pick-time>