diff --git a/src/main/resources/app2/src/router/index.js b/src/main/resources/app2/src/router/index.js index b33adec..be0af48 100644 --- a/src/main/resources/app2/src/router/index.js +++ b/src/main/resources/app2/src/router/index.js @@ -18,6 +18,11 @@ const router = createRouter({ name: 'WaterQuality', component: () => import('../views/WaterQualityPage.vue') }, + { + path: '/realtime-data', + name: 'RealtimeData', + component: () => import('../views/RealtimeDataPage.vue') + }, { path: '/scan', name: 'ScanPage', diff --git a/src/main/resources/app2/src/services/deviceService.js b/src/main/resources/app2/src/services/deviceService.js index 0e14971..6eb0287 100644 --- a/src/main/resources/app2/src/services/deviceService.js +++ b/src/main/resources/app2/src/services/deviceService.js @@ -62,6 +62,17 @@ export const deviceService = { } } + throw error.response?.data || error.message + } + }, + // 新增:获取实时数据接口 + async getRealtimeData(terminalId) { + try { + const response = await api.get(`/api/water/realtime/${terminalId}`) + console.log(`终端 ${terminalId} 实时数据:`, response.data) + return response.data + } catch (error) { + console.error(`获取终端 ${terminalId} 实时数据失败:`, error) throw error.response?.data || error.message } } diff --git a/src/main/resources/app2/src/views/RealtimeDataPage.vue b/src/main/resources/app2/src/views/RealtimeDataPage.vue new file mode 100644 index 0000000..4db6e42 --- /dev/null +++ b/src/main/resources/app2/src/views/RealtimeDataPage.vue @@ -0,0 +1,414 @@ + + + + + diff --git a/src/main/resources/app2/src/views/ScanPage.vue b/src/main/resources/app2/src/views/ScanPage.vue index d054083..1dd8f56 100644 --- a/src/main/resources/app2/src/views/ScanPage.vue +++ b/src/main/resources/app2/src/views/ScanPage.vue @@ -142,10 +142,10 @@ @@ -594,10 +594,10 @@ const recordWaterHistory = (data) => { } // 查看水质 -const viewWaterQuality = () => { +const viewRealtimeData = () => { if (deviceInfo.value) { router.push({ - path: '/water-quality', + path: '/realtime-data', query: { terminalId: deviceInfo.value.id, deviceId: deviceInfo.value.deviceId