fix:修改BUG
dashboard模块 1.panel 图表tooltip在鼠标移出图表区时,无法隐藏 2.调整图表区域的空白(曲线图,datazoom,legend) 3.panel下拉列表限制最大宽度,超长内容 ... 显示,鼠标悬浮显示全部内容,列表框宽度固定宽度,增加border效果
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
color:lightgray;
|
color:lightgray;
|
||||||
}
|
}
|
||||||
.legend-container{
|
.legend-container{
|
||||||
width: calc(100% - 130px);
|
width: calc(100% - 30px);
|
||||||
max-height:80px;
|
max-height:80px;
|
||||||
min-height:40px;
|
min-height:40px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="line-area" style="border:solid 0px red;" ref="lineChartArea" id="lineChartArea" v-show="firstShow"></div>
|
<div class="line-area" ref="lineChartArea" id="lineChartArea" v-show="firstShow"></div>
|
||||||
|
|
||||||
<div class="legend-container" id="legendArea" ref="legendArea" v-show="firstShow">
|
<div class="legend-container" id="legendArea" ref="legendArea" v-show="firstShow">
|
||||||
<div v-for="(item, index) in legendList" :title="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.name" @click="clickLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGrey[index]}" :key="'legend_' + item.name+'_'+index">
|
||||||
@@ -344,7 +344,7 @@
|
|||||||
trigger: 'axis',
|
trigger: 'axis',
|
||||||
confine:false,
|
confine:false,
|
||||||
extraCssText:'z-index:1000;',
|
extraCssText:'z-index:1000;',
|
||||||
enterable:true,
|
/*enterable:true, 导致tooltip不消失,显示多个tooltip*/
|
||||||
position:function(point,params,dom,rect,size){
|
position:function(point,params,dom,rect,size){
|
||||||
dom.style.transform = "translateZ(0)";
|
dom.style.transform = "translateZ(0)";
|
||||||
//提示框位置
|
//提示框位置
|
||||||
@@ -510,10 +510,10 @@
|
|||||||
grid: {
|
grid: {
|
||||||
//height:"50%",
|
//height:"50%",
|
||||||
top: 13,
|
top: 13,
|
||||||
left: 65,
|
left: 0,
|
||||||
right: 45,
|
right: 30,
|
||||||
containLabel: false,
|
containLabel: true,
|
||||||
bottom:70,//156
|
bottom:35,//156
|
||||||
},
|
},
|
||||||
dataZoom: [{
|
dataZoom: [{
|
||||||
type: 'slider',
|
type: 'slider',
|
||||||
@@ -522,7 +522,9 @@
|
|||||||
start: 0,
|
start: 0,
|
||||||
end: 100,
|
end: 100,
|
||||||
height:25,
|
height:25,
|
||||||
bottom:10//96
|
bottom:10,//96
|
||||||
|
left:40,
|
||||||
|
right:48,
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
, {
|
, {
|
||||||
|
|||||||
@@ -10,14 +10,22 @@
|
|||||||
<div class="content-right">
|
<div class="content-right">
|
||||||
<div class="top-tools">
|
<div class="top-tools">
|
||||||
<div>
|
<div>
|
||||||
<el-dropdown @command="panelChange" trigger="click">
|
<el-dropdown @command="panelChange" class="panel-dropdown-title" trigger="click" >
|
||||||
<span class="el-dropdown-link">
|
<el-row :gutter="10" class="el-dropdown-link" style="">
|
||||||
{{showPanel.name}}<i class="el-icon-arrow-down el-icon--right"></i>
|
<el-col :span="21" class="panel-list-title" :title="showPanel.name">{{showPanel.name}}</el-col>
|
||||||
</span>
|
<el-col :span="3" style="padding-left:0px !important;"><i class="el-icon-arrow-down el-icon--right"></i></el-col>
|
||||||
<el-dropdown-menu class="nz-dashboard-dropdown" slot="dropdown">
|
</el-row>
|
||||||
|
<el-dropdown-menu class="nz-dashboard-dropdown" slot="dropdown" >
|
||||||
<el-dropdown-item>{{$t('dashboard.panel.createPanelTitleSec')}}</el-dropdown-item>
|
<el-dropdown-item>{{$t('dashboard.panel.createPanelTitleSec')}}</el-dropdown-item>
|
||||||
<el-dropdown-item v-for="item in panelData" :key="item.id+1"
|
<el-dropdown-item v-for="item in panelData" :key="item.id+1"
|
||||||
:class="showPanel.id==item.id?'nz-dashboard-dropdown-bg':''" :command="item">{{item.name}}
|
:class="showPanel.id==item.id?'nz-dashboard-dropdown-bg':''" :command="item">
|
||||||
|
<!--{{item.name}}-->
|
||||||
|
<el-row :gutter="10" class="panel-list-width" >
|
||||||
|
<el-col :span="19" class="panel-list-item" :title="item.name">{{item.name}}</el-col>
|
||||||
|
<el-col :span="2"><span class="panel-dropdown-btn panel-dropdown-btn-delete" @click.stop="del(item)"><i class="el-icon-delete"></i></span></el-col>
|
||||||
|
<el-col :span="1"> </el-col>
|
||||||
|
<el-col :span="2"><span class="panel-dropdown-btn" @click.stop="toEdit(item)"><i class="el-icon-edit-outline" ></i></span></el-col>
|
||||||
|
</el-row>
|
||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
@@ -59,9 +67,9 @@
|
|||||||
</el-popover>
|
</el-popover>
|
||||||
</div>
|
</div>
|
||||||
<!-- 2020-02-14 使用普通搜索框-->
|
<!-- 2020-02-14 使用普通搜索框-->
|
||||||
<!-- <div class="top-tool-search">-->
|
<!-- <div class="top-tool-search">-->
|
||||||
<!-- <search-input ref="searchInput" :searchMsg="searchMsg" @search="search"></search-input>-->
|
<!-- <search-input ref="searchInput" :searchMsg="searchMsg" @search="search"></search-input>-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
|
|
||||||
<button @click="toAddChart" :title="$t('overall.createChart')"
|
<button @click="toAddChart" :title="$t('overall.createChart')"
|
||||||
class="nz-btn nz-btn-size-normal nz-btn-style-light ">
|
class="nz-btn nz-btn-size-normal nz-btn-style-light ">
|
||||||
@@ -597,6 +605,38 @@
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.panel-list-width {
|
||||||
|
width:240px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-dropdown-title {
|
||||||
|
line-height:25px;
|
||||||
|
padding-left:5px;
|
||||||
|
margin-left:10px;
|
||||||
|
text-align:left;
|
||||||
|
border-radius:4px;
|
||||||
|
width:120px;
|
||||||
|
height:25px;
|
||||||
|
border:solid 1px #d8dce1;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow-x: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
.panel-list-title {
|
||||||
|
min-height:25px;
|
||||||
|
width:100px;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow-x: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-list-item {
|
||||||
|
width:190px;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow-x: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
.content-right-option {
|
.content-right-option {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
@@ -703,9 +743,15 @@
|
|||||||
.nz-dashboard-dropdown {
|
.nz-dashboard-dropdown {
|
||||||
height: 300px;
|
height: 300px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
left:210px !important;
|
||||||
li {
|
li {
|
||||||
padding: 0 20px !important;
|
/*padding: 0 20px !important;*/
|
||||||
|
padding-left:20px !important;
|
||||||
|
padding-right:0px !important;
|
||||||
|
width:240px;
|
||||||
|
white-space:nowrap;
|
||||||
|
overflow-x:hidden;
|
||||||
|
text-overflow:ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user