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

This commit is contained in:
zhangyu
2020-10-13 14:33:10 +08:00
4 changed files with 4 additions and 1 deletions

View File

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

View File

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

View File

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

View File

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