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

NEZ-311 fix:alert list图表 调整大小接口参数错误bug修复 & 项目其他图表调整线的width

Browse Source
This commit is contained in:
wangwenrui
2020-06-04 16:42:27 +08:00
parent 63a66268a2
commit 06d33dbf80
10 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nezha-fronted/src/components/charts/chart-alert-list.vue
View File

@@ -7,7 +7,7 @@
<div class="resize-box resize-box-alert" ref="resizeBox">
<div class="chart-alert-info" :id="'chartTableDiv'+chartIndex" v-show="divFirstShow" @mouseenter="caretShow=true" @mouseleave="caretShow=false">
<loading :ref="'localLoading'+chartIndex"></loading>
<div class="clearfix chartTitle" :class="{'dragTitle':dragTitleShow}" :id="'chartTitle'+chartIndex">
<div class="clearfix chartTitle" :class="{'dragTitle':dragTitleShow}" :id="'chartTitle'+chartIndex" v-show="!isPreview">
<el-popover
v-if="isError"
:close-delay=10
@@ -482,6 +482,12 @@ export default {
handler(n,o){
this.data=Object.assign({},n)
}
},
panelId:{
immediate:true,
handler(n,o){
this.panelIdInner=n
}
}
},
methods: {
@@ -584,7 +590,11 @@ export default {
type: "line",
symbol: 'none', //去掉点
smooth: 0.2, //曲线变平滑
name: ''
name: '',
lineStyle: {
width: 1,
opacity: 0.9
},
};
chartData.name += "{";
alias += "{";
@@ -626,15 +636,21 @@ export default {
})
}
},
getAlertList: function (filterType,isPreview=false) {
getAlertList: function (filterType,isPreview=false,chartInfo) {
this.resize();
this.isPreview = isPreview;
let queryParam={
pageSize:this.pageObj.pageSize,
pageNo:this.pageObj.pageNo,
}
if(this.chartInfo&&this.chartInfo.param){ //按照粒度，project>module>endpoint 查询只传最细粒度
let param=this.chartInfo.param;
let chart=null;
if(chartInfo){
chart=Object.assign({},chartInfo)
}else{
chart=Object.assign({},this.chartInfo)
}
if(chart&&chart.param){ //按照粒度，project>module>endpoint 查询只传最细粒度
let param=chart.param;
if(param.endpointId&&param.endpointId != ''){
queryParam.endpointId=param.endpointId;
}else{
@@ -887,7 +903,8 @@ export default {
next:parseInt(_this.data.next),
}
targetDiv.style.height = (Math.round((containerHeight+_this.chartSpaceHeight)/10)*10-_this.chartSpaceHeight)+'px';//图表实际渲染高度，采用个位数字四舍五入
_this.$put('panel/'+ _this.panelIdInner+'/charts/modify',modifyParams).then(response => {
console.log('chart-alert-panel-id='+this.panelId)
_this.$put('panel/'+this.panelId+'/charts/modify',modifyParams).then(response => {
if (response.code === 200) {
//更新当前图表数据
_this.data.span= span;

16
nezha-fronted/src/components/charts/chartPreview.vue
View File

@@ -57,7 +57,7 @@
</el-popover>
<div slot="title" class="chart-title">
<span class="nz-dialog-title chart-title-text">{{chart.title}}</span>
<div class="float-right panel-calendar dialog-tool" v-if="chart.type!=='url'">
<div class="float-right panel-calendar dialog-tool" v-if="chart.type!=='url' && chart.type !=='alertList'">
<time-picker ref="calendarPanel" class="nz-dashboard-picker" style="margin-top: -12px;" @change="dateChange"></time-picker>
<!--
@@ -129,7 +129,7 @@
</template>
<template v-if="chart.type === 'alertList'">
<chart-alert-list ref="alertListChart"></chart-alert-list>
<chart-alert-list ref="alertListChart" id="chartAlertListPreview"></chart-alert-list>
</template>
<loading ref="loadingPreview"></loading>
@@ -236,6 +236,8 @@
chartContainerId = 'chartUrlPreview';
}else if (chartType === 'singleStat') {
chartContainerId = 'chartSingleStatPreview';
}else if(chartType === 'alertList'){
chartContainerId = 'chartAlertListPreview';
}
//设置高度 chart-table
@@ -327,7 +329,7 @@
});
},
getAlertListChartData:function(chartInfo,filterType){
this.$refs.alertListChart.getAlertList(filterType,true);
this.$refs.alertListChart.getAlertList(filterType,true,this.chart);
this.$refs.loadingPreview.endLoading();
},
// 获取一个图表具体数据
@@ -406,6 +408,10 @@
showSymbol: false,
data: [],
type: chartItem.type,
lineStyle: {
width: 1,
opacity: 0.9
},
},
metric_name: '',
};
@@ -1112,6 +1118,10 @@
showSymbol:false,
data: [],
type:this.chart.type,
lineStyle: {
width: 1,
opacity: 0.9
},
//visible: true,
//threshold: null,
},

4
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -1120,6 +1120,10 @@
showSymbol:false,
data: [],
type:this.data.type,
lineStyle: {
width: 1,
opacity: 0.9
},
//visible: true,
//threshold: null,
},

6
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
View File

@@ -513,7 +513,11 @@
type: "line",
symbol: 'none', //去掉点
smooth: 0.2, //曲线变平滑
name: ''
name: '',
lineStyle: {
width: 1,
opacity: 0.9
},
};
chartData.name += "{";
alias += "{";

6
nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
View File

@@ -418,7 +418,11 @@
let chartData={
type:"line",
symbol:'none', //去掉点
smooth:0.2, //曲线变平滑
smooth:0.2,
lineStyle: {
width: 1,
opacity: 0.9
},
};
chartData.name=queryData.metric.__name__;
let alias=queryData.metric.__name__;

6
nezha-fronted/src/components/page/alert/list.vue
View File

@@ -514,7 +514,11 @@
type: "line",
symbol: 'none', //去掉点
smooth: 0.2, //曲线变平滑
name: ''
name: '',
lineStyle: {
width: 1,
opacity: 0.9
},
};
chartData.name += "{";
alias += "{";

2
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -73,7 +73,7 @@
<!-- begin--表单-->
<el-scrollbar class="right-box-form-box" ref="scrollbar">
<el-form class="right-box-form" :model="chart" :rules="rules" ref="chartForm">
<el-form class="right-box-form right-box-form-left" :model="chart" label-width="120px" label-position="right" :rules="rules" ref="chartForm">
<el-form-item :label="$t('dashboard.panel.title')" prop="panel" v-if="!showPanel.type">
<el-autocomplete
:fetch-suggestions="panelSuggestion"

6
nezha-fronted/src/components/page/dashboard/metricPreview.vue
View File

@@ -313,7 +313,11 @@ export default {
type:chartItem.type ? chartItem.type : 'line',
//visible: true,
//threshold: null,
chartTitle:''
chartTitle:'',
lineStyle: {
width: 1,
opacity: 0.9
},
},
metric_name: '',
};

8
nezha-fronted/src/components/page/dashboard/overview/overview2.vue
View File

@@ -513,6 +513,10 @@
smooth:0.2, //曲线变平滑
data: [],
type:'line',
lineStyle: {
width: 1,
opacity: 0.9
},
};
if (response.data.result.length > 0) {
series.data=response.data.result[0].values.map((item)=>{
@@ -545,6 +549,10 @@
smooth:0.2, //曲线变平滑
data: [],
type:'line',
lineStyle: {
width: 1,
opacity: 0.9
},
};
if (response.data.result.length > 0) {
series.data=response.data.result[0].values.map((item)=>{

4
nezha-fronted/src/components/page/dashboard/panel.vue
View File

@@ -593,7 +593,7 @@
margin-top: 3px;
text-align:left;
border-radius:4px;
width:120px;
width:260px;
height:24px;
border:solid 1px #d8dce1;
white-space: nowrap;
@@ -602,7 +602,7 @@
}
.panel-list-title {
min-height:24px;
width:100px;
width:236px;
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;