Prechádzať zdrojové kódy

优化一键自检页面的检测结果文字提示

niujiuru 15 hodín pred
rodič
commit
d60e48c60f

+ 16 - 16
web-ui.service/page7_handler.go

@@ -20,8 +20,8 @@ func healthCheckNetworkHandler(w http.ResponseWriter, r *http.Request) {
 
 	var avar1, avar2, avar3, avar4, avar5, avar6 string
 
-	avar1, avar2, avar3 = "已完成", "通过", "网络服务异常"
-	avar4, avar5, avar6 = "已完成", "通过", "网络连接异常"
+	avar1, avar2, avar3 = "已完成", "通过", "网络服务异常"
+	avar4, avar5, avar6 = "已完成", "通过", "网络连接异常"
 
 	if callRPCResult(r.Context(), 7000, "core.getNetStatus", nil, &net) != nil {
 		goto done
@@ -38,12 +38,12 @@ func healthCheckNetworkHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if callRPCResult(r.Context(), 7000, "core.getModemInfo", nil, &modem) != nil {
-		avar5, avar6 = "通过", "蜂窝模块异常"
+		avar5, avar6 = "通过", "蜂窝模块异常"
 		goto done
 	}
 
 	if modem.ICCID == "" {
-		avar5, avar6 = "通过", "SIM卡异常"
+		avar5, avar6 = "通过", "SIM卡异常"
 		goto done
 	}
 
@@ -86,14 +86,14 @@ func healthCheckTimeHandler(w http.ResponseWriter, r *http.Request) {
 
 	if err := callRPCResult(r.Context(), 7001, "core.getTimeSyncStatus", nil, &status); err != nil {
 		json.NewEncoder(w).Encode(map[string]string{
-			"bvar1": "已完成", "bvar2": "通过", "bvar3": "时间服务检测失败",
-			"bvar4": "已完成", "bvar5": "通过", "bvar6": "时间同步检测失败",
+			"bvar1": "已完成", "bvar2": "通过", "bvar3": "时间服务检测失败",
+			"bvar4": "已完成", "bvar5": "通过", "bvar6": "时间同步检测失败",
 		})
 		return
 	}
 
 	result := map[string]string{"bvar1": "已完成", "bvar2": "通过", "bvar3": "时间服务正常",
-		"bvar4": "已完成", "bvar5": "通过", "bvar6": "系统时间未同步"}
+		"bvar4": "已完成", "bvar5": "通过", "bvar6": "系统时间未同步"}
 
 	if status.TimeSynced == "true" {
 		result["bvar5"] = "通过"
@@ -111,14 +111,14 @@ func healthCheckPositionHandler(w http.ResponseWriter, r *http.Request) {
 
 	if err := callRPCResult(r.Context(), 7002, "core.getPositionInfo", nil, &pos); err != nil {
 		json.NewEncoder(w).Encode(map[string]string{
-			"cvar1": "已完成", "cvar2": "通过", "cvar3": "定位服务检测失败",
-			"cvar4": "已完成", "cvar5": "通过", "cvar6": "定位状态检测失败",
+			"cvar1": "已完成", "cvar2": "通过", "cvar3": "定位服务检测失败",
+			"cvar4": "已完成", "cvar5": "通过", "cvar6": "定位状态检测失败",
 		})
 		return
 	}
 
 	result := map[string]string{"cvar1": "已完成", "cvar2": "通过", "cvar3": "定位服务正常",
-		"cvar4": "已完成", "cvar5": "通过", "cvar6": "未能获取到确切的位置信息"}
+		"cvar4": "已完成", "cvar5": "通过", "cvar6": "未能获取到确切的位置信息"}
 
 	if pos.Lat != "" && pos.Lon != "" {
 		result["cvar5"] = "通过"
@@ -133,14 +133,14 @@ func healthCheckCameraHandler(w http.ResponseWriter, r *http.Request) {
 
 	if err := callRPCResult(r.Context(), 7003, "core.getSupportedCameraCount", map[string]string{"type": "all"}, &count); err != nil {
 		json.NewEncoder(w).Encode(map[string]string{
-			"dvar1": "已完成", "dvar2": "通过", "dvar3": "相机服务检测失败",
-			"dvar4": "已完成", "dvar5": "通过", "dvar6": "识别查找相机失败",
+			"dvar1": "已完成", "dvar2": "通过", "dvar3": "相机服务检测失败",
+			"dvar4": "已完成", "dvar5": "通过", "dvar6": "识别查找相机失败",
 		})
 		return
 	}
 
 	result := map[string]string{"dvar1": "已完成", "dvar2": "通过", "dvar3": "相机服务正常",
-		"dvar4": "已完成", "dvar5": "通过", "dvar6": "未找到相机"}
+		"dvar4": "已完成", "dvar5": "通过", "dvar6": "未找到相机"}
 
 	if count != "" && count != "0" {
 		result["dvar5"] = "通过"
@@ -165,7 +165,7 @@ func healthCheckCameraPhotoHandler(w http.ResponseWriter, r *http.Request) {
 	if err := callRPCResult(r.Context(), 7003, "core.takePhoto", params, &result); err != nil {
 		json.NewEncoder(w).Encode(map[string]string{
 			"dvar7": "已完成",
-			"dvar8": "通过",
+			"dvar8": "通过",
 			"dvar9": "测试相机拍照失败",
 		})
 		return
@@ -181,7 +181,7 @@ func healthCheckCameraPhotoHandler(w http.ResponseWriter, r *http.Request) {
 	} else {
 		json.NewEncoder(w).Encode(map[string]string{
 			"dvar7": "已完成",
-			"dvar8": "通过",
+			"dvar8": "通过",
 			"dvar9": "测试相机拍照失败",
 		})
 		return
@@ -191,7 +191,7 @@ func healthCheckCameraPhotoHandler(w http.ResponseWriter, r *http.Request) {
 func healthCheckUserAppHandler(w http.ResponseWriter, r *http.Request) {
 	var result = map[string]string{
 		"evar1": "已完成",
-		"evar2": "通过",
+		"evar2": "通过",
 		"evar3": "用户应用尚未安装",
 	}
 

+ 11 - 11
web-ui.service/web/static/js/page7.js

@@ -22,10 +22,10 @@ async function startHealthCheck() {
         return;
       }
       setCheckText("avar1", "已完成");
-      setCheckText("avar2", "通过");
+      setCheckText("avar2", "通过");
       setCheckText("avar3", "检测失败");
       setCheckText("avar4", "已完成");
-      setCheckText("avar5", "通过");
+      setCheckText("avar5", "通过");
       setCheckText("avar6", "检测失败");
     }
 
@@ -42,10 +42,10 @@ async function startHealthCheck() {
         return;
       }
       setCheckText("bvar1", "已完成");
-      setCheckText("bvar2", "通过");
+      setCheckText("bvar2", "通过");
       setCheckText("bvar3", "检测失败");
       setCheckText("bvar4", "已完成");
-      setCheckText("bvar5", "通过");
+      setCheckText("bvar5", "通过");
       setCheckText("bvar6", "检测失败");
     }
 
@@ -62,10 +62,10 @@ async function startHealthCheck() {
         return;
       }
       setCheckText("cvar1", "已完成");
-      setCheckText("cvar2", "通过");
+      setCheckText("cvar2", "通过");
       setCheckText("cvar3", "检测失败");
       setCheckText("cvar4", "已完成");
-      setCheckText("cvar5", "通过");
+      setCheckText("cvar5", "通过");
       setCheckText("cvar6", "检测失败");
     }
 
@@ -82,10 +82,10 @@ async function startHealthCheck() {
         return;
       }
       setCheckText("dvar1", "已完成");
-      setCheckText("dvar2", "通过");
+      setCheckText("dvar2", "通过");
       setCheckText("dvar3", "检测失败");
       setCheckText("dvar4", "已完成");
-      setCheckText("dvar5", "通过");
+      setCheckText("dvar5", "通过");
       setCheckText("dvar6", "检测失败");
     }
 
@@ -102,7 +102,7 @@ async function startHealthCheck() {
         return;
       }
       setCheckText("dvar7", "已完成");
-      setCheckText("dvar8", "通过");
+      setCheckText("dvar8", "通过");
       setCheckText("dvar9", "检测失败");
     }
 
@@ -118,7 +118,7 @@ async function startHealthCheck() {
         return;
       }
       setCheckText("evar1", "已完成");
-      setCheckText("evar2", "通过");
+      setCheckText("evar2", "通过");
       setCheckText("evar3", "检测失败");
     }
   } finally {
@@ -326,7 +326,7 @@ function setCheckText(id, value) {
 
   if (value === "已完成" || value === "通过") {
     el.classList.add("check-success");
-  } else if (value === "通过") {
+  } else if (value === "通过") {
     el.classList.add("check-fail");
   }
 }