Merge pull request '1' (#101) from pc-master into portal
Reviewed-on: #101
This commit is contained in:
		
						commit
						1cd18fcbef
					
				@ -172,7 +172,8 @@ export function realTimeLine(id, data,pageId) {
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    ]
 | 
			
		||||
    var equipmentList=store.state.equipmentSelList
 | 
			
		||||
    // var equipmentList=store.state.equipmentSelList
 | 
			
		||||
    var equipmentList=JSON.parse(localStorage.getItem('equipmentSelList'))
 | 
			
		||||
 | 
			
		||||
    var list = []
 | 
			
		||||
    var selList={}
 | 
			
		||||
@ -362,6 +363,7 @@ export function realTimeLine(id, data,pageId) {
 | 
			
		||||
          
 | 
			
		||||
            }
 | 
			
		||||
          });
 | 
			
		||||
          localStorage.setItem('equipmentSelList', JSON.stringify(equipmentList))
 | 
			
		||||
      });
 | 
			
		||||
    window.addEventListener("resize", function () {
 | 
			
		||||
        myChart.resize();
 | 
			
		||||
 | 
			
		||||
@ -197,8 +197,9 @@ export default {
 | 
			
		||||
                            index: index + 1,
 | 
			
		||||
                        };
 | 
			
		||||
                    });
 | 
			
		||||
                    if(selTrue){
 | 
			
		||||
                        this.$store.state.equipmentSelList=res.data.data
 | 
			
		||||
                    if(!localStorage.getItem('equipmentSelList')){
 | 
			
		||||
                        localStorage.setItem('equipmentSelList', JSON.stringify(res.data.data))
 | 
			
		||||
                        // this.$store.state.equipmentSelList=res.data.data
 | 
			
		||||
                    }
 | 
			
		||||
                    this.leftList[1].list = []
 | 
			
		||||
                    this.leftList[2].list = []
 | 
			
		||||
@ -266,6 +267,7 @@ export default {
 | 
			
		||||
                    });
 | 
			
		||||
                    localStorage.removeItem('token')
 | 
			
		||||
                    localStorage.removeItem('userInfo')
 | 
			
		||||
                    localStorage.removeItem('equipmentSelList')
 | 
			
		||||
                    this.$router.push({ name: 'login' })
 | 
			
		||||
                } else {
 | 
			
		||||
                    this.$message.error("请求出错");
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user