fix:DEFECT-355 修改告警筛选传时间问题

@@ -176,6 +176,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</u-popup>
 		</u-popup>
+		<!-- 告警筛选 -->
 		<u-calendar
 		<u-calendar
 			:show="showCalendar"
 			:show="showCalendar"
 			mode="range"
 			mode="range"
@@ -245,20 +246,20 @@ export default {
 		if (this.detailStatus) {
 		if (this.detailStatus) {
 			this.loadData(1, null, null, null, null, null, null);
 			this.loadData(1, null, null, null, null, null, null);
 		}
 		}
-		if (this.ordId == '') {
-		} else {
+		if (this.ordId) {
 			this.loadData(1, null, null, null, null, null, this.ordId);
 			this.loadData(1, null, null, null, null, null, this.ordId);
 		}
 		}
 	},
 	},
 	onHide() {
 	onHide() {
 		this.ordId = '';
 		this.ordId = '';
 		this.detailStatus = false;
 		this.detailStatus = false;
-		this.loadData(1, null, null, null, null, null, null);
 	},
 	},
 	onLoad(e) {
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		uni.hideTabBar();
-		if (e.type !== undefined) {
+		if (e.type == undefined) {
+			this.loadData(1, null, null, null, null, null, null);
+		} else {
 			let params = JSON.parse(e.type);
 			let params = JSON.parse(e.type);
 			let type;
 			let type;
 			if (Array.isArray(params)) {
 			if (Array.isArray(params)) {
@@ -267,8 +268,6 @@ export default {
 				type = params;
 				type = params;
 			}
 			}
 			this.loadData(1, type, null, null, null, null, null);
 			this.loadData(1, type, null, null, null, null, null);
-		} else {
-			this.loadData(1, null, null, null, null, null, null);
 		}
 		}
 	},
 	},
 	methods: {
 	methods: {
@@ -365,13 +364,19 @@ export default {
 				organizationId: organizationV,
 				organizationId: organizationV,
 				alarmType: alarmName
 				alarmType: alarmName
 			};
 			};
+			if (statusV == '') {
+				delete httpData.status;
+			}
+			if (severityV == '') {
+				delete httpData.severity;
+			}
 			uni.$u.http
 			uni.$u.http
 				.get('/yt/alarm', { params: httpData, custom: { load: false } })
 				.get('/yt/alarm', { params: httpData, custom: { load: false } })
 				.then(res => {
 				.then(res => {
 					uni.stopPullDownRefresh();
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
 					this.mescroll.endByPage(res.items.length, res.total);
 					//异步实时更新告警徽标数
 					//异步实时更新告警徽标数
-					this.updateBadgeTotal(httpData);
+					this.updateBadgeTotal(res.total);
 					this.alertTotal = res.total;
 					this.alertTotal = res.total;
 					if (pageNo == 1) {
 					if (pageNo == 1) {
 						this.list = res.items;
 						this.list = res.items;
@@ -390,7 +395,6 @@ export default {
 				url: './org/org'
 				url: './org/org'
 			});
 			});
 		},
 		},
-		open() {},
 		close() {
 		close() {
 			this.show = false;
 			this.show = false;
 		},
 		},