fix：DEFECT-364 DEFECT-367 DEFECT-368(都是属于告警的问题)修复告警名称筛选，数据上拉加载位全部数据问题，修改告警筛选弹窗日期…

…选择样式问题，修改告警筛选日期筛选无数据问题

@@ -229,10 +229,17 @@ export default {
 			timeArea,
 			ordId: '',
 			detailStatus: false,
-			alertTotal: 0
+			alertTotal: 0,
+			searchAlarmText: '',
+			startTimeVa: '',
+			endTimeVa: '',
+			startTimeArea: '',
+			endTimeArea: '',
+			type: null
 		};
 	},
 	onShow() {
+		this.page.num = 1;
 		if (this.detailStatus) {
 			this.loadData(1, null, null, null, null, null, null);
 		}
@@ -243,6 +250,7 @@ export default {
 	onHide() {
 		this.ordId = '';
 		this.detailStatus = false;
+		this.type = null;
 	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
@@ -251,13 +259,12 @@ export default {
 			this.loadData(1, null, null, null, null, null, null);
 		} else {
 			let params = JSON.parse(e.type);
-			let type;
 			if (Array.isArray(params)) {
-				type = params.join(',');
+				this.type = params.join(',');
 			} else {
-				type = params;
+				this.type = params;
 			}
-			this.loadData(1, type, null, null, null, null, null);
+			this.loadData(1, this.type, null, null, null, null, null);
 		}
 	},
 	watch: {
@@ -267,6 +274,10 @@ export default {
 	},
 	methods: {
 		inputChanged(e) {
+			this.resetData();
+			this.topBack();
+			this.searchAlarmText = e;
+			this.page.num = 1;
 			this.loadData(1, null, null, null, null, null, null, e);
 		},
 		getAlertStatus(e, i) {
@@ -285,44 +296,39 @@ export default {
 			this.current4 = i;
 			this.selectTimeVal = e.value;
 			let curTime = new Date();
-			const formatS = curTime
-				.getTime()
-				.toString()
-				.substring(0, 10);
+			const formatS = curTime.getTime();
 			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() + this.selectTimeVal));
-			const formatE = addMinute
-				.getTime()
-				.toString()
-				.substring(0, 10);
+			const formatE = addMinute.getTime();
 			this.timeData.getTimeGapS = formatS;
 			this.timeData.getTimeGapE = formatE;
 		},
 		queryData() {
+			this.topBack();
+			this.page.num = 1;
 			let date1 = new Date(this.timeData.selectTime[0]);
 			let date2 = new Date(this.timeData.selectTime[1]);
-			let startTimeVa, endTimeVa;
 			if (this.timeData.selectTime.length == 0) {
-				startTimeVa = '';
-				endTimeVa = '';
+				this.startTimeVa = '';
+				this.endTimeVa = '';
 			} else {
-				startTimeVa = date1
-					.getTime()
-					.toString()
-					.substring(0, 10);
-				endTimeVa = date2
-					.getTime()
-					.toString()
-					.substring(0, 10);
+				this.startTimeVa = date1.getTime();
+				this.endTimeVa = date2.getTime();
 			}
-			let startTimeArea, endTimeArea;
 			if (this.timeData.getTimeGapS == '') {
-				startTimeArea = '';
-				endTimeArea = '';
+				this.startTimeArea = '';
+				this.endTimeArea = '';
 			} else {
-				startTimeArea = this.timeData.getTimeGapS;
-				endTimeArea = this.timeData.getTimeGapE;
+				this.startTimeArea = this.timeData.getTimeGapS;
+				this.endTimeArea = this.timeData.getTimeGapE;
 			}
-			this.loadData(1, this.alertStatusVal, startTimeVa ? startTimeVa : startTimeArea, endTimeVa ? endTimeVa : endTimeArea, this.alertLevelVal, this.deviceTypeVal);
+			this.loadData(
+				1,
+				this.alertStatusVal,
+				this.startTimeVa ? this.startTimeVa : this.startTimeArea,
+				this.endTimeVa ? this.endTimeVa : this.endTimeArea,
+				this.alertLevelVal,
+				this.deviceTypeVal
+			);
 			this.show = false;
 		},
 		resetData() {
@@ -338,6 +344,13 @@ export default {
 			this.timeDatagetTimeGapS = '';
 			this.timeDatagetTimeGapE = '';
 			this.range = [];
+			this.searchAlarmText = '';
+			this.startTimeVa = '';
+			this.endTimeVa = '';
+			this.startTimeArea = '';
+			this.endTimeArea = '';
+			this.ordId = '';
+			this.type = null;
 		},
 		bindImageUrl(e) {
 			switch (e) {
@@ -361,18 +374,50 @@ export default {
 					break;
 			}
 		},
+		//筛选数据让它回到顶部
+		topBack() {
+			uni.pageScrollTo({
+				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+				duration: 300 // 滚动动画的时长
+			});
+		},
 		/*下拉刷新的回调 */
 		downCallback() {
 			//联网加载数据
 			this.list.length = 0;
 			this.page.num = 1;
-			this.loadData(1);
+			this.loadData(this.page.num, null, null, null, null, null, null, null);
+			this.resetData();
 		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			this.loadData(this.page.num);
+			if (
+				this.type != null ||
+				this.alertStatusVal != '' ||
+				this.searchAlarmText != '' ||
+				this.deviceTypeVal != '' ||
+				this.alertLevelVal != '' ||
+				this.startTimeVa != '' ||
+				this.startTimeArea != '' ||
+				this.ordId != ''
+			) {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(
+					this.page.num,
+					this.alertStatusVal ? this.alertStatusVal : this.type,
+					this.startTimeVa,
+					this.endTimeVa,
+					this.alertLevelVal,
+					this.deviceTypeVal,
+					this.ordId,
+					this.searchAlarmText
+				);
+			} else {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			}
 		},
 		loadData(pageNo, statusV, startTimeV, endTimeV, severityV, deviceTypeV, organizationV, alarmName) {
 			let that = this;
@@ -463,6 +508,6 @@ export default {
 	margin-top: -55rpx !important;
 }
 /deep/ .uni-calendar--fixed {
-	bottom: 72rpx !important;
+	bottom: 172rpx !important;
 }
 </style>