1

snowy-admin-web/src/views/motoring/location/index.vue

@@ -82,6 +82,12 @@
 			align: 'center',
 			ellipsis: true
 		},
+		{
+			title: '监控设备型号',
+			dataIndex: 'modelName',
+			align: 'center',
+			ellipsis: true
+		},
 		{
 			title: '传感器编号',
 			dataIndex: 'sensorCode',
@@ -100,25 +106,6 @@
 			align: 'center',
 			ellipsis: true
 		},
-
-		{
-			title: '监控设备型号',
-			dataIndex: 'modelName',
-			align: 'center',
-			ellipsis: true
-		},
-		{
-			title: '监控设备编号',
-			dataIndex: 'monitorDeviceId',
-			align: 'center',
-			ellipsis: true
-		},
-		{
-			title: '冷链编号',
-			dataIndex: 'code',
-			align: 'center',
-			ellipsis: true
-		},
 		{
 			title: '报警上限',
 			dataIndex: 'limitUp',
@@ -140,13 +127,45 @@
 		}
 	]
 
-	const loadData = (parameter) => {
-		return locationApi.locationTree(Object.assign(searchFormState.value)).then((data) => {
+	const loadData = () => {
+		return locationApi.locationTree(Object.assign(searchFormState.value)).then((res) => {
+			console.log(res, 'x')
+
 			if (data) {
 				return data
 			}
 			return []
 		})
+
+
+
+
+		if (!module.value) {
+			return mobileMenuApi.mobileMenuModuleSelector().then((data) => {
+				moduleList.value = data
+				module.value = data.length > 0 ? data[0].id : ''
+				searchFormState.value.module = module.value
+				return locationApi.locationTree(Object.assign(searchFormState.value)).then((data) => {
+					if (data) {
+						return data
+					}
+					return []
+				})
+			})
+		} else {
+			return locationApi.locationTree(Object.assign(searchFormState.value)).then((data) => {
+				if (data) {
+					return data
+				}
+				return []
+			})
+		}
+
+
+
+
+
+
 	}
 	// 重置
 	const reset = () => {