Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck1
This commit is contained in:
@@ -1328,7 +1328,7 @@
|
||||
if(response.code == 200){
|
||||
response.data && function() {
|
||||
response.data.Basic && detail.push({
|
||||
title: vm.$t('asset.basicTitle'),
|
||||
title: vm.$t('project.chart.basicTitle'),
|
||||
type: 'basic',
|
||||
data: response.data.Basic
|
||||
});
|
||||
@@ -1343,7 +1343,7 @@
|
||||
});
|
||||
}else {
|
||||
detail.push({
|
||||
title: vm.$t('asset.basicTitle'),
|
||||
title: vm.$t('project.chart.basicTitle'),
|
||||
type: 'basic',
|
||||
data: {
|
||||
sn: 'assetInfo Test',
|
||||
|
||||
@@ -379,6 +379,9 @@
|
||||
bus.$on("module-list-change", menu => {
|
||||
this.getModuleList();
|
||||
});
|
||||
bus.$on('asset-list-change',()=>{
|
||||
this.getLeftMenuList();
|
||||
})
|
||||
},
|
||||
// 获取asset左侧菜单数据
|
||||
getLeftMenuList(){
|
||||
|
||||
@@ -454,6 +454,7 @@
|
||||
if (response.code === 200) {
|
||||
this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")});
|
||||
this.getTableData();
|
||||
bus.$emit('asset-list-change')
|
||||
} else {
|
||||
this.$message.error(response.msg);
|
||||
}
|
||||
@@ -485,6 +486,7 @@
|
||||
this.rightBox.show = false;
|
||||
if (refresh) {
|
||||
this.getTableData();
|
||||
bus.$emit('asset-list-change')
|
||||
}
|
||||
},
|
||||
pageNo(val) {
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
.overview{
|
||||
height: 100%;
|
||||
}
|
||||
.overview-right {
|
||||
background-color: $content-right-background-color;
|
||||
}
|
||||
.overview-content-header{
|
||||
display: flex;
|
||||
padding-top: 6px;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="overview">
|
||||
<div class="overview" style="background-color: #f9f9f9;">
|
||||
<!--标题-->
|
||||
<div class="overview-content-header">
|
||||
<div class="header-title" :class="{'hide-div':!isFullScreen}">{{systemName&&systemName != 'undefined'&&systemName != null?systemName: $t('dashboard.overview.contentTitle')}}</div>
|
||||
@@ -1073,7 +1073,7 @@
|
||||
return document.isFullScreen || document.mozIsFullScreen || document.webkitIsFullScreen;
|
||||
},
|
||||
fullScreen:function(){
|
||||
let container = document.querySelector(".overview-content");
|
||||
let container = document.querySelector(".overview");
|
||||
let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen;
|
||||
fullScreenFunc.call(container);
|
||||
this.isFullScreen = true;
|
||||
|
||||
Reference in New Issue
Block a user