.

pages/dev-ops/device.vue

@@ -3,6 +3,14 @@
 		empty-view-text="抱歉，暂时还没有相关数据！">
 		<template #top>
 			<custom-nav-bar :left="true" title="设备运维"></custom-nav-bar>
+			<view class="search">
+				<uni-forms ref="form" :model="queryParams" labelWidth="0px">
+					<uni-forms-item label="" name="">
+						<custom-land-tree :defaultLand="land" @change="handleTreeChange"
+							style="width: 100%;float: left;margin-right: 2px;"></custom-land-tree>
+					</uni-forms-item>
+				</uni-forms>
+			</view>
 		</template>
 
 		<view class="card">
@@ -163,8 +171,6 @@
 			</uni-forms>
 		</view>
 	</custom-popup>
-	
-	
 </template>
 <script>
 	import * as DevOpsApi from "@/api/dev-ops/index.js"
@@ -172,6 +178,7 @@
 	export default {
 		data() {
 			return {
+				land: null,
 				landId: null,
 				dataList: [],
 				dc: getApp().dc, // 设备控制公共代码
@@ -186,12 +193,6 @@
 			}
 		},
 		onLoad(par) {
-			if (getApp().ijs.land) {
-				this.landId = getApp().ijs.land.id;
-			} else {
-				this.landId = -1;
-			}
-
 			// 频段
 			let list = [];
 			for (let i = 410; i < 491; i++) {
@@ -202,6 +203,7 @@
 				list.push(lfObj);
 			}
 			this.rolaFrequency.range = list;
+			this.setQueryParams(getApp().ijs.land);
 			const that = this;
 			getApp().on("mqtt", "mqtt_devOps_station", function(e) {
 				if (e.type == "state") {
@@ -235,6 +237,21 @@
 			getApp().off("mqtt", "mqtt_devOps_station")
 		},
 		methods: {
+			// 设置地块
+			setQueryParams(e) {
+				if (e) {
+					this.land = e || null;
+					this.landId = e.id;
+				} else {
+					this.land = null;
+					this.landId = -1;
+				}
+			},
+			// 地块选择
+			handleTreeChange(e) {
+				this.setQueryParams(e);
+				this.$refs.paging.reload();
+			},
 			queryList(pageNo, pageSize) {
 				DevOpsApi.getList(this.landId).then(res => {
 					// console.error("res:", res);
@@ -397,8 +414,33 @@
 </script>
 
 <style lang="scss" scoped>
+	.search {
+		background: #fff;
+
+		::v-deep.uni-searchbar {
+			padding: 0px 10px 10px 10px;
+		}
+
+		// 表单
+		::v-deep.uni-forms-item__label {
+			display: none !important;
+		}
+
+		.u-checkbox {
+			margin: 0 !important;
+			height: 35px;
+		}
+
+		.uni-forms-item.is-direction-left {
+			margin: 0 !important;
+		}
+	}
+
 	.card.card-grey {
 		margin: 10px 0 0;
 	}
-	::v-deep .tc-content{overflow: inherit !important;}
+
+	::v-deep .tc-content {
+		overflow: inherit !important;
+	}
 </style>

pages/work/operation-log/index.vue

@@ -11,7 +11,7 @@
 					</uni-forms-item>
 				</uni-forms>
 				<uni-search-bar v-model="queryParams.searchValue" placeholder="请输入出水口/设备编码" cancelButton="none"
-					@confirm="queryList" @clear="queryList" />
+					@confirm="$refs.paging.reload()" @clear="$refs.paging.reload()" />
 			</view>
 		</template>
 		<view class="card" v-for="item in dataList">
@@ -106,7 +106,7 @@
 			// 地块选择
 			handleTreeChange(e) {
 				this.setQueryParams(e);
-				this.queryList(1);
+				this.$refs.paging.reload();
 			},
 			// 查询数据
 			queryList(pageNo, pageSize) {
@@ -175,6 +175,20 @@
 		::v-deep.uni-searchbar {
 			padding: 0px 10px 10px 10px;
 		}
+
+		// 表单
+		::v-deep.uni-forms-item__label {
+			display: none !important;
+		}
+
+		.u-checkbox {
+			margin: 0 !important;
+			height: 35px;
+		}
+
+		.uni-forms-item.is-direction-left {
+			margin: 0 !important;
+		}
 	}
 
 	.list1>view {
@@ -189,20 +203,6 @@
 		font-size: 13px !important;
 	}
 
-	// 表单
-	::v-deep.uni-forms-item__label {
-		display: none !important;
-	}
-
-	.u-checkbox {
-		margin: 0 !important;
-		height: 35px;
-	}
-
-	.uni-forms-item.is-direction-left {
-		margin: 0 !important;
-	}
-
 	.popup-content {
 		padding: 10px;
 	}