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

fix：修改topologo 折线图显示的问题

Browse Source
This commit is contained in:
zhangyu
2021-06-03 14:30:58 +08:00
parent 26a6e69d71
commit a925bf6dc1
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -979,10 +979,10 @@ export default {
id: 'stackArea', id: 'stackArea',
name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label') name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label')
}, },
{ // {
id: 'bar', // id: 'bar',
name: this.$t('dashboard.panel.chartForm.typeVal.bar.label') // name: this.$t('dashboard.panel.chartForm.typeVal.bar.label')
}, // },
{ {
id: 'table', id: 'table',
name: this.$t('dashboard.panel.chartForm.typeVal.table.label') name: this.$t('dashboard.panel.chartForm.typeVal.table.label')

25
nezha-fronted/src/components/common/project/L5/topoTooltip.vue
View File

@@ -1,17 +1,18 @@
<template> <template>
<div class="tooltip-box" style="display: flex;" v-if="(isChart||chartData.tooltipShow)&&chartData.expressArr.length"> <div class="tooltip-box" style="display: flex;" v-if="(isChart||chartData.tooltipShow)&&chartData.expressArr.length">
<div class="tooltip-box-chart" style="" v-if="isChart||(chartData.displayChart&&chartData.tooltipShow&&chartData.expressArr.length)"> <div class="tooltip-box-chart" style="" v-if="isChart||(chartData.displayChart&&chartData.tooltipShow&&chartData.expressArr.length)">
<line-chart-block v-show="isChart || chartData.type !== 'table'" <line-chart-block v-show="isChart || chartData.type !== 'table'"
:key="'inner' + chartData.id" :key="'inner' + chartData.id"
:from="'project'" id="listContainer"
:ref="chartData.type !== 'table'?'editChart' + chartData.type:'editChart'" :from="'project'"
:temp-dom="tempDom" :ref="chartData.type !== 'table'?'editChart' + chartData.type:'editChart'"
:panel-id="-1" :temp-dom="tempDom"
:is-lock="true" :panel-id="-1"
:chart-index="0" :is-lock="true"
:chartTitleShow="false" :chart-index="0"
:chart-data="chartData"> :chartTitleShow="false"
</line-chart-block> :chart-data="chartData">
</line-chart-block>
<chart-table v-show="isChart || chartData.type === 'table'" <chart-table v-show="isChart || chartData.type === 'table'"
:key="'inner' + 1" :key="'inner' + 1"
:from="'project'" :from="'project'"
@@ -61,7 +62,7 @@ export default {
data () { data () {
return { return {
tempDom: { height: 400, width: '' }, tempDom: { height: 400, width: '' },
chartDataTemp: { id: 8832, prev: null, next: null, panelId: 0, title: '123', span: 12, height: 400, createAt: '2021-01-27 07:36:19', unit: 2, weight: 0, pid: null, buildIn: null, seq: null, param: { last: 0, legendValue: { total: 'off', min: 'off', avg: 'off', last: 'off', max: 'off' }, threshold: '', url: '', nullType: 'connected' }, sync: null, asset: null, isLoaded: true, from: '__vue_devtool_undefined__', draggable: true, resizable: true, editable: true }, chartDataTemp: { id: 8832, prev: null, next: null, panelId: 0, title: '123', span: 12, height: 12, createAt: '2021-01-27 07:36:19', unit: 2, weight: 0, pid: null, buildIn: null, seq: null, param: { last: 0, legendValue: { total: 'off', min: 'off', avg: 'off', last: 'off', max: 'off' }, threshold: '', url: '', nullType: 'connected' }, sync: null, asset: null, isLoaded: true, from: '__vue_devtool_undefined__', draggable: true, resizable: true, editable: true },
chartData: {}, chartData: {},
filter: { filter: {
end_time: bus.timeFormate(bus.getOffsetTimezoneData(), 'yyyy-MM-dd hh:mm:ss'), end_time: bus.timeFormate(bus.getOffsetTimezoneData(), 'yyyy-MM-dd hh:mm:ss'),