-
-
-
-
-
-
-
- {{topNFilter.options.find((item)=>{return item.value==topNFilter.default})['label']}}
-
- {{item.label}}
-
-
-
- {{topNFilter.tops.find((item)=>{return item.value==topNFilter.defaultTop})['label']}}
-
- {{item.label}}
-
-
+
+
+
+
+
+ {{topNFilter.options.find((item)=>{return item.value==topNFilter.default})['label']}}
+
+ {{item.label}}
+
+
+
+ {{topNFilter.tops.find((item)=>{return item.value==topNFilter.defaultTop})['label']}}
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -174,7 +174,7 @@
num:totalData.inStock,
title:this.$t('dashboard.overview.asset.title'),
showPopover:true,
- icon:'nz-icon nz-icon-asset',
+ icon:'nz-icon nz-icon-server',
popover:[
{
label:this.$t('dashboard.overview.asset.alertTotal'),
@@ -367,7 +367,7 @@
num:data.total,
title:this.$t('dashboard.overview.project.endpoint'),
showPopover:false,
- icon:'nz-icon nz-icon-project',
+ icon:'nz-icon nz-icon-dataRecv',
popover:[]
},
stat:{//左侧下方 小图标，
@@ -411,7 +411,7 @@
num:data.dcTotal,
title:this.$t('dashboard.overview.dataCenter.dataCenter'),
showPopover:true,
- icon:'nz-icon nz-icon-page',
+ icon:'nz-icon nz-icon-idc_barn-black',
popover:[
{
label:this.$t('dashboard.overview.dataCenter.cabinet'),
@@ -854,15 +854,6 @@
let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen;
console.log(fullScreenFunc)
fullScreenFunc.call(container)
- // if(container.requestFullscreen){
- // container.requestFullscreen();
- // } else if(container.mozRequestFullScreen) {
- // container.mozRequestFullScreen();
- // } else if(container.webkitRequestFullscreen) {
- // container.webkitRequestFullscreen();
- // } else if(container.msRequestFullscreen) {
- // container.msRequestFullscreen();
- // }
},
exitFullScreen:function(){
if(this.judgeFullScreen()){
@@ -873,6 +864,24 @@
} else if(document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
+ //解决flex排版错乱问题
+ document.querySelectorAll(".content-row-box").forEach((item,index)=>{
+ item.style.display = "none";
+ setTimeout(()=>{item.style.display = '';},100)
+ })
+ //解决table显示原生滚动条问题
+ setTimeout(() => {
+ document.querySelectorAll('.el-table__body-wrapper').forEach((item,index)=>{
+ item.classList.add("ps");
+ item.classList.add("ps--active-y");
+ item._ps_.update();
+ })
+ },200)
+
+ setTimeout(()=>{
+ this.$refs.alertRuleTab.layoutTable();
+ console.log('layout')
+ },1000)
}
},
/*header 时间处理 start*/
@@ -956,8 +965,13 @@
this.initDate();
this.initData();
window.onresize = () => {
- this.isFullScreen=this.judgeFullScreen();
+ setTimeout(()=>{this.isFullScreen=this.judgeFullScreen();},200)
}
+ // window.addEventListener('keyup',(e)=>{
+ // if(e.key == 'F11'){
+ // this.fullScreen()
+ // }
+ // })
},
watch:{
isFullScreen:function(n,o){
@@ -968,7 +982,6 @@
let mapWidth=this.$refs.dataCenterMap.$el.clientWidth;
let mapHeight=this.$refs.dataCenterMap.$el.clientHeight * .95;
this.$refs.dataCenterMap.resizeChart(mapWidth,mapHeight);
-
});
}
}
@@ -985,4 +998,9 @@
.overview-table .el-table__body{
width: 100% !important;
}
+ .overview-content .column-flex .el-scrollbar__view{
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ }
diff --git a/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss b/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss
index 1d3b9fdb0..c39d27c93 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss
+++ b/nezha-fronted/src/components/page/dashboard/overview/tableBox.scss
@@ -4,10 +4,9 @@
width: 100%;
position: relative;
overflow: hidden;
- padding-bottom: 2px;
}
.table-column-box{
- flex-direction: column;
+ display: block;
}
.table-box .table-box-left{
flex: 1;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue b/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue
index 0be93f16a..8a12967d7 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/tableBox.vue
@@ -3,7 +3,7 @@
-
+
@@ -127,6 +127,9 @@
},
endLoading(){
this.$refs.loading.endLoading();
+ },
+ layoutTable:function(){
+ this.$refs.dataTable.doLayout();
}
},
mounted() {