From 78c39e3780b37a0b4888972505f460dbee7861d0 Mon Sep 17 00:00:00 2001
From: qubiaobiao <3294694717@qq.com>
Date: Thu, 25 Apr 2024 14:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AF=E4=BB=B6=E9=95=BF?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=90=E8=A1=8C=E5=90=8E3D=E9=A5=BC?=
 =?UTF-8?q?=E5=9B=BE=E6=B6=88=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/app.ts                       |  1 +
 src/render/api/util.js                |  2 +-
 src/render/components/Ring.vue        | 16 +++++++++++++++-
 src/render/page/DataMonitorPage.vue   |  2 +-
 src/render/page/SignalMonitorPage.vue |  2 +-
 src/render/page/StateMonitorPage.vue  |  2 +-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/app.ts b/src/main/app.ts
index 6ed3c68..58877e4 100644
--- a/src/main/app.ts
+++ b/src/main/app.ts
@@ -95,6 +95,7 @@ function createWindow(page: string, display: any) {
     win.webContents.openDevTools()
   } else {
     win.loadFile(`dist/render/${page}.html`)
+    // win.webContents.openDevTools()
   }
 
   windows.push(win);
diff --git a/src/render/api/util.js b/src/render/api/util.js
index 9f8da0c..7b44839 100644
--- a/src/render/api/util.js
+++ b/src/render/api/util.js
@@ -43,7 +43,7 @@ export function getNMEAObj(nmeaStr) {
 
 export function getGSV (nmeaStr) {
   const nmeaObj = getNMEAObj(nmeaStr)
-  console.log(nmeaObj, '================')
+  // console.log(nmeaObj, '================')
   if (!nmeaObj || !nmeaObj.GSV) return null
 
   const { GSV } = nmeaObj
diff --git a/src/render/components/Ring.vue b/src/render/components/Ring.vue
index c8cdf17..f2ce857 100644
--- a/src/render/components/Ring.vue
+++ b/src/render/components/Ring.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-chart ref="ring" :option="option" />
+  <v-chart v-if="refresh" ref="ring" :option="option" />
 </template>
 
 <script lang="ts" setup>
@@ -17,6 +17,8 @@ use([CanvasRenderer, LegendComponent, PieChart]);
 const emit = defineEmits(['changeColor']);
 
 const ring = ref(null);
+const nowtime = ref(new Date().getTime());
+const refresh = ref(true);
 
 // 生成环形的曲面参数方程，用于 series-surface.parametricEquation
 const getParametricEquation = (
@@ -28,6 +30,11 @@ const getParametricEquation = (
   height,
   size
 ) => {
+  if(new Date().getTime() > nowtime.value){
+    refresh.value = false;
+    // console.log(new Date()+' getParametricEquation Log: '+startRatio+', '+endRatio+', '+isSelected+', '+isHovered+', '+k+', '+height+', '+size);
+    nowtime.value = new Date().getTime() + 600000;
+  }
   // 计算
   let midRatio = (startRatio + endRatio) / 2;
 
@@ -282,6 +289,9 @@ const option = reactive({
 });
 
 const getPie3D = (sumValue, pieValue, internalDiameterRatio, height, size) => {
+  // if(new Date().getTime() > nowtime.value){
+  //   console.log(new Date()+' getPie3D Log: '+sumValue+', '+pieValue+', '+internalDiameterRatio+', '+height+', '+size);
+  // }
   let startValue = 0;
   let endValue = 0;
   // internalDiameterRatio（0~1之间的浮点数）：内径/外径的值（默认值 1/2）
@@ -345,6 +355,10 @@ onMounted(() => {
 });
 
 const update = (bd_val: number, gp_val: number, gl_val: number, ga_val: number) => {
+  if(!refresh.value){
+    // console.log('refresh');
+    refresh.value = true;
+  }
   option.series[0].pieData.value = bd_val;
   option.series[1].pieData.value = gp_val;
   option.series[2].pieData.value = gl_val;
diff --git a/src/render/page/DataMonitorPage.vue b/src/render/page/DataMonitorPage.vue
index db2ad29..7490dca 100644
--- a/src/render/page/DataMonitorPage.vue
+++ b/src/render/page/DataMonitorPage.vue
@@ -74,7 +74,7 @@ const getDate = (date, timestamp) => {
 
 const getMonitoringData = (nmeaStr: string) => {
   const nmeaObj: any = getNMEAObj(nmeaStr);
-  console.log(nmeaObj, "================");
+  // console.log(nmeaObj, "================");
   if (!nmeaObj || !nmeaObj.RMC || !nmeaObj.GGA) return null;
 
   const { RMC, GGA } = nmeaObj;
diff --git a/src/render/page/SignalMonitorPage.vue b/src/render/page/SignalMonitorPage.vue
index d252132..25f998f 100644
--- a/src/render/page/SignalMonitorPage.vue
+++ b/src/render/page/SignalMonitorPage.vue
@@ -76,7 +76,7 @@ const getSatelliteCount = (GSVArr: Array<any>) => {
 
 const getMonitoringData = (nmeaStr: string) => {
   const nmeaObj: any = getNMEAObj(nmeaStr)
-  console.log(nmeaObj, '================')
+  // console.log(nmeaObj, '================')
   if (!nmeaObj || !nmeaObj.GSV || !nmeaObj.GSA) return null
 
   const { GSV, GSA } = nmeaObj
diff --git a/src/render/page/StateMonitorPage.vue b/src/render/page/StateMonitorPage.vue
index d7ed66d..823e118 100644
--- a/src/render/page/StateMonitorPage.vue
+++ b/src/render/page/StateMonitorPage.vue
@@ -54,7 +54,7 @@ onMounted(() => {
 
 const getMonitoringData = (nmeaStr: string) => {
   const nmeaObj: any = getNMEAObj(nmeaStr)
-  console.log(nmeaObj, '================')
+  // console.log(nmeaObj, '================')
   if (!nmeaObj || !nmeaObj.GSV || !nmeaObj.GSA) return null
 
   const { GSV, GSA } = nmeaObj