fix:修改BUG

dashboard模块图表
1.tooltip去掉指定label功能去掉
2.图表高度调整
3.y轴刻度数值显示不全
4.metric的expert模式进行格式化,去掉空白字符
5.tooltip内容格式调整优化(一行显示,超出显示省略号,提示框显示位置等调整)
This commit is contained in:
hanyuxia
2020-02-14 17:57:15 +08:00
parent e7d0ff62e8
commit 0324219e40
6 changed files with 1115 additions and 1048 deletions

View File

@@ -9,12 +9,13 @@
} }
.list-width{ .list-width{
width:98%; width:98%;
overflow-x:hidden;/*避免鼠标第一次放到曲线时x轴出现滚动条后消失*/
} }
</style> </style>
<template> <template>
<div class="list-width"> <div class="list-width">
<div class="chartBox" v-for="(item, index) in dataList" :key="item.id"> <div class="chartBox" v-for="(item, index) in dataList" :key="item.id" :id="item.title+'_'+item.id">
<line-chart-block v-if="item.type === 'line' || item.type === 'bar' || item.type === 4" :key="'inner' + item.id" <line-chart-block v-if="item.type === 'line' || item.type === 'bar' || item.type === 4" :key="'inner' + item.id"
ref="editChart" ref="editChart"

View File

@@ -2,10 +2,12 @@
.clearfix:after{ .clearfix:after{
display: block; display: block;
content: ""; content: "";
height:0;
visibility:hidden;
clear: both; clear: both;
} }
.clearfix{ .clearfix{
margin-bottom: 20px; //margin-bottom: 20px;
} }
.legend-shape{ .legend-shape{
display:inline-block; display:inline-block;

File diff suppressed because it is too large Load Diff

View File

@@ -275,6 +275,9 @@ export default {
if (this.pointer === pointer) { if (this.pointer === pointer) {
this.$refs.elementInfo.validate((valid) => { this.$refs.elementInfo.validate((valid) => {
if (valid) {//根据设置的rules进行验证验证通过则返回继续进行保存每个el-form-item都需要验证 if (valid) {//根据设置的rules进行验证验证通过则返回继续进行保存每个el-form-item都需要验证
if(this.elementInfo.expression){
this.elementInfo.expression = this.elementInfo.expression.replace(/\s+|&nbsp;/ig,'');
}
this.$emit('on-add-target-success', this.elementInfo, pointer); this.$emit('on-add-target-success', this.elementInfo, pointer);
} }
}); });

View File

@@ -304,6 +304,9 @@ export default {
saveTarget() { saveTarget() {
this.$refs.elementInfo.validate((valid) => { this.$refs.elementInfo.validate((valid) => {
if (valid) { if (valid) {
if(this.elementInfo.expression){
this.elementInfo.expression = this.elementInfo.expression.replace(/\s+|&nbsp;/ig,'');
}
this.$emit('on-add-target-success', this.elementInfo); this.$emit('on-add-target-success', this.elementInfo);
} }
}); });

View File

@@ -23,8 +23,6 @@
} }
.chart-preview-area { .chart-preview-area {
height: calc(100% - 180px); height: calc(100% - 180px);
overflow-y: auto;
overflow-x: hidden;
position: relative position: relative
} }
.common-detail-top-title { .common-detail-top-title {