feat:样式修改

This commit is contained in:
zhangyu
2020-10-15 15:34:00 +08:00
parent bd2027468a
commit 259282faa5
7 changed files with 16 additions and 11 deletions

View File

@@ -670,6 +670,7 @@ li{
border-bottom: 1px solid #E4E7ED; border-bottom: 1px solid #E4E7ED;
margin: 0 -6px; margin: 0 -6px;
background-color: $content-right-background-color; background-color: $content-right-background-color;
margin-bottom: 10px;
} }
.sub-top-tools>div { .sub-top-tools>div {
margin-top: 2px; margin-top: 2px;
@@ -2223,4 +2224,7 @@ li{
.right-box .right-box-form-delete .nz-icon-delete{ .right-box .right-box-form-delete .nz-icon-delete{
} }
.nz-icon-caret-right{
font-size: 12px;
}

View File

@@ -19,13 +19,13 @@
</el-submenu> </el-submenu>
<el-submenu :index="'-1'" class="icon-menu-item" popper-class="display-none"> <el-submenu :index="'-1'" class="icon-menu-item" popper-class="display-none">
<div slot="title" class="el-submenu__title" @click="cli" > <div slot="title" class="el-submenu__title" @click="cli" >
<i class="nz-icon nz-icon-cli"></i> <i class="nz-icon nz-icon-cli" style="font-size: 18px;"></i>
<div class="right-tip" v-show="$store.state.consoleCount>0">{{$store.state.consoleCount<=10?$store.state.consoleCount:'10+'}}</div> <div class="right-tip" v-show="$store.state.consoleCount>0">{{$store.state.consoleCount<=10?$store.state.consoleCount:'10+'}}</div>
</div> </div>
</el-submenu> </el-submenu>
<el-submenu index="0" popper-class="nz-submenu" class="icon-menu-item"> <el-submenu index="0" popper-class="nz-submenu" class="icon-menu-item">
<template slot="title"> <template slot="title">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon" style="font-size: 18px;"></i>
</template> </template>
<template v-for="(item, index) in createMenu"> <template v-for="(item, index) in createMenu">
<el-menu-item :index="'0-' + index"> <el-menu-item :index="'0-' + index">

View File

@@ -4,7 +4,7 @@
<chart-unit v-model="unit" v-if="useChartUnit"></chart-unit> <chart-unit v-model="unit" v-if="useChartUnit"></chart-unit>
<div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-r-20" v-show="useRefresh" style="height: 24px;line-height: 24px;vertical-align: middle;"> <div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-r-20" v-show="useRefresh" style="height: 24px;line-height: 24px;vertical-align: middle;">
<button style="border-right: 1px solid rgba(162,162,162,0.50);" type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="refreshDataFunc"> <button style="border-right: 1px solid rgba(162,162,162,0.50);" type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="refreshDataFunc">
<i style="font-size: 12px" class="global-active-color nz-icon nz-icon-refresh"></i>&nbsp; <i style="font-size: 14px" class="global-active-color nz-icon nz-icon-refresh"></i>&nbsp;
<span class="nz-btn nz-btn-text" ><slot name="added-text"></slot></span> <span class="nz-btn nz-btn-text" ><slot name="added-text"></slot></span>
</button> </button>
<el-popover v-model="visible" placement="bottom-start" :width="50" trigger="click" popper-class="interval-refresh-popover" > <el-popover v-model="visible" placement="bottom-start" :width="50" trigger="click" popper-class="interval-refresh-popover" >
@@ -14,7 +14,7 @@
</li> </li>
</ul> </ul>
<button type="button" style="border-radius: 0 4px 4px 0;" class="nz-btn nz-btn-size-normal nz-btn-style-light" slot="reference"> <button type="button" style="border-radius: 0 4px 4px 0;" class="nz-btn nz-btn-size-normal nz-btn-style-light" slot="reference">
<span class="nz-btn nz-btn-text">{{interval.value != -1 ? interval.label : ''}}&nbsp</span><i style="font-size: 12px" class="nz-icon nz-icon-arrow-down"></i> <span class="nz-btn nz-btn-text">{{interval.value != -1 ? interval.label : ''}}&nbsp</span><i style="font-size: 14px" class="nz-icon nz-icon-arrow-down"></i>
</button> </button>
</el-popover> </el-popover>
</div> </div>

View File

@@ -949,7 +949,7 @@
padding: 0; padding: 0;
} }
.ql-editor{ .ql-editor{
padding:10px !important; padding:7px 10px 10px 10px !important;
overflow: hidden; overflow: hidden;
} }
.metric-editor.metric-editor-rb { .metric-editor.metric-editor-rb {

View File

@@ -45,14 +45,14 @@
</div> </div>
<div class="chart-view right-margin" v-show="!showIntroduce" <div class="chart-view right-margin" v-show="!showIntroduce"
:class="{'shrink-view':!chartVisible || !defaultChartVisible}" style="position:relative;"> :class="{'shrink-view':!chartVisible || !defaultChartVisible}" style="position:relative;">
<div class="view-title" @click="changeChartVisible" style="position:absolute;z-index: 1000"><i class="nz-icon nz-icon-caret-top" ></i>&nbsp;graph</div> <div class="view-title" @click="changeChartVisible" style="position:absolute;z-index: 1000;top:10px;"><i class="nz-icon nz-icon-caret-top" ></i>&nbsp;graph</div>
<div class="chart-room"> <div class="chart-room">
<chart ref="exploreChart" :unit="chartUnit"></chart> <chart ref="exploreChart" :unit="chartUnit"></chart>
</div> </div>
</div> </div>
<div class="table-view right-margin" v-show="!showIntroduce" <div class="table-view right-margin" v-show="!showIntroduce"
:class="{'shrink-view':!tableVisible || !defaultTableVisible}"> :class="{'shrink-view':!tableVisible || !defaultTableVisible}" style="position: relative">
<div class="view-title" @click="changeTableVisible"><i class="nz-icon nz-icon-caret-top"></i>&nbsp;table</div> <div class="view-title" @click="changeTableVisible" style="position:absolute;z-index: 1000;top:10px;"><i class="nz-icon nz-icon-caret-top"></i>&nbsp;table</div>
<div class="table-room"> <div class="table-room">
<!-- 自定义table列 --> <!-- 自定义table列 -->
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
@@ -624,7 +624,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
} }
.explore .chart-view, .table-view { .explore .chart-view, .table-view {
padding: 10px; padding: 22px 10px 10px 10px;
border: 1px solid lightgrey; border: 1px solid lightgrey;
box-sizing: inherit; box-sizing: inherit;
margin-bottom: 5px; margin-bottom: 5px;
@@ -648,6 +648,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
} }
.table-room { .table-room {
position: relative; position: relative;
margin-top: 10px;
} }
.explore .view-title { .explore .view-title {
font-weight: 500; font-weight: 500;

View File

@@ -40,7 +40,7 @@
</template> </template>
</div> </div>
</div> </div>
<div v-if="styleType == 1"> <div v-if="styleType == 1" style="margin-left: 10px">
<div class="query-options nz-btn-group nz-btn-group-size-normal nz-btn-group-light"> <div class="query-options nz-btn-group nz-btn-group-size-normal nz-btn-group-light">
<div class="option nz-btn nz-btn-size-normal nz-btn-style-light" @click="addExpression" v-if="plugins.indexOf('add') > -1"><i class="nz-icon nz-icon-plus"></i></div> <div class="option nz-btn nz-btn-size-normal nz-btn-style-light" @click="addExpression" v-if="plugins.indexOf('add') > -1"><i class="nz-icon nz-icon-plus"></i></div>
<div class="option nz-btn nz-btn-size-normal nz-btn-style-light" @click="removeExpression" v-if="plugins.indexOf('remove') > -1"><i class="nz-icon nz-icon-minus"></i></div> <div class="option nz-btn nz-btn-size-normal nz-btn-style-light" @click="removeExpression" v-if="plugins.indexOf('remove') > -1"><i class="nz-icon nz-icon-minus"></i></div>

View File

@@ -359,7 +359,7 @@
chartUnit=chartUnit?chartUnit:2; chartUnit=chartUnit?chartUnit:2;
let unit=chartDataFormat.getUnit(chartUnit); let unit=chartDataFormat.getUnit(chartUnit);
let flag=JSON.stringify(value).length>JSON.stringify(chartDataFormat.Interval(maxValue,copies,unit.type)).length; let flag=JSON.stringify(value).length>JSON.stringify(chartDataFormat.Interval(maxValue,copies,unit.type)).length;
if(dot===0&&flag){ if(dot===0 || flag){
dot=1; dot=1;
} }
return unit.compute(value,index,-1,dot); return unit.compute(value,index,-1,dot);