gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改全屏切换堆叠后 tooltip显示不正确的问题

Browse Source
This commit is contained in:
zhangyu
2021-04-01 14:05:35 +08:00
parent 657ae8418d
commit a828bb3905
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -938,6 +938,7 @@ export default {
window.addEventListener('resize', this.chartResize) window.addEventListener('resize', this.chartResize)
getChart(this.chartIndex).on('magictypechanged', function (params) { getChart(this.chartIndex).on('magictypechanged', function (params) {
self.isStackArea = !self.isStackArea self.isStackArea = !self.isStackArea
console.log(params,self.isStackArea);
if (self.isStackArea) { if (self.isStackArea) {
getChart(self.chartIndex).setOption({ getChart(self.chartIndex).setOption({
toolbox: { toolbox: {
@@ -1138,16 +1139,25 @@ export default {
formatter: function (params) { formatter: function (params) {
let str = '<div>' let str = '<div>'
let sum = 0 let sum = 0
let minusFlag = true
params.forEach((item, i) => { params.forEach((item, i) => {
const tip = legend[item.seriesIndex] const tip = legend[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex] const color = self.bgColorList[item.seriesIndex]
if (i === 0) { if (i === 0 && tip.alias.indexOf('Previous ') === -1) {
const value = item.data[0] const value = item.data[0]
const tData = new Date(value) const tData = new Date(value)
str += '<div style="margin-bottom: 5px">' str += '<div style="margin-bottom: 5px">'
str += bus.timeFormate(tData) str += bus.timeFormate(tData)
str += '</div>' str += '</div>'
} }
if (tip.alias.indexOf('Previous ') !== -1 && minusFlag) {
const value = item.data[0] - minusTime
const tData = new Date(value)
str += '<div style="margin-bottom: 5px;margin-top: 5px">'
str += bus.timeFormate(tData)
str += '</div>'
minusFlag = false
}
let val = parseFloat(Number(item.data[1]).toFixed(2)) let val = parseFloat(Number(item.data[1]).toFixed(2))
if (val === 0) { if (val === 0) {
val = Number(item.data[1]).toExponential(2) val = Number(item.data[1]).toExponential(2)

3
nezha-fronted/src/components/common/multipleTime.vue
View File

@@ -113,7 +113,8 @@
<template> <template>
<div class="multiple-time-box"> <div class="multiple-time-box">
<div :class="showDropdown?'compare-box':''"><i class="nz-icon nz-icon-compare" @click="changeShowDropdown" /></div> <div :class="showDropdown?'compare-box':''"><i class="nz-icon nz-icon-compare" @click="changeShowDropdown" /></div>
<transition name="multiple-time-datepicker"> <!-- name="multiple-time-datepicker"-->
<transition>
<div class="calendar top-tools" id="panel-calender" v-show="showDropdown"> <div class="calendar top-tools" id="panel-calender" v-show="showDropdown">
<el-date-picker prefix-icon=" " size="mini" ref="calendar" <el-date-picker prefix-icon=" " size="mini" ref="calendar"
format="yyyy/MM/dd HH:mm:ss" class="panel-time-picker-hidden" @change="dateChange" v-model="startTime" type="datetime" format="yyyy/MM/dd HH:mm:ss" class="panel-time-picker-hidden" @change="dateChange" v-model="startTime" type="datetime"