fix:添加边框 以及 panel加载两次的问题
This commit is contained in:
@@ -48,6 +48,9 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.panel-top-tools{
|
||||||
|
border-bottom: 1px solid $--border-color-light;
|
||||||
|
}
|
||||||
.top-tool-btn-group {
|
.top-tool-btn-group {
|
||||||
display: flex;
|
display: flex;
|
||||||
.top-tool-btn:not(:last-of-type):not(:first-of-type) {
|
.top-tool-btn:not(:last-of-type):not(:first-of-type) {
|
||||||
|
|||||||
@@ -372,7 +372,7 @@ export default {
|
|||||||
})
|
})
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.firstInit = false
|
this.firstInit = false
|
||||||
}, 700)
|
}, 2000)
|
||||||
this.gridLayoutLoading = false
|
this.gridLayoutLoading = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- chart外层箱子 -->
|
<!-- chart外层箱子 -->
|
||||||
<div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)">
|
<div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)" v-loading="loading">
|
||||||
<!-- title和工具栏,支持浮动 -->
|
<!-- title和工具栏,支持浮动 -->
|
||||||
<chart-header
|
<chart-header
|
||||||
v-if="!isFullscreen"
|
v-if="!isFullscreen"
|
||||||
@@ -155,12 +155,14 @@ export default {
|
|||||||
if (this.chartInfo.type === 'assetInfo') {
|
if (this.chartInfo.type === 'assetInfo') {
|
||||||
this.$get('asset/asset/' + this.chartDetailInfo.id).then(res => {
|
this.$get('asset/asset/' + this.chartDetailInfo.id).then(res => {
|
||||||
this.chartData = res.data
|
this.chartData = res.data
|
||||||
|
this.loading = false
|
||||||
})
|
})
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
if (this.chartInfo.type === 'endpointInfo') {
|
if (this.chartInfo.type === 'endpointInfo') {
|
||||||
this.$get('monitor/endpoint/' + this.chartDetailInfo.id).then(res => {
|
this.$get('monitor/endpoint/' + this.chartDetailInfo.id).then(res => {
|
||||||
this.chartData = res.data
|
this.chartData = res.data
|
||||||
|
this.loading = false
|
||||||
})
|
})
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -190,6 +192,7 @@ export default {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
case 'misc': {
|
case 'misc': {
|
||||||
|
this.loading = false
|
||||||
if (this.chartInfo.type === 'hexagon') {
|
if (this.chartInfo.type === 'hexagon') {
|
||||||
this.getHexagonFigureData().then(res => {
|
this.getHexagonFigureData().then(res => {
|
||||||
this.chartData = res
|
this.chartData = res
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
<div class="main-container">
|
<div class="main-container">
|
||||||
<div class="top-tools">
|
<div class="top-tools panel-top-tools">
|
||||||
<div v-if="panelData.length === 0" class="top-tool-left" style="margin-left: 10px;">
|
<div v-if="panelData.length === 0" class="top-tool-left" style="margin-left: 10px;">
|
||||||
<button id="panel-add-panel" class="nz-btn nz-btn-style-light nz-btn-size-small" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i> {{$t("dashboard.panel.createPanelTitleSec")}}</button>
|
<button id="panel-add-panel" class="nz-btn nz-btn-style-light nz-btn-size-small" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i> {{$t("dashboard.panel.createPanelTitleSec")}}</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -313,7 +313,7 @@ export default {
|
|||||||
this.showPanel.type = 'dashboard'
|
this.showPanel.type = 'dashboard'
|
||||||
this.filter.panelId = this.showPanel.id
|
this.filter.panelId = this.showPanel.id
|
||||||
// this.dateChange()
|
// this.dateChange()
|
||||||
this.getTableData()
|
// this.getTableData()
|
||||||
this.getData(this.filter)
|
this.getData(this.filter)
|
||||||
this.$refs.chartList.cleanData()
|
this.$refs.chartList.cleanData()
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user