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

This commit is contained in:
wujiawen
2020-01-15 20:55:40 +08:00
13 changed files with 182 additions and 91 deletions

View File

@@ -457,8 +457,8 @@
/*时间条件查询--end*/
//公用操作
jumpTo(data,id) {
this.$store.state.assetData.moduleData = data
this.$store.state.assetData.selectedData = id
//this.$store.state.assetData.moduleData = data
//this.$store.state.assetData.selectedData = id
this.$router.push({
path: "/" + data,
query: {
@@ -471,6 +471,10 @@
if (response.code === 200) {
this.panelData = response.data.list;
if( response.data.list.length>0 ){
if(this.$store.state.showPanel.id!==0&&this.$store.state.showPanel.name!==''){
this.showPanel.name = this.$store.state.showPanel.name;
this.showPanel.id = this.$store.state.showPanel.id;
}
if(this.showPanel.id===''){
this.showPanel.id = response.data.list[0].id;
this.filter.panelId = this.showPanel.id;
@@ -481,10 +485,12 @@
this.showPanel.id ='';
this.filter.panelId='';
}
this.pageObj.total = response.data.total
this.pageObj.total = response.data.total;
if(this.panel.id===''||this.panel.id===this.showPanel.id){
this.getData(this.filter);
}
this.$store.state.showPanel.id = 0;
this.$store.state.showPanel.name = '';
}
})
},