NEZ-305 feat:chart 没有数据时显示xy坐标轴及网格

This commit is contained in:
wangwenrui
2020-06-03 18:58:07 +08:00
parent f8b91ed928
commit 0d898ab0bf
4 changed files with 106 additions and 18 deletions

View File

@@ -467,7 +467,7 @@
this.$nextTick(() => { this.$nextTick(() => {
if (this.dataList.length > 0 ) { if (this.dataList.length > 0 ) {
this.dataList.forEach((item,index) => { this.dataList.forEach((item,index) => {
this.$refs['editChart'+item.id][0].showLoad(item);//之后要实现 this.$refs['editChart'+item.id][0].showLoad(item);//之后要实现
this.setChartSize(item.span, index);//设置该图表宽度 this.setChartSize(item.span, index);//设置该图表宽度
if(!item.isLoaded ){ if(!item.isLoaded ){
@@ -609,7 +609,7 @@
} }
}else { }else {
if (!isSearch && this.$refs['editChart'+item.id] && this.$refs['editChart'+item.id][0]) { if (!isSearch && this.$refs['editChart'+item.id] && this.$refs['editChart'+item.id][0]) {
this.$refs['editChart'+item.id][0].showLoad(item); this.$refs['editChart'+item.id][0].showLoad(item);
} }
this.setChartSize(item, realIndex); // 设置该图表宽度 this.setChartSize(item, realIndex); // 设置该图表宽度
@@ -984,6 +984,10 @@
smooth: 0.2, //曲线变平滑 smooth: 0.2, //曲线变平滑
showSymbol: false, showSymbol: false,
data: [], data: [],
lineStyle: {
width: 1,
opacity: 0.9
},
type: chartInfo.type, type: chartInfo.type,
}, },
//visible: true, //visible: true,
@@ -1320,7 +1324,7 @@
this.chartDataCacheGroup.set(duplicateChartId,duplicateChartData); this.chartDataCacheGroup.set(duplicateChartId,duplicateChartData);
this.$nextTick(() => { this.$nextTick(() => {
if (this.$refs['editChart'+duplicateChartId][0]) { if (this.$refs['editChart'+duplicateChartId][0]) {
this.$refs['editChart'+duplicateChartId][0].showLoad(duplicateChart);//之后要实现 this.$refs['editChart'+duplicateChartId][0].showLoad(duplicateChart);//之后要实现
} }
@@ -1404,7 +1408,7 @@
if(chartType!=='url'){ if(chartType!=='url'){
that.getChartDataForSearch(item,index); that.getChartDataForSearch(item,index);
} else { } else {
that.$refs['editChart'+item.id][0].showLoad(item); that.$refs['editChart'+item.id][0].showLoad(item);
} }
} }

View File

@@ -42,7 +42,7 @@
</div> </div>
<div class="line-area" ref="lineChartArea" :id="'lineChartArea'+chartIndex" v-show="firstShow" style="width:100%;"></div> <div class="line-area" ref="lineChartArea" :id="'lineChartArea'+chartIndex" v-show="firstShow" style="width:100%;"></div>
<div style="position: absolute;top:50%;left:50%;" v-show="noData">No data</div>
<div class="legend-container" id="legendArea" ref="legendArea" v-show="firstShow" v-scrollBar:legend> <div class="legend-container" id="legendArea" ref="legendArea" v-show="firstShow" v-scrollBar:legend>
<div v-for="(item, index) in legendList" :title="item.alias?item.alias:item.name" @click="clickLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGrey[index]}" :key="'legend_' + item.name+'_'+index"> <div v-for="(item, index) in legendList" :title="item.alias?item.alias:item.name" @click="clickLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGrey[index]}" :key="'legend_' + item.name+'_'+index">
<span class="legend-shape" :style="{background:(isGrey[index]?'#D3D3D3':bgColorList[index])}"></span>{{item.alias?item.alias:item.name}} <span class="legend-shape" :style="{background:(isGrey[index]?'#D3D3D3':bgColorList[index])}"></span>{{item.alias?item.alias:item.name}}
@@ -78,7 +78,7 @@
</div> </div>
</div> </div>
<div class="line-area" ref="screenShowArea" id="screenShowArea" style="margin-top:0px;" @mouseenter="mouseEnterFullChart" @mouseleave="mouseLeaveFullChart"></div> <div class="line-area" ref="screenShowArea" id="screenShowArea" style="margin-top:0px;" @mouseenter="mouseEnterFullChart" @mouseleave="mouseLeaveFullChart"></div>
<div style="position: absolute;top:50%;left:50%;" v-show="noData">No data</div>
<div class="legend-container legend-container-screen" :id="'screenLegendArea'+chartIndex" @mouseenter="mouseEnterFullChart" @mouseleave="mouseLeaveFullChart" v-show="showLegend" v-scrollBar:legend> <div class="legend-container legend-container-screen" :id="'screenLegendArea'+chartIndex" @mouseenter="mouseEnterFullChart" @mouseleave="mouseLeaveFullChart" v-show="showLegend" v-scrollBar:legend>
<div v-for="(item, index) in screenLegendList" :title="item.alias?item.alias:item.name" @click="clickScreenLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGreyScreen[index]}" :key="'legend_' + item.name+'_'+index"> <div v-for="(item, index) in screenLegendList" :title="item.alias?item.alias:item.name" @click="clickScreenLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGreyScreen[index]}" :key="'legend_' + item.name+'_'+index">
<span class="legend-shape" :style="{background:(isGreyScreen[index]?'#D3D3D3':bgColorList[index])}"></span>{{item.alias?item.alias:item.name}} <span class="legend-shape" :style="{background:(isGreyScreen[index]?'#D3D3D3':bgColorList[index])}"></span>{{item.alias?item.alias:item.name}}
@@ -101,6 +101,7 @@
import chartDataFormat from './chartDataFormat' import chartDataFormat from './chartDataFormat'
import {randomcolor} from '../common/js/radomcolor/randomcolor.js' import {randomcolor} from '../common/js/radomcolor/randomcolor.js'
import timePicker from '../common/timePicker' import timePicker from '../common/timePicker'
import chartConfig from "../page/dashboard/overview/chartConfig";
export default { export default {
name: 'lineChartBlock', name: 'lineChartBlock',
components: { components: {
@@ -133,6 +134,7 @@
data() { data() {
return { return {
data: {}, // 该图表信息,chartItem data: {}, // 该图表信息,chartItem
noData:false,
seriesItem: [], // 保存信息 seriesItem: [], // 保存信息
seriesItemScreen:[], seriesItemScreen:[],
images: '', images: '',
@@ -616,14 +618,27 @@
show: true, show: true,
}, },
splitLine:{ splitLine:{
show:true show:true,
lineStyle: {
color: "#d9d9d9",
opacity: 0.8,
width: 1
}
},
axisTick: {
show: false
}, },
//boundaryGap:['20%', '0'], //boundaryGap:['20%', '0'],
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
splitLine:{ splitLine:{
show:true show:true,
lineStyle: {
color: "#d9d9d9",
opacity: 0.8,
width: 1
}
}, },
//去掉y轴--start //去掉y轴--start
axisLine:{ axisLine:{
@@ -669,8 +684,17 @@
}else { }else {
self.echartStore.resize({height:(chartInfo.height-divHeight-self.$chartResizeTool.titleHeight-self.$chartResizeTool.chartBlankHeight)}); self.echartStore.resize({height:(chartInfo.height-divHeight-self.$chartResizeTool.titleHeight-self.$chartResizeTool.chartBlankHeight)});
} }
self.echartStore.clear(); if(dataArg&&dataArg.length>0){
self.echartStore.setOption(option);//创建图表 self.echartStore.clear();
self.echartStore.setOption(option);//创建图表
self.noData=false;
}else{
self.noData=true;
option=chartConfig.getOption('noData')
self.echartStore.clear();
self.echartStore.setOption(option);//创建图表
}
self.$refs['localLoading'+self.chartIndex].endLoading(); self.$refs['localLoading'+self.chartIndex].endLoading();
self.firstShow = true; // 展示操作按键 self.firstShow = true; // 展示操作按键
}, 100); }, 100);
@@ -766,7 +790,15 @@
//console.log("11____00",sumHeight,divHeight,legendDiv) //console.log("11____00",sumHeight,divHeight,legendDiv)
self.$refs.screenShowArea.style.height = `${sumHeight - divHeight - self.screenTitleHeight}px`; self.$refs.screenShowArea.style.height = `${sumHeight - divHeight - self.screenTitleHeight}px`;
self.echartModalStore.resize({height: (sumHeight - divHeight - self.screenTitleHeight)});//图表的高度 self.echartModalStore.resize({height: (sumHeight - divHeight - self.screenTitleHeight)});//图表的高度
self.echartModalStore.setOption(option);//显示全屏界面 if(dataArg&&dataArg.length>0){
self.echartModalStore.setOption(option);//显示全屏界面
self.noData=false;
}else{
self.noData=true;
option=chartConfig.getOption('noData')
self.echartModalStore.setOption(option);//显示全屏界面
}
}, 100) }, 100)
this.echartModalStore.on('magictypechanged', function (params) { this.echartModalStore.on('magictypechanged', function (params) {

View File

@@ -309,6 +309,10 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
showSymbol:false, showSymbol:false,
smooth: 0.2, //曲线变平滑 smooth: 0.2, //曲线变平滑
data: [], data: [],
lineStyle: {
width: 1,
opacity: 0.9
},
type: 'line', type: 'line',
} }
seriesItem.data = result.values.map((item) => { seriesItem.data = result.values.map((item) => {
@@ -337,14 +341,12 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
this.$refs['promql-'+promqlIndex][0].setError(response.data.error) this.$refs['promql-'+promqlIndex][0].setError(response.data.error)
} }
}) })
if(series.length>0){
this.$refs.exploreChart.setLegend(legend); this.$refs.exploreChart.setLegend(legend);
this.$refs.exploreChart.setRandomColors(series.length) this.$refs.exploreChart.setRandomColors(series.length)
this.$refs.exploreChart.setSeries(series) this.$refs.exploreChart.setSeries(series)
this.defaultChartVisible = true; this.defaultChartVisible = true;
}else{
// this.defaultChartVisible = false;
}
} }
this.$refs.exploreChart.endLoading(); this.$refs.exploreChart.endLoading();

View File

@@ -89,13 +89,23 @@
show: true, show: true,
}, },
splitLine:{ splitLine:{
show:false show:true,
lineStyle: {
color: "#d9d9d9",
opacity: 0.8,
width: 1
}
} }
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
splitLine:{ splitLine:{
show:true show:true,
lineStyle: {
color: "#d9d9d9",
opacity: 0.8,
width: 1
}
}, },
axisLabel: { axisLabel: {
// formatter:null, // formatter:null,
@@ -312,12 +322,52 @@
useUTC: false,//使用本地时间 useUTC: false,//使用本地时间
series: [], series: [],
}; };
const noDataOption={
grid: {
top: 30,
left: 0,
right: 30,
containLabel: true,
bottom:8,//156
},
xAxis: {
type: 'category',
data: createTempTimes(),
splitLine:{
show:true
},
axisTick: {
show: false
},
},
yAxis: {
type: 'category',
data: [1, 3, 5, 7, 9, 11, 13],
splitLine:{
show:true
},
axisTick: {
show: false
},
},
series: null,
};
function createTempTimes(){
let times=[];
for(let i=0;i<10;i++){
let time=new Date();
time.setMinutes(new Date().getMinutes()-(10-i)*5);
times.push(bus.timeFormate(time,'hh:mm'))
}
return times;
}
const chartTypes={ const chartTypes={
line:{name:'line',option:commonOption}, line:{name:'line',option:commonOption},
overviewLine: {name: 'line', option: overviewLine}, overviewLine: {name: 'line', option: overviewLine},
map:{name:'map',option:mapOptions}, map:{name:'map',option:mapOptions},
pie: {name: 'assetType', option: assetTypePie}, pie: {name: 'assetType', option: assetTypePie},
bar: {name: 'alertMessage', option: alertMessageBar} bar: {name: 'alertMessage', option: alertMessageBar},
noData:{name:'noData',option:noDataOption},
}; };
export default { export default {
getOption:function(type){ getOption:function(type){