Merge branch 'main_dev'

# Conflicts:
#	pages/alarm/alarm.vue

@@ -172,6 +172,8 @@
 							label: '5分钟',
 							value: 300000
 						},
+
+						
 						{
 							label: '10分钟',
 							value: 600000

@@ -67,7 +67,8 @@
 				endTs: "",
 				recordList: [], //实时数据
 				isScrollable: false,
-				attrList: []
+				attrList: [],
+				getAttrList:[]
 			};
 		},
 		onUnload() {
@@ -96,9 +97,9 @@
 			}
 			this.isScrollable = this.list.length > 4;
 			if (res.deviceProfileId) {
-				const getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
-				if (Array.isArray(getAttrList)) {
-					this.attrList = getAttrList.map(m => {
+				this.getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
+				if (Array.isArray(this.getAttrList)) {
+					this.attrList = this.getAttrList.map(m => {
 						return m.identifier
 					})
 				}
@@ -163,7 +164,10 @@
 				});
 			});
 			const keys = await getDeviceKeys(tbDeviceId);
-			this.keys = [keys];
+			console.log(this.getAttrList.map(item=>item.identifier),'aaaaaaaa')
+
+			this.keys = [this.getAttrList.map(item=>item.identifier)];
+			console.log(this,keys,this.keys)//123
 			// 昨天
 			this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD");
 			// 今天
@@ -218,4 +222,4 @@
 		height: 100vh;
 		background-color: #f8f9fa;
 	}
-</style>
\ No newline at end of file
+</style>

@@ -23,6 +23,7 @@
 </template>
 
 <script>
+import {mapActions } from 'vuex'
 	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 	import api from '@/api/index.js'
@@ -99,7 +100,7 @@
 				this.conditions = {
 					status:this.paramsStaus
 				}
-
+				
 			}
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
@@ -113,6 +114,7 @@
 			}
 		},
 		methods: {
+			...mapActions(['updateBadgeTotal']),
 			inputChanged(e) {
 				this.resetQuery();
 				this.topBack();
@@ -175,15 +177,22 @@
 						load: false
 					}
 				})
-				if (!res) return
-				uni.stopPullDownRefresh();
-				that.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
-				that.alarmTotal = res.total;
-				if (page == 1) {
-					that.list = res.items;
-				} else {
-					that.list = that.list.concat(res.items);
+				if(res){
+					const resAlarm = await uni.$u.http.get('/yt/homepage/app?login=true');
+					if (resAlarm) {
+						//异步实时更新告警徽标数
+						await this.updateBadgeTotal(resAlarm.totalAlarm?.activedAlarm);
+					}
+					uni.stopPullDownRefresh();
+					that.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
+					that.alarmTotal = res.total;
+					if (page == 1) {
+						that.list = res.items;
+					} else {
+						that.list = that.list.concat(res.items);
+					}
 				}
+
 			},
 			close() {
 				this.show = false;