heyang

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -251,9 +251,6 @@ export default {
   },
   onLoad(option) {
     let self = this;
-	this.firedeviceStatus();
-	this.getDeviceList();
-	this.getListData();  
     if(uni.getStorageSync('saoCodeId')){
       this.saoCodeType = true;
 	  this.subId=uni.getStorageSync('saoCodeId');
@@ -327,6 +324,9 @@ export default {
         this.saoCodeType = false;
       }
     }
+	this.firedeviceStatus();
+	this.getListData();  
+	this.getDeviceListBySub();
 	
   },
   onShow(){
@@ -849,9 +849,9 @@ export default {
         });
       }
     },
-	//获取喇叭列表
-	    async getDeviceList() {
-			let _this=this;
+	   //获取喇叭列表
+	    async getDeviceListBySub() {
+		  let _this=this;
 	      let obj = {
 	        subId: _this.subId,
 	        floorId: _this.itemData.subAddrr.floorId,