From c22e126c5c070a3d16809dfdd65e89c1306372c9 Mon Sep 17 00:00:00 2001 From: yezhichao <651778286@qq.com> Date: Wed, 24 Nov 2021 07:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8D=AB=E6=98=9F=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=95=B0=E6=8D=AE=E7=9A=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/app.ts | 4 +-- src/render/api/util.js | 25 +++++++++++++++ src/render/components/ScrollBoardTable.vue | 37 +++++++++++----------- src/render/components/WaterLevel.vue | 2 +- src/render/page/InfoMonitorPage.vue | 15 +++++++-- 5 files changed, 58 insertions(+), 25 deletions(-) diff --git a/src/main/app.ts b/src/main/app.ts index 8dbcc10..ce57bc2 100644 --- a/src/main/app.ts +++ b/src/main/app.ts @@ -23,9 +23,9 @@ function createWindow(page: String) { function launch() { // createWindow('satellite-data-monitor-platform') - // createWindow('satellite-info-monitor-platform') + createWindow('satellite-info-monitor-platform') // createWindow('satellite-signal-monitor-platform') - createWindow('satellite-state-monitor-platform') + // createWindow('satellite-state-monitor-platform') } app.whenReady().then(launch) diff --git a/src/render/api/util.js b/src/render/api/util.js index a19b4a4..edd9b65 100644 --- a/src/render/api/util.js +++ b/src/render/api/util.js @@ -40,3 +40,28 @@ export function getNMEAObj(nmeaStr) { return JSON.parse(nmeaStr) } + +export function getGSAGSV (nmeaStr) { + const nmeaObj = getNMEAObj(nmeaStr) + if (!nmeaObj || !nmeaObj.GSV || !nmeaObj.GSA) return null + + const { GSV, GSA } = nmeaObj + const bd = { + GSVArr: GSV.filter((gsv) => gsv.talker_id === 'BD'), + GSAArr: GSA.filter((gsa) => gsa.talker_id === 'BD') + } + const gp = { + GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GP'), + GSAArr: GSA.filter((gsa) => gsa.talker_id === 'GP') + } + const gl = { + GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GL'), + GSAArr: GSA.filter((gsa) => gsa.talker_id === 'GL') + } + const ga = { + GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GA'), + GSAArr: GSA.filter((gsa) => gsa.talker_id === 'GA') + } + + return { bd, gp, gl, ga } +} diff --git a/src/render/components/ScrollBoardTable.vue b/src/render/components/ScrollBoardTable.vue index 1f1061a..b316084 100644 --- a/src/render/components/ScrollBoardTable.vue +++ b/src/render/components/ScrollBoardTable.vue @@ -12,7 +12,7 @@
) => { + if (GSVArr.length <= 0 ) return + + let satellites: any[] = [] + GSVArr.forEach((GSV) => { + satellites = satellites.concat(GSV.satellites) + }) + console.log(satellites, '===================='); + data.satellites = satellites +} + +defineExpose({ update })