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

Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck1

Browse Source
This commit is contained in:
zhangyu
2020-08-24 18:04:06 +08:00
parent 04404c62c6 7a9e43ca39
commit f7ae860663
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/charts/chart-list.vue
View File

@@ -1328,7 +1328,7 @@
if(response.code == 200){ if(response.code == 200){
response.data && function() { response.data && function() {
response.data.Basic && detail.push({ response.data.Basic && detail.push({
title: vm.$t('asset.basicTitle'), title: vm.$t('project.chart.basicTitle'),
type: 'basic', type: 'basic',
data: response.data.Basic data: response.data.Basic
}); });
@@ -1343,7 +1343,7 @@
}); });
}else { }else {
detail.push({ detail.push({
title: vm.$t('asset.basicTitle'), title: vm.$t('project.chart.basicTitle'),
type: 'basic', type: 'basic',
data: { data: {
sn: 'assetInfo Test', sn: 'assetInfo Test',

3
nezha-fronted/src/components/common/leftMenu.vue
View File

@@ -379,6 +379,9 @@
bus.$on("module-list-change", menu => { bus.$on("module-list-change", menu => {
this.getModuleList(); this.getModuleList();
}); });
bus.$on('asset-list-change',()=>{
this.getLeftMenuList();
})
}, },
// 获取asset左侧菜单数据 // 获取asset左侧菜单数据
getLeftMenuList(){ getLeftMenuList(){

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -454,6 +454,7 @@
if (response.code === 200) { if (response.code === 200) {
this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")});
this.getTableData(); this.getTableData();
bus.$emit('asset-list-change')
} else { } else {
this.$message.error(response.msg); this.$message.error(response.msg);
} }
@@ -485,6 +486,7 @@
this.rightBox.show = false; this.rightBox.show = false;
if (refresh) { if (refresh) {
this.getTableData(); this.getTableData();
bus.$emit('asset-list-change')
} }
}, },
pageNo(val) { pageNo(val) {

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

@@ -1,9 +1,6 @@
.overview{ .overview{
height: 100%; height: 100%;
} }
.overview-right {
background-color: $content-right-background-color;
}
.overview-content-header{ .overview-content-header{
display: flex; display: flex;
padding-top: 6px; padding-top: 6px;

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

@@ -1,5 +1,5 @@
<template> <template>
<div class="overview"> <div class="overview" style="background-color: #f9f9f9;">
<!--标题--> <!--标题-->
<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>
@@ -1073,7 +1073,7 @@
return document.isFullScreen || document.mozIsFullScreen || document.webkitIsFullScreen; return document.isFullScreen || document.mozIsFullScreen || document.webkitIsFullScreen;
}, },
fullScreen:function(){ fullScreen:function(){
let container = document.querySelector(".overview-content"); let container = document.querySelector(".overview");
let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen; let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen;
fullScreenFunc.call(container); fullScreenFunc.call(container);
this.isFullScreen = true; this.isFullScreen = true;