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

perf: 调整panel中顶部时间选择器样式

Browse Source
This commit is contained in:
chenjinsong
2020-01-20 12:16:44 +08:00
parent e73e4ced3d
commit 066983e4e4
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/searchInput.vue
View File

@@ -1232,8 +1232,8 @@
} }
.search-input-all .search-history{ .search-input-all .search-history{
padding: 0px 7px; padding: 0px 7px;
height: 17px; height: 16px;
line-height: 17px; line-height: 16px;
text-align: center; text-align: center;
border-right: 1px solid #e5e5e5; border-right: 1px solid #e5e5e5;
margin-top: 4px; margin-top: 4px;

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

@@ -45,14 +45,14 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<div class="nz-btn-group nz-btn-group-light float-right margin-r-20"> <div class="nz-btn-group nz-btn-group-light float-right margin-r-20">
<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="Refresh()"><i style="font-size: 13px" class="global-active-color nz-icon nz-icon-refresh"></i></button><el-popover v-model="visible" placement="bottom-start" width="200" trigger="click"> <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="Refresh()"><i style="font-size: 12px" class="global-active-color nz-icon nz-icon-refresh"></i></button><el-popover v-model="visible" placement="bottom-start" width="200" trigger="click">
<ul class="popover_ul"> <ul class="popover_ul">
<li v-for="i in intervalList" :style="{color:interval==i.value?'#31749C':''}" :key="i.value+i.name" @click="selectInterval(i.value)"> <li v-for="i in intervalList" :style="{color:interval==i.value?'#31749C':''}" :key="i.value+i.name" @click="selectInterval(i.value)">
{{i.name}} {{i.name}}
</li> </li>
</ul> </ul>
<button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light" slot="reference"> <button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light" slot="reference">
<i style="font-size: 13px" class="nz-icon nz-icon-arrow-down" ></i> <i style="font-size: 12px" class="nz-icon nz-icon-arrow-down" ></i>
</button> </button>
</el-popover> </el-popover>
</div> </div>
@@ -80,7 +80,7 @@
</div>--> </div>-->
<div class="panel-calendar margin-r-20"> <div class="panel-calendar margin-r-20">
<div class="block"> <div class="block">
<el-date-picker class="nz-dashboard-picker" size="mini" ref="calendar" format="yyyy/MM/dd HH:mm" @change="dateChange" v-model="searchTime" type="datetimerange" :picker-options="pickerOptions" :range-separator="$t('dashboard.panel.to')" :start-placeholder="$t('dashboard.panel.startTime')" :end-placeholder="$t('dashboard.panel.endTime')" align="right"> <el-date-picker prefix-icon=" " class="nz-dashboard-picker" size="mini" ref="calendar" format="yyyy/MM/dd HH:mm" @change="dateChange" v-model="searchTime" type="datetimerange" :picker-options="pickerOptions" :range-separator="$t('dashboard.panel.to')" :start-placeholder="$t('dashboard.panel.startTime')" :end-placeholder="$t('dashboard.panel.endTime')" align="right">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
@@ -693,7 +693,25 @@ export default {
} }
.nz-dashboard-picker {} .nz-dashboard-picker {}
.panel-calendar .el-range-editor--mini.el-input__inner{ .panel-calendar .el-range-editor--mini.el-input__inner{
height: 26px !important; height: 25px !important;
border-color: #d8d8d8;
} }
</style>
<style lang="scss">
.panel-calendar .el-range-editor--mini .el-range__close-icon {
line-height: 18px;
}
.panel-calendar .el-range-editor--mini .el-range__icon {
display: none;
}
.panel-calendar .el-range-editor--mini .el-range-separator {
line-height: 17px;
}
.panel-calendar .el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
width: 300px;
padding-right: 0;
vertical-align: top;
}
</style> </style>