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 codeCheck

Browse Source
This commit is contained in:
zhangyu
2020-10-13 14:33:10 +08:00
parent 949acad89a 48312bf254
commit 4ef58a20c8
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/common/alert/alertMessageTable.vue
View File

@@ -381,6 +381,7 @@
methods: { methods: {
labelsSort:function(obj){ labelsSort:function(obj){
let buildIn=['asset','endpoint','module','project','datacenter'] let buildIn=['asset','endpoint','module','project','datacenter']
if(typeof obj == "string") obj=JSON.parse(obj)
let labels=JSON.parse(JSON.stringify(obj)); let labels=JSON.parse(JSON.stringify(obj));
let result=[]; let result=[];
for(let key of buildIn){ for(let key of buildIn){

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

@@ -241,7 +241,6 @@
immediate: true, immediate: true,
deep: true, deep: true,
handler(n, o) { handler(n, o) {
console.log(n)
bus.$emit("current-project-change", n); //告知project.vue bus.$emit("current-project-change", n); //告知project.vue
}, },
}, },

2
nezha-fronted/src/components/common/project/popData/lineChart.vue
View File

@@ -760,6 +760,7 @@
if (chartSite === 'local') { // 本地显示 if (chartSite === 'local') { // 本地显示
if(legend){ if(legend){
this.legendList = []; this.legendList = [];
this.isGrey=[];
legend.forEach((item, i) => { legend.forEach((item, i) => {
const legend = { const legend = {
name:item.name, name:item.name,
@@ -873,6 +874,7 @@
// eslint-disable-next-line // eslint-disable-next-line
if(legend){ if(legend){
this.screenLegendList = []; this.screenLegendList = [];
this.isGreyScreen=[]
legend.forEach((item, i) => { legend.forEach((item, i) => {
const legend = { const legend = {
name:item.name, name:item.name,

1
nezha-fronted/src/components/page/alert/list.vue
View File

@@ -315,6 +315,7 @@
methods: { methods: {
labelsSort:function(obj){ labelsSort:function(obj){
let buildIn=['asset','endpoint','module','project','datacenter'] let buildIn=['asset','endpoint','module','project','datacenter']
console.log(obj)
let labels=JSON.parse(JSON.stringify(obj)); let labels=JSON.parse(JSON.stringify(obj));
let result=[]; let result=[];
for(let key of buildIn){ for(let key of buildIn){