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

Merge remote-tracking branch 'origin/codeCheck' into codeCheck

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
This commit is contained in:
chenjinsong
2020-12-16 11:31:38 +08:00
parent dc54e26193 e71339f21c
commit 59677cae87
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nezha-fronted/src/components/page/dashboard/overview/overview2.scss
View File

@@ -4,9 +4,9 @@
.overview-content-header{ .overview-content-header{
display: flex; display: flex;
padding: 8px 0 2px 0; padding: 8px 0 2px 0;
justify-content: space-between;
} }
.overview-content-header .header-title{ .overview-content-header .header-title{
flex:12;
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
font-size: 1.5rem !important; font-size: 1.5rem !important;
@@ -14,15 +14,21 @@
margin-left: 15px; margin-left: 15px;
} }
.overview-content-header .header-tool{ .overview-content-header .header-tool{
flex: 2;
height: 35px; height: 35px;
min-width: 340px;
display: flex;
padding: 5px;
} }
.header-tool .tool-container{ .header-tool .tool-container{
display: flex; display: flex;
text-align: center; text-align: center;
justify-content: space-between;
min-width: 310px;
}
.tool-container .pickTime{
margin-right: -20px;
} }
.tool-container .time{ .tool-container .time{
flex: 4;
font-size: 1rem !important; font-size: 1rem !important;
display: inline-block; display: inline-block;
height: 35px; height: 35px;
@@ -31,7 +37,6 @@
vertical-align: middle; vertical-align: middle;
} }
.tool-container .date{ .tool-container .date{
flex: 4;
height: 35px; height: 35px;
} }
.date .week{ .date .week{
@@ -45,7 +50,6 @@
width: 88px; width: 88px;
} }
.tool-container .operation{ .tool-container .operation{
flex: 2;
display: inline-block; display: inline-block;
line-height: 35px; line-height: 35px;
} }

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

@@ -5,8 +5,8 @@
<!--标题--> <!--标题-->
<div class="overview-content-header"> <div class="overview-content-header">
<div class="header-title" :class="{'hide-div':!isFullScreen}">{{systemName&&systemName != 'undefined'&&systemName != null?systemName: $t('dashboard.overview.contentTitle')}}</div> <div class="header-title" :class="{'hide-div':!isFullScreen}">{{systemName&&systemName != 'undefined'&&systemName != null?systemName: $t('dashboard.overview.contentTitle')}}</div>
<div class="overview-loading"><loading ref="overviewLoading" ></loading></div>
<div class="header-tool"> <div class="header-tool">
<div class="overview-loading"><loading ref="overviewLoading" ></loading></div>
<div class="tool-container"> <div class="tool-container">
<div class="time">{{sysTime}}</div> <div class="time">{{sysTime}}</div>
<div class="date"> <div class="date">