Selaa lähdekoodia

优化依赖的linux_rtu_modules升级, 相应的相关微服务模块版本也升级

niujiuru 2 päivää sitten
vanhempi
commit
9c181bd337

+ 1 - 1
web-ui.service/main.go

@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	Version   = "0.0.0.2"
+	Version   = "0.0.0.3"
 	BuildTime = ""
 )
 

+ 14 - 2
web-ui.service/page4_handler.go

@@ -63,8 +63,10 @@ func restartGnssService(w http.ResponseWriter, r *http.Request) {
 
 func gnssStatusHandler(w http.ResponseWriter, r *http.Request) {
 	var pos struct {
-		Lat string `json:"lat"`
-		Lon string `json:"lon"`
+		Lat    string `json:"lat"`
+		Lon    string `json:"lon"`
+		InUse  string `json:"inuse"`
+		InView string `json:"inview"`
 	}
 
 	callErr := callRPCResult(r.Context(), 7002, "core.getPositionInfo", nil, &pos)
@@ -72,6 +74,8 @@ func gnssStatusHandler(w http.ResponseWriter, r *http.Request) {
 	status := noValue
 	lat := noValue
 	lon := noValue
+	inuse := noValue
+	inview := noValue
 
 	if callErr == nil {
 		status = "🟢正常"
@@ -81,6 +85,12 @@ func gnssStatusHandler(w http.ResponseWriter, r *http.Request) {
 		if pos.Lon != "" {
 			lon = pos.Lon
 		}
+		if pos.InUse != "" {
+			inuse = pos.InUse
+		}
+		if pos.InView != "" {
+			inview = pos.InView
+		}
 	}
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
@@ -88,5 +98,7 @@ func gnssStatusHandler(w http.ResponseWriter, r *http.Request) {
 		"var1": status,
 		"var2": lat,
 		"var3": lon,
+		"var5": inuse,
+		"var6": inview,
 	})
 }

+ 8 - 0
web-ui.service/web/pages/page4.html

@@ -19,6 +19,14 @@
        <span class="label">定位状态</span>
        <span class="value" id="var4">--</span>
       </div>
+      <div class="status-item">
+       <span class="label">使用卫星数</span>
+       <span class="value" id="var5">--</span>
+      </div>
+      <div class="status-item">
+       <span class="label">总的卫星数</span>
+       <span class="value" id="var6">--</span>
+      </div>
      </div>
       <div class="status-row">
         <span class="label">当前经度</span>

+ 2 - 2
web-ui.service/web/static/js/page4.js

@@ -120,7 +120,7 @@ function getGnssStatus() {
       return r.json();
     })
     .then(data => {
-      ["var1", "var2", "var3"].forEach(id => {
+      ["var1", "var2", "var3", "var5", "var6"].forEach(id => {
         setText(id, data[id], "page4");
       });
       if (data.var1 == "--") {
@@ -133,7 +133,7 @@ function getGnssStatus() {
     .catch(e => {
       console.error("getGnssStatus() failed:", e);
 
-      ["var1", "var2", "var3", "var4"].forEach(id => {
+      ["var1", "var2", "var3", "var4", "var5", "var6"].forEach(id => {
         setText(id, null, "page4");
       });
     });