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

样式调整

Browse Source
This commit is contained in:
zhangyu
2020-08-25 17:13:46 +08:00
parent 8f02a0b33b
commit 5ff8472565
2 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/components/common/project/popData/lineChart.vue
View File

@@ -1,6 +1,11 @@
<style lang="scss"> <style lang="scss">
@import './chart.scss'; @import './chart.scss';
</style> </style>
<style scoped>
.resize-box{
border: none;
}
</style>
<template> <template>
<div class="nz-chart-resize"> <div class="nz-chart-resize">
<div class="resize-shadow" ref="resizeShadow"></div> <div class="resize-shadow" ref="resizeShadow"></div>
@@ -733,7 +738,7 @@
if(!chartInfo.height){ if(!chartInfo.height){
self.echartStore.resize({height:228}); self.echartStore.resize({height:228});
}else { }else {
self.echartStore.resize({height:228}); self.echartStore.resize({height:(chartInfo.height-divHeight-this.$chartResizeTool.titleHeight-this.$chartResizeTool.chartBlankHeight)});
} }
if(dataArg&&dataArg.length>0){ if(dataArg&&dataArg.length>0){
self.echartStore.clear(); self.echartStore.clear();
@@ -1415,7 +1420,7 @@
this.$nextTick(()=>{ this.$nextTick(()=>{
let divHeight = this.$refs.legendArea.offsetHeight; let divHeight = this.$refs.legendArea.offsetHeight;
if(!this.chartInfo.height){ if(!this.chartInfo.height){
this.echartStore.resize({height:(400-divHeight-this.$chartResizeTool.titleHeight-this.$chartResizeTool.chartBlankHeight)}); this.echartStore.resize({height:228});
}else { }else {
this.echartStore.resize({height:(this.chartInfo.height-divHeight-this.$chartResizeTool.titleHeight-this.$chartResizeTool.chartBlankHeight)}); this.echartStore.resize({height:(this.chartInfo.height-divHeight-this.$chartResizeTool.titleHeight-this.$chartResizeTool.chartBlankHeight)});
} }

15
nezha-fronted/src/components/common/project/popData/totalChart.vue
View File

@@ -1,5 +1,8 @@
<template> <template>
<div> <div
v-scrollBar:chart-box
class="chart-box"
>
<div v-for="(item, index) in dataList" :key="item.id" :id="'chart-' + item.id" :name="item.title" v-show="!item.isHide" class="chart"> <div v-for="(item, index) in dataList" :key="item.id" :id="'chart-' + item.id" :name="item.title" v-show="!item.isHide" class="chart">
<lineChars <lineChars
v-if="item.type === 'line' || item.type === 'bar' ||item.type == 'stackArea' || item.type === 4" v-if="item.type === 'line' || item.type === 'bar' ||item.type == 'stackArea' || item.type === 4"
@@ -13,7 +16,6 @@
v-loading="item.loading" v-loading="item.loading"
@loadingFalse="loadingFalse" @loadingFalse="loadingFalse"
> >
</lineChars> </lineChars>
</div> </div>
</div> </div>
@@ -712,5 +714,14 @@
.chart{ .chart{
width: 500px; width: 500px;
height: 300px; height: 300px;
border: 1px solid #FFFFFF;
box-shadow: 1px 2px 4px 0 rgba(0,0,0,0.12), -1px 1px 9px -1px rgba(205,205,205,0.77);
margin-bottom: 15px;
}
.chart-box{
/*padding-left: 600px;*/
position: relative;
height: calc(100vh - 100px);
padding: 3px 15px 300px 15px;
} }
</style> </style>