1

snowy-admin-web/src/views/biz/monitor/mem/form.vue

@@ -184,15 +184,22 @@
 
 	// 获取设备型号
 	const loadData = () => {
-		devicetypeApi.devicetypeList().then((res) => {
-			modeOptions.value = (res || []).map((item) => {
-				return {
-					...item,
-					value: item['id'],
-					label: item['name']
+		devicetypeApi
+			.devicetypeList()
+			.then((res) => {
+				modeOptions.value = (res || []).map((item) => {
+					return {
+						...item,
+						value: item['id'],
+						label: item['name']
+					}
+				})
+			})
+			.finally(() => {
+				if (formData.value.modelName) {
+					modelNameChange(formData.value.modelName)
 				}
 			})
-		})
 	}
 
 	const modeData = ref({ sensorType: '' }) //选中的设备型号
@@ -221,9 +228,6 @@
 		visible.value = true
 		if (record) {
 			formData.value = Object.assign({}, record)
-			setTimeout(() => {
-				modelNameChange(formData.value.modelName)
-			}, 300)
 		} else {
 			formData.value = { sortCode: 99 }
 		}