diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss index d814be7ba..08cd95f33 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss +++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss @@ -6,7 +6,7 @@ } .overview-content-header{ display: flex; - padding-top: 10px; + padding-top: 6px; } .overview-content-header .header-title{ flex:13; @@ -26,8 +26,7 @@ } .tool-container .time{ flex: 4; - font-size: 1.5rem !important; - font-weight: 700; + font-size: 1.2rem !important; display: inline-block; height: 35px; line-height: 35px; @@ -38,11 +37,10 @@ height: 35px; } .date .week{ - font-size: 1.125rem; - font-weight: bold; + font-size: 0.9rem; + line-height: 1.1rem; } .date .sys-date{ - margin-top: -6px; font-size: .75rem; } .tool-container .operation{ @@ -52,9 +50,10 @@ } .operation .screen-icon{ font-size: 1.875rem !important; + cursor: pointer; } .overview-content{ - height: calc(100% - 45px); + height: calc(100% - 42px); width: 100%; } .overview-content .content-row-box { @@ -136,8 +135,11 @@ font-size: 0.9rem; } .content-col-content-num { - font-size: 2.5rem; + font-size: 3.2rem; + font-weight: bold; color: #333; } - +.hide-div { + visibility: hidden; +} diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue index c3cc351e9..4ddc1d3e8 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue @@ -555,7 +555,7 @@ }, switchFullScreen:function(){ - this.isFullScreen=this.judgeFullScreen(); + this.isFullScreen = this.judgeFullScreen(); if(this.isFullScreen){ this.exitFullScreen(); }else{ @@ -568,18 +568,18 @@ fullScreen:function(){ let container=document.getElementById('mainDisplay'); let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen; - fullScreenFunc.call(container) + fullScreenFunc.call(container); + this.isFullScreen = true; }, exitFullScreen:function(){ - if(this.judgeFullScreen()){ - if(document.exitFullscreen) { - document.exitFullscreen(); - } else if(document.mozCancelFullScreen) { - document.mozCancelFullScreen(); - } else if(document.webkitExitFullscreen) { - document.webkitExitFullscreen(); - } + if(document.exitFullscreen) { + document.exitFullscreen(); + } else if(document.mozCancelFullScreen) { + document.mozCancelFullScreen(); + } else if(document.webkitExitFullscreen) { + document.webkitExitFullscreen(); } + this.isFullScreen = false; }, alertMessageDropdownHandler(show) { if (show) {