Browse Source

编辑点位,由于后端返回的数据是字符串类型,导致校验出现问题,前端现在统一转换成数字类型

like 7 months ago
parent
commit
db15e84418

+ 11 - 0
snowy-admin-web/src/views/biz/monitor/point/form.vue

@@ -372,6 +372,16 @@
 					if (formData.value.alarmUsers && formData.value.alarmUsers.length > 0) {
 						formData.value.alarmUsers = formData.value.alarmUsers.map((item) => item.openId)
 					}
+					// 由于后端返回的是字符串类型,导致校验出现问题,前端现在统一转换成数字类型
+					formData.value = {
+						...formData.value,
+						temperatureUp: formData.value.temperatureUp ? Number(formData.value.temperatureUp) : null,
+						temperatureDown: formData.value.temperatureDown ? Number(formData.value.temperatureDown) : null,
+						humidityUp: formData.value.humidityUp ? Number(formData.value.humidityUp) : null,
+						humidityDown: formData.value.humidityDown ? Number(formData.value.humidityDown) : null,
+						co2Up: formData.value.co2Up ? Number(formData.value.co2Up) : null,
+						co2Down: formData.value.co2Down ? Number(formData.value.co2Down) : null
+					}
 				}
 			})
 	}
@@ -500,6 +510,7 @@
 					ignoreStartTime: formData.value.time && formData.value.time.length ? formData.value.time[0] : null,
 					ignoreEndTime: formData.value.time && formData.value.time.length ? formData.value.time[1] : null
 				}
+
 				delete parameter.time
 				locationApi.submitForm(parameter, formData.value.id).then(() => {
 					onClose()

+ 52 - 30
snowy-admin-web/src/views/sys/role/index.vue

@@ -5,6 +5,7 @@
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
+					v-model:selectedKeys="selectedKeys"
 					:tree-data="treeData"
 					:field-names="treeFieldNames"
 					@select="treeSelect"
@@ -46,6 +47,7 @@
 					:row-key="(record) => record.id"
 					:row-selection="options.rowSelection"
 					@resizeColumn="handleResizeColumn"
+					v-if="selectedKeys.length"
 				>
 					<template #operator class="table-operator">
 						<a-space>
@@ -177,6 +179,7 @@
 	const searchFormState = ref({})
 	// 默认展开的节点
 	const defaultExpandedKeys = ref([])
+	const selectedKeys = ref([]) //默认选中第一个节点
 	const treeData = ref([])
 	// 替换treeNode 中 title,key,children
 	const treeFieldNames = { children: 'children', title: 'name', key: 'id' }
@@ -184,6 +187,54 @@
 	// 记录数据
 	const recordCacheData = ref({})
 
+	onMounted(() => {
+		loadTreeData()
+	})
+	// 加载左侧的树
+	const loadTreeData = () => {
+		orgApi
+			.orgTree()
+			.then((res) => {
+				cardLoading.value = false
+				if (res !== null) {
+					// 树中插入全局角色类型
+					const globalRoleType = [
+						{
+							id: 'GLOBAL',
+							parentId: '-1',
+							name: '全局'
+						}
+					]
+					treeData.value = globalRoleType.concat(res)
+
+					if (isEmpty(defaultExpandedKeys.value)) {
+						// 默认展开2级
+						treeData.value.forEach((item) => {
+							// 因为0的顶级
+							if (item.parentId === '0') {
+								defaultExpandedKeys.value.push(item.id)
+								// 取到下级ID
+								if (item.children) {
+									item.children.forEach((items) => {
+										defaultExpandedKeys.value.push(items.id)
+									})
+								}
+							}
+						})
+					}
+				}
+			})
+			.finally(() => {
+				cardLoading.value = false
+				// 设置默认选中第一个节点
+				if (treeData.value.length > 0) {
+					selectedKeys.value = [treeData.value[0].id]
+
+					treeSelect(selectedKeys.value) // 选中第一个节点
+				}
+			})
+	}
+
 	// 表格查询 返回 Promise 对象
 	const loadData = (parameter) => {
 		let param = Object.assign(parameter, searchFormState.value)
@@ -196,36 +247,7 @@
 		searchFormRef.value.resetFields()
 		tableRef.value.refresh(true)
 	}
-	// 加载左侧的树
-	orgApi.orgTree().then((res) => {
-		cardLoading.value = false
-		if (res !== null) {
-			// 树中插入全局角色类型
-			const globalRoleType = [
-				{
-					id: 'GLOBAL',
-					parentId: '-1',
-					name: '全局'
-				}
-			]
-			treeData.value = globalRoleType.concat(res)
-			if (isEmpty(defaultExpandedKeys.value)) {
-				// 默认展开2级
-				treeData.value.forEach((item) => {
-					// 因为0的顶级
-					if (item.parentId === '0') {
-						defaultExpandedKeys.value.push(item.id)
-						// 取到下级ID
-						if (item.children) {
-							item.children.forEach((items) => {
-								defaultExpandedKeys.value.push(items.id)
-							})
-						}
-					}
-				})
-			}
-		}
-	})
+
 	// 点击树查询
 	const treeSelect = (selectedKeys) => {
 		if (selectedKeys.length > 0) {