Просмотр исходного кода

优化测报灯页面运行状态的文字颜色

niujiuru 12 часов назад
Родитель
Сommit
144da8a02a

+ 3 - 3
mcu_ctrl_board/mcu_data_parser.go

@@ -15,9 +15,9 @@ type MCUData struct {
 	Vtype       string `json:"vtype"`        // 细分类型
 	TT          string `json:"tt"`           // 光控定时
 	TS          string `json:"ts"`           // 定时模式  : 0-光控, 1-时控
-	TPS         string `json:"tps"`          // 温控状态  : 0-正常, 1-温控
-	LPS         string `json:"lps"`          // 光控状态  : 0-正常, 1-光控
-	RPS         string `json:"rps"`          // 雨控状态  : 0-正常, 1-雨控
+	TPS         string `json:"tps"`          // 温控状态  : 0-正常, 1-保护
+	LPS         string `json:"lps"`          // 光控状态  : 0-正常, 1-保护
+	RPS         string `json:"rps"`          // 雨控状态  : 0-正常, 1-保护
 	BatStatus   string `json:"batStatus"`    // 电池状态  : 0-正常, 1-欠压
 	Lamp        string `json:"lamp"`         // 灯管状态  : 0-正常, 1-异常
 	Upds        string `json:"upds"`         // 上仓门状态: 0-关闭, 1-打开

BIN
mk_app_pkg/cbd_go_app.tar.gz


+ 3 - 3
rpc_handler.go

@@ -179,11 +179,11 @@ func getRunStatus(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response
 		Hs: getState(data.Hs,
 			map[string]string{"0": "停止", "1": "开启"}),
 		Tps: getState(data.TPS,
-			map[string]string{"0": "正常", "1": "温控"}),
+			map[string]string{"0": "正常", "1": "保护"}),
 		Rps: getState(data.RPS,
-			map[string]string{"0": "正常", "1": "雨控"}),
+			map[string]string{"0": "正常", "1": "保护"}),
 		Lps: getState(data.LPS,
-			map[string]string{"0": "正常", "1": "光控"}),
+			map[string]string{"0": "正常", "1": "保护"}),
 		BatStatus: getState(data.BatStatus,
 			map[string]string{"0": "正常", "1": "欠压"}),
 		Ws: getState(data.Ws,

+ 12 - 0
web-ui.service/web/static/css/page9.css

@@ -392,6 +392,18 @@
     font-variant-numeric: tabular-nums;
 }
 
+.page-cbd .runtime-value.success {
+    color: #36b99a;
+}
+
+.page-cbd .runtime-value.muted {
+     color: #9ca3af;
+}
+
+.page-cbd .runtime-value.warning {
+    color: #e53935;
+}
+
 /* 中等宽度 */
 @media (max-width: 1100px) {
     .page-cbd .runtime-grid {

+ 26 - 16
web-ui.service/web/static/js/page9.js

@@ -186,6 +186,16 @@ function formatWorkTime(value) {
     return "--";
 }
 
+function setRuntimeValue(id, value) {
+    var el = document.getElementById(id);
+    if (!el) return;
+
+    setText(id, value, "page9");
+    el.classList.toggle("success", ["正常", "开启", "打开", "工作"].indexOf(value) !== -1);
+    el.classList.toggle("muted", ["关闭", "停止", "待机"].indexOf(value) !== -1);
+    el.classList.toggle("warning", ["保护", "欠压"].indexOf(value) !== -1);
+}
+
 function getCBDWorkStatus() {
     fetch("/api/cbd/getWorkStatus")
         .then(function (r) {
@@ -202,14 +212,14 @@ function getCBDWorkStatus() {
             setText("runtimeStamp", data.stamp, "page9");
             setText("runtimeFirmwareVersion", data.firmwareVersion, "page9");
             setText("runtimeWorkMode", data.workMode, "page9");
-            setText("runtimeUpds", data.upds, "page9");
-            setText("runtimeDnds", data.dnds, "page9");
-            setText("runtimeHs", data.hs, "page9");
-            setText("runtimeTps", data.tps, "page9");
-            setText("runtimeRps", data.rps, "page9");
-            setText("runtimeLps", data.lps, "page9");
-            setText("runtimeBatStatus", data.batStatus, "page9");
-            setText("runtimeWs", data.ws, "page9");
+            setRuntimeValue("runtimeUpds", data.upds);
+            setRuntimeValue("runtimeDnds", data.dnds);
+            setRuntimeValue("runtimeHs", data.hs);
+            setRuntimeValue("runtimeTps", data.tps);
+            setRuntimeValue("runtimeRps", data.rps);
+            setRuntimeValue("runtimeLps", data.lps);
+            setRuntimeValue("runtimeBatStatus", data.batStatus);
+            setRuntimeValue("runtimeWs", data.ws);
             setText("runtimeWt", data.st && data.et ? formatWorkTime(data.st) + " - " + formatWorkTime(data.et) : "--", "page9");
         })
         .catch(function (e) {
@@ -221,14 +231,14 @@ function getCBDWorkStatus() {
             setText("runtimeStamp", null, "page9");
             setText("runtimeFirmwareVersion", null, "page9");
             setText("runtimeWorkMode", null, "page9");
-            setText("runtimeUpds", null, "page9");
-            setText("runtimeDnds", null, "page9");
-            setText("runtimeHs", null, "page9");
-            setText("runtimeTps", null, "page9");
-            setText("runtimeRps", null, "page9");
-            setText("runtimeLps", null, "page9");
-            setText("runtimeBatStatus", null, "page9");
-            setText("runtimeWs", null, "page9");
+            setRuntimeValue("runtimeUpds", null);
+            setRuntimeValue("runtimeDnds", null);
+            setRuntimeValue("runtimeHs", null);
+            setRuntimeValue("runtimeTps", null);
+            setRuntimeValue("runtimeRps", null);
+            setRuntimeValue("runtimeLps", null);
+            setRuntimeValue("runtimeBatStatus", null);
+            setRuntimeValue("runtimeWs", null);
             setText("runtimeWt", null, "page9");
         });