Commit 712926277c2fdd0a89cbbcf482a233fa59f37f3c

Authored by xp.Huang
2 parents 2b29bfc8 8ded8f1c

Merge branch 'main' into 'main_dev'

# Conflicts:
#   pages/alarm/alarm.vue
1 ## 目录结构及重要文件说明 1 ## 目录结构及重要文件说明
2 2
  3 +版本:v1.0.6_release
  4 +
3 ### 目录结构 5 ### 目录结构
4 6
5 #### 说明 7 #### 说明
@@ -164,10 +164,7 @@ @@ -164,10 +164,7 @@
164 }); 164 });
165 }); 165 });
166 const keys = await getDeviceKeys(tbDeviceId); 166 const keys = await getDeviceKeys(tbDeviceId);
167 - console.log(this.getAttrList.map(item=>item.identifier),'aaaaaaaa')  
168 -  
169 this.keys = [this.getAttrList.map(item=>item.identifier)]; 167 this.keys = [this.getAttrList.map(item=>item.identifier)];
170 - console.log(this,keys,this.keys)//123  
171 // 昨天 168 // 昨天
172 this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD"); 169 this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD");
173 // 今天 170 // 今天