Эх сурвалжийг харах

冰箱管理加一个查询条件:所属房间

like 5 сар өмнө
parent
commit
726a6cd20d

+ 5 - 5
snowy-admin-web/src/views/biz/monitor/object/form.vue

@@ -17,7 +17,7 @@
 				<a-select
 					ref="select"
 					v-model:value="formData.roomId"
-					:options="orgOptions"
+					:options="roomOptions"
 					allowClear
 					style="width: 100%"
 					placeholder="请选择您要绑定的房间"
@@ -68,7 +68,7 @@
 	const visible = ref(false)
 	const emit = defineEmits({ successful: null })
 	const formRef = ref()
-	const orgOptions = ref([])
+	const roomOptions = ref([])
 
 	// 默认要校验的
 	const formRules = {
@@ -83,7 +83,7 @@
 
 	// 打开抽屉
 	const onOpen = (record) => {
-		setOrgData()
+		setRoomData()
 		setalarmUsersData()
 		visible.value = true
 		if (record) {
@@ -97,9 +97,9 @@
 		}
 	}
 	//获取房间的数据
-	const setOrgData = () => {
+	const setRoomData = () => {
 		targetRoomApi.targetRoomList().then((res) => {
-			orgOptions.value = res
+			roomOptions.value = res
 		})
 	}
 	//获取报警接收人的数据

+ 28 - 1
snowy-admin-web/src/views/biz/monitor/object/index.vue

@@ -24,6 +24,20 @@
 									><a-form-item label="冰箱名称" name="name">
 										<a-input v-model:value="searchFormState.name" placeholder="请输入冰箱名称" /> </a-form-item
 								></a-col>
+
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+									<a-form-item label="所属房间" name="roomId">
+										<a-select
+											ref="select"
+											v-model:value="searchFormState.roomId"
+											:options="roomOptions"
+											allowClear
+											style="width: 100%"
+											placeholder="请选择您要绑定的房间"
+											:field-names="{ label: 'name', value: 'id' }"
+										/>
+									</a-form-item>
+								</a-col>
 							</a-form>
 						</a-row>
 					</div>
@@ -165,9 +179,10 @@
 <script setup>
 	import router from '@/router'
 	import setupApi from '@/api/basicset/setupApi'
+	import targetRoomApi from '@/api/coldchain/targetRoomApi'
 	import Form from './form.vue'
 	const formRef = ref()
-
+	const roomOptions = ref([])
 	const searchFormRef = ref()
 	const searchFormState = ref({})
 	const tableRef = ref()
@@ -235,6 +250,18 @@
 			width: 200
 		}
 	]
+
+	onMounted(() => {
+		setRoomData()
+	})
+
+	//获取房间的数据
+	const setRoomData = () => {
+		targetRoomApi.targetRoomList().then((res) => {
+			roomOptions.value = res
+		})
+	}
+
 	// 可伸缩列
 	const handleResizeColumn = (w, col) => {
 		col.width = w