fix:[DEFECT-360] 修复首页调整查询问题

@@ -25,7 +25,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</u-sticky>
 		</u-sticky>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :upOption="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
 			<view class="device-list">
 			<view class="device-list">
 				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
 				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
 					<view
 					<view
@@ -101,7 +101,6 @@
 
 
 <script>
 <script>
 import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import fNavbar from '@/components/module/f-navbar/f-navbar';
 import FilterItem from './FilterItem.vue';
 import FilterItem from './FilterItem.vue';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import { debounce } from '@/plugins/throttle.js';
 import { debounce } from '@/plugins/throttle.js';
@@ -109,7 +108,6 @@ export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	components: {
 	components: {
 		fTabbar,
 		fTabbar,
-		fNavbar,
 		FilterItem
 		FilterItem
 	},
 	},
 	data() {
 	data() {
@@ -188,19 +186,27 @@ export default {
 			page: {
 			page: {
 				num: 0,
 				num: 0,
 				size: 10
 				size: 10
-			}
+			},
+			deviceState: ''
 		};
 		};
 	},
 	},
-	onLoad(e) {
+	async onLoad(options) {
 		// 隐藏原生的tabbar
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		uni.hideTabBar();
-		console.log('e', e);
-		if (e.type !== undefined) {
-			console.log(123)
-			const statusT = JSON.parse(e.type);
-			this.loadData(1, {
-				deviceState: statusT
+		const { deviceState } = options;
+		this.deviceState = deviceState;
+		if (deviceState) {
+			this.deviceStatus.forEach(item => {
+				item.type === deviceState ? (item.checked = true) : (item.checked = false);
 			});
 			});
+			await this.loadData(1, {
+				deviceState
+			});
+		} else {
+			await this.loadData(1);
+		}
+		if (!this.list.length) {
+			this.mescroll.showEmpty();
 		}
 		}
 	},
 	},
 	onShow() {
 	onShow() {
@@ -217,6 +223,7 @@ export default {
 			this.list = [];
 			this.list = [];
 			this.page.num = 1;
 			this.page.num = 1;
 			//联网加载数据
 			//联网加载数据
+			this.resetFilter();
 			this.loadData(this.page.num);
 			this.loadData(this.page.num);
 		},
 		},
 
 
@@ -224,39 +231,41 @@ export default {
 		upCallback() {
 		upCallback() {
 			//联网加载数据
 			//联网加载数据
 			this.page.num += 1;
 			this.page.num += 1;
-			this.loadData(this.page.num);
+			const deviceState = this.deviceStatus.find(item => item.checked);
+			const alarmStatus = this.alarmStatus.find(item => item.checked);
+			const deviceType = this.typeStatus.find(item => item.checked);
+			this.loadData(this.page.num, {
+				deviceState: deviceState.type ? deviceState.type : undefined,
+				deviceType: deviceType.type ? deviceType.type : undefined,
+				alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : undefined
+			});
 		},
 		},
 
 
 		//获取设备
 		//获取设备
-		loadData(pageNo, params = {}) {
-			let httpData = {
-				page: pageNo,
-				pageSize: 10,
-				...params
-			};
-			uni.$u.http
-				.get('/yt/device', {
+		async loadData(pageNo, params = {}) {
+			try {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					...params
+				};
+				const { total, items } = await uni.$u.http.get('/yt/device', {
 					params: httpData,
 					params: httpData,
 					custom: {
 					custom: {
 						load: false
 						load: false
 					}
 					}
-				})
-				.then(res => {
-					this.total = res.total;
-					uni.stopPullDownRefresh();
-					console.log('获取后端数据', res);
-					//方法一(推荐): 后台接口有返回列表的总页数 totalPage
-					this.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
-					if (pageNo == 1) {
-						this.list = res.items;
-					} else {
-						this.list = this.list.concat(res.items);
-					}
-				})
-				.catch(() => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
 				});
 				});
+				this.total = total;
+				uni.stopPullDownRefresh();
+				this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
+				if (pageNo == 1) {
+					this.list = items;
+				} else {
+					this.list = this.list.concat(items);
+				}
+			} catch {
+				this.mescroll.endErr();
+			}
 		},
 		},
 		openOrg() {
 		openOrg() {
 			uni.navigateTo({
 			uni.navigateTo({
@@ -264,7 +273,6 @@ export default {
 			});
 			});
 		},
 		},
 		close() {
 		close() {
-			this.resetFilter();
 			this.show = false;
 			this.show = false;
 		},
 		},
 		openSearchDialog() {
 		openSearchDialog() {
@@ -371,4 +379,4 @@ export default {
 		}
 		}
 	}
 	}
 }
 }
-</style>
+</style>

@@ -157,7 +157,7 @@ export default {
 		//设备状态查询
 		//设备状态查询
 		navigatorDeviceStatus(e) {
 		navigatorDeviceStatus(e) {
 			uni.reLaunch({
 			uni.reLaunch({
-				url: '../device/device?type=' + JSON.stringify(e)
+				url: `../device/device?deviceState=${e}`
 			});
 			});
 		}
 		}
 	}
 	}