fix:添加边框 以及 panel加载两次的问题

This commit is contained in:
zhangyu
2021-12-21 19:48:01 +08:00
parent c1c5b9541b
commit 92b45dbefd
4 changed files with 10 additions and 4 deletions

View File

@@ -48,6 +48,9 @@
display: flex;
}
}
.panel-top-tools{
border-bottom: 1px solid $--border-color-light;
}
.top-tool-btn-group {
display: flex;
.top-tool-btn:not(:last-of-type):not(:first-of-type) {

View File

@@ -372,7 +372,7 @@ export default {
})
setTimeout(() => {
this.firstInit = false
}, 700)
}, 2000)
this.gridLayoutLoading = false
})
}

View File

@@ -1,6 +1,6 @@
<template>
<!-- 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和工具栏支持浮动 -->
<chart-header
v-if="!isFullscreen"
@@ -155,12 +155,14 @@ export default {
if (this.chartInfo.type === 'assetInfo') {
this.$get('asset/asset/' + this.chartDetailInfo.id).then(res => {
this.chartData = res.data
this.loading = false
})
break
}
if (this.chartInfo.type === 'endpointInfo') {
this.$get('monitor/endpoint/' + this.chartDetailInfo.id).then(res => {
this.chartData = res.data
this.loading = false
})
break
}
@@ -190,6 +192,7 @@ export default {
break
}
case 'misc': {
this.loading = false
if (this.chartInfo.type === 'hexagon') {
this.getHexagonFigureData().then(res => {
this.chartData = res

View File

@@ -7,7 +7,7 @@
</transition>
</div>
<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;">
<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>&nbsp;&nbsp;{{$t("dashboard.panel.createPanelTitleSec")}}</button>
</div>
@@ -313,7 +313,7 @@ export default {
this.showPanel.type = 'dashboard'
this.filter.panelId = this.showPanel.id
// this.dateChange()
this.getTableData()
// this.getTableData()
this.getData(this.filter)
this.$refs.chartList.cleanData()
},