فهرست منبع

优化定位服务页面

niujiuru 3 هفته پیش
والد
کامیت
9e128949b6
3فایلهای تغییر یافته به همراه15 افزوده شده و 5 حذف شده
  1. 6 2
      web-ui.service/page4_handler.go
  2. 6 2
      web-ui.service/web/pages/page4.html
  3. 3 1
      web-ui.service/web/static/js/page4.js

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

@@ -75,8 +75,12 @@ func gnssStatusHandler(w http.ResponseWriter, r *http.Request) {
 
 
 	if callErr == nil {
 	if callErr == nil {
 		status = "🟢正常"
 		status = "🟢正常"
-		lat = pos.Lat
-		lon = pos.Lon
+		if pos.Lat != "" {
+			lat = pos.Lat
+		}
+		if pos.Lon != "" {
+			lon = pos.Lon
+		}
 	}
 	}
 
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")

+ 6 - 2
web-ui.service/web/pages/page4.html

@@ -18,11 +18,15 @@
         <span class="value" id="var1">--</span>
         <span class="value" id="var1">--</span>
       </div>
       </div>
       <div class="status-row">
       <div class="status-row">
-        <span class="label">定位经度</span>
+        <span class="label">定位状态</span>
+        <span class="value" id="var4">--</span>
+      </div>
+      <div class="status-row">
+        <span class="label">当前经度</span>
         <span class="value" id="var2">--</span>
         <span class="value" id="var2">--</span>
       </div>
       </div>
       <div class="status-row">
       <div class="status-row">
-        <span class="label">定位维度</span>
+        <span class="label">当前纬度</span>
         <span class="value" id="var3">--</span>
         <span class="value" id="var3">--</span>
       </div>
       </div>
     </div>
     </div>

+ 3 - 1
web-ui.service/web/static/js/page4.js

@@ -125,11 +125,13 @@ function getGnssStatus() {
       ["var1", "var2", "var3"].forEach(id => {
       ["var1", "var2", "var3"].forEach(id => {
         setText(id, data[id]);
         setText(id, data[id]);
       });
       });
+      const located = data.var2 !== "" && data.var3 !== "" && data.var2 !== "--" && data.var3 !== "--";
+      setText("var4", located ? "🟢已定位" : "🔵定位中");
     })
     })
     .catch(e => {
     .catch(e => {
       console.error("getGnssStatus() failed:", e);
       console.error("getGnssStatus() failed:", e);
 
 
-      ["var1", "var2", "var3"].forEach(id => {
+      ["var1", "var2", "var3", "var4"].forEach(id => {
         setText(id, null);
         setText(id, null);
       });
       });
     });
     });