like 6 сар өмнө
parent
commit
78add9b98d

+ 6 - 3
snowy-admin-web/src/views/biz/monitor/point/form.vue

@@ -322,10 +322,11 @@
 	// 打开抽屉
 	const onOpen = (type, record) => {
 		setupListData(type, record)
-		memListData()
+		isFridgeDisabled()
 		visible.value = true
 		if (!record) {
 			formData.value = ref({ alarmUsers: [], time: [] })
+			memListData()
 		}
 	}
 
@@ -358,6 +359,7 @@
 			})
 			.finally(() => {
 				formData.value = Object.assign({}, record)
+				memListData(formData.value.sensorType)
 
 				if (type == 'add') {
 					formData.value.name = currentMonitorObj.value.name + '-' + pointName.value
@@ -370,7 +372,6 @@
 					if (formData.value.alarmUsers && formData.value.alarmUsers.length > 0) {
 						formData.value.alarmUsers = formData.value.alarmUsers.map((item) => item.openId)
 					}
-					memListData(formData.value.sensorType)
 				}
 			})
 	}
@@ -401,6 +402,9 @@
 	const memListData = (value) => {
 		memApi.memList({ isAll: false, sensorType: value }).then((res) => {
 			memListOptions.value = res || []
+			if (formData.value.monitorDeviceId) {
+				currentMonitorDevice.value = memListOptions.value.find((item) => item.id === formData.value.monitorDeviceId)
+			}
 		})
 	}
 
@@ -457,7 +461,6 @@
 	const filteredFridges = ref([])
 	// 判断 当前的监测设备 的温度范围是否在该冰箱的温度范围内
 	const isFridgeDisabled = () => {
-		console.log(currentMonitorDevice.value.temperatureUp, currentMonitorDevice.value.temperatureDown)
 		filteredFridges.value = fridgeOptions.map((fridge) => {
 			const { up, down } = fridgeRanges.value[fridge.value]
 			const isDisabled =