Parcourir la source

新增测报灯控制板业务运行状态监控页面和后台

niujiuru il y a 10 heures
Parent
commit
d1e4190d8f

BIN
mk_app_pkg/cbd_go_app.tar.gz


+ 35 - 11
rpc_handler.go

@@ -135,6 +135,17 @@ func getRunStatus(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response
 		return "--"
 	}
 
+	formatStamp := func(s string) string {
+		if len(s) != 14 {
+			return "--"
+		}
+		t, err := time.ParseInLocation("20060102150405", s, time.Local)
+		if err != nil {
+			return "--"
+		}
+		return t.Format("2006-01-02 15:04:05")
+	}
+
 	data := mcu_ctrl_board.GetMCUData()
 
 	result := struct {
@@ -151,22 +162,35 @@ func getRunStatus(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response
 		Lps               string `json:"lps"`               // 当前光控状态
 		BatStatus         string `json:"batStatus"`         // 当前电池状态
 		Ws                string `json:"ws"`                // 当前工作状态
-		Shake             string `json:"shake"`             // 当前清扫(震动)状态
+		St                string `json:"st"`                // 工作开始时间
+		Et                string `json:"et"`                // 工作结束时间
+		Stamp             string `json:"stamp"`             // 当前状态时间
 	}{
 		MCULastActiveTime: formatTime(mcu_ctrl_board.Board.LastActiveTime.Get()),
 		DataReportOKTime:  formatTime(mqtt_reporter.DataReportOKTime.Get()),
 		PhotoUploadOKTime: formatTime(mqtt_reporter.PhotoUploadOKTime.Get()),
 		FirmwareVersion:   data.Dver,
-		WorkMode:          getState(data.TS, map[string]string{"0": "光控", "1": "时控"}),
-		Upds:              getState(data.Upds, map[string]string{"0": "关闭", "1": "打开"}),
-		Dnds:              getState(data.Dnds, map[string]string{"0": "关闭", "1": "打开"}),
-		Hs:                getState(data.Hs, map[string]string{"0": "停止", "1": "开启"}),
-		Tps:               getState(data.TPS, map[string]string{"0": "正常", "1": "温控"}),
-		Rps:               getState(data.RPS, map[string]string{"0": "正常", "1": "雨控"}),
-		Lps:               getState(data.LPS, map[string]string{"0": "正常", "1": "光控"}),
-		BatStatus:         getState(data.BatStatus, map[string]string{"0": "正常", "1": "欠压"}),
-		Ws:                getState(data.Ws, map[string]string{"0": "待机", "1": "工作"}),
-		Shake:             getState(data.Shake, map[string]string{"0": "关闭", "1": "开启"}),
+		WorkMode: getState(data.TS,
+			map[string]string{"0": "光控", "1": "时控"}),
+		Upds: getState(data.Upds,
+			map[string]string{"0": "关闭", "1": "打开"}),
+		Dnds: getState(data.Dnds,
+			map[string]string{"0": "关闭", "1": "打开"}),
+		Hs: getState(data.Hs,
+			map[string]string{"0": "停止", "1": "开启"}),
+		Tps: getState(data.TPS,
+			map[string]string{"0": "正常", "1": "温控"}),
+		Rps: getState(data.RPS,
+			map[string]string{"0": "正常", "1": "雨控"}),
+		Lps: getState(data.LPS,
+			map[string]string{"0": "正常", "1": "光控"}),
+		BatStatus: getState(data.BatStatus,
+			map[string]string{"0": "正常", "1": "欠压"}),
+		Ws: getState(data.Ws,
+			map[string]string{"0": "待机", "1": "工作"}),
+		St:    data.St,
+		Et:    data.Et,
+		Stamp: formatStamp(data.Stamp),
 	}
 
 	return jsonrpc2.BuildResponse(req, result, nil)

+ 77 - 6
web-ui.service/web/pages/page9.html

@@ -8,8 +8,15 @@
 
 <body>
   <svg xmlns="http://www.w3.org/2000/svg" style="display:none" aria-hidden="true">
-    <symbol id="i-firmware-monitor" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></symbol>
-    <symbol id="i-firmware-mcu" viewBox="0 0 24 24"><rect x="5" y="5" width="14" height="14" rx="2"/><rect x="9.5" y="9.5" width="5" height="5"/><path d="M9 2v3m6-3v3m-6 14v3m6-3v3M2 9h3m-3 6h3m14-6h3m-3 6h3"/></symbol>
+    <symbol id="i-firmware-monitor" viewBox="0 0 24 24">
+      <rect x="3" y="3" width="18" height="14" rx="2"/>
+      <path d="M8 21h8M12 17v4"/>
+    </symbol>
+    <symbol id="i-firmware-mcu" viewBox="0 0 24 24">
+      <rect x="5" y="5" width="14" height="14" rx="2"/>
+      <rect x="9.5" y="9.5" width="5" height="5"/>
+      <path d="M9 2v3m6-3v3m-6 14v3m6-3v3M2 9h3m-3 6h3m14-6h3m-3 6h3"/>
+    </symbol>
   </svg>
   <div class="app">
     <main class="view page-cbd">
@@ -20,7 +27,7 @@
           <!-- 设备状态 -->
           <div class="card status-card">
             <div class="card-header">
-              <h2>设备状态</h2>
+              <h2>活动状态</h2>
               <button class="btn" title="点击查看服务器配置" onclick="viewCBDServerConfig()">
                 <svg class="icon">
                   <use href="#i-json-file" xlink:href="#i-json-file"/>
@@ -48,7 +55,7 @@
           <!-- 设备控制 -->
           <div class="card command-card">
             <div class="card-header">
-              <h2>设备控制</h2>
+              <h2>运行控制</h2>
               <button class="btn" id="p9CtrlCmdAuthBtn" title="点击授权解锁操作" onclick="enableP9CtrlCmdButtons()">
                 <svg class="icon">
                   <use href="#i-unlock" xlink:href="#i-unlock"/>
@@ -121,7 +128,9 @@
               <!-- HMI屏幕固件 -->
               <div class="firmware-item">
                 <strong class="firmware-name">
-                  <svg class="icon"><use href="#i-firmware-monitor" xlink:href="#i-firmware-monitor"/></svg>
+                  <svg class="icon">
+                    <use href="#i-firmware-monitor" xlink:href="#i-firmware-monitor"/>
+                  </svg>
                   串口屏
                 </strong>
                 <input type="file" id="hmiFile" accept=".zip" onchange="onFirmwareFileChange('hmi')" disabled>
@@ -132,7 +141,9 @@
               <!-- MCU控制板固件 -->
               <div class="firmware-item">
                 <strong class="firmware-name">
-                  <svg class="icon"><use href="#i-firmware-mcu" xlink:href="#i-firmware-mcu"/></svg>
+                  <svg class="icon">
+                    <use href="#i-firmware-mcu" xlink:href="#i-firmware-mcu"/>
+                  </svg>
                   控制板
                 </strong>
                 <input type="file" id="mcuFile" accept=".rbl" onchange="onFirmwareFileChange('mcu')" disabled>
@@ -145,6 +156,66 @@
 
         <!-- 右栏 -->
         <div class="right-pane">
+          <!-- 运行状态 -->
+          <div class="card runtime-card">
+            <div class="card-header">
+              <h2>运行状态</h2>
+              <span class="runtime-stamp" id="runtimeStamp">--</span>
+              <button class="btn" title="点击刷新最新状态" onclick="refreshCBDRunStatus()">
+                <svg class="icon">
+                  <use href="#i-refresh" xlink:href="#i-refresh"/>
+                </svg>
+              </button>
+            </div>
+
+            <div class="runtime-grid">
+              <div class="runtime-item">
+                <span>固件版本:</span>
+                <span class="runtime-value" id="runtimeFirmwareVersion">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>工作模式:</span>
+                <span class="runtime-value" id="runtimeWorkMode">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>工作状态:</span>
+                <span class="runtime-value" id="runtimeWs">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>工作时间:</span>
+                <span class="runtime-value" id="runtimeWt">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>上仓状态:</span>
+                <span class="runtime-value" id="runtimeUpds">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>下仓状态:</span>
+                <span class="runtime-value" id="runtimeDnds">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>加热状态:</span>
+                <span class="runtime-value" id="runtimeHs">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>温控状态:</span>
+                <span class="runtime-value" id="runtimeTps">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>雨控状态:</span>
+                <span class="runtime-value" id="runtimeRps">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>光控状态:</span>
+                <span class="runtime-value" id="runtimeLps">--</span>
+              </div>
+              <div class="runtime-item">
+                <span>电压状态:</span>
+                <span class="runtime-value" id="runtimeBatStatus">--</span>
+              </div>
+            </div>
+          </div>
+
           <!-- 应用日志 -->
           <div class="card log-card">
             <div class="card-header">

+ 73 - 6
web-ui.service/web/static/css/page9.css

@@ -33,7 +33,7 @@
     overflow: hidden;
 }
 
-/* 设备状态:固定高度 */
+/* 活动状态:固定高度 */
 .page-cbd .status-card {
     flex: none;
     height: 180px;
@@ -273,6 +273,7 @@
     background: #1c2d48;
 }
 
+/* 固件项目左侧装饰线 */
 .page-cbd .firmware-item::before {
     content: "";
     position: absolute;
@@ -327,26 +328,75 @@
     flex: none;
 }
 
-/* 右栏:应用日志 */
+/* 右栏 */
 .page-cbd .right-pane {
     flex: 1;
     display: flex;
     flex-direction: column;
+    gap: 12px;
     min-width: 0;
     min-height: 0;
 }
 
-.page-cbd .right-pane .log-card {
-    flex: 1;
+/* 运行状态:与活动状态统一高度 */
+.page-cbd .runtime-card {
+    flex: none;
+    height: 180px;
+    min-height: 0;
     display: flex;
     flex-direction: column;
-    min-height: 0;
     overflow: hidden;
 }
 
-.page-cbd .right-pane .output {
+.page-cbd .runtime-stamp {
+    margin-left: auto;
+    margin-right: 8px;
+    color: var(--text-secondary);
+    font-size: 12px;
+    white-space: nowrap;
+}
+
+/* 运行状态网格:桌面端4列 */
+.page-cbd .runtime-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
     flex: 1;
     min-height: 0;
+    overflow: auto;
+}
+
+/* 运行状态项目 */
+.page-cbd .runtime-item {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 8px;
+    min-width: 0;
+    min-height: 36px;
+    padding: 5px 0;
+    border-bottom: 1px solid var(--border-color);
+}
+
+.page-cbd .runtime-item > span:first-child {
+    color: var(--text-secondary);
+    white-space: nowrap;
+}
+
+.page-cbd .runtime-value {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: left;
+    font-weight: 500;
+    font-variant-numeric: tabular-nums;
+}
+
+/* 中等宽度 */
+@media (max-width: 1100px) {
+    .page-cbd .runtime-grid {
+        grid-template-columns: repeat(3, minmax(0, 1fr));
+    }
 }
 
 /* ================= 移动端适配 (≤768px) ================= */
@@ -397,6 +447,19 @@
         overflow: visible;
     }
 
+    /* 手机端运行状态 */
+    .page-cbd .runtime-card {
+        flex: none;
+        height: auto;
+        min-height: 180px;
+    }
+
+    .page-cbd .runtime-grid {
+        flex: none;
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+        overflow: visible;
+    }
+
     .page-cbd .right-pane .log-card {
         min-height: 400px;
     }
@@ -428,4 +491,8 @@
         flex: 1;
         min-width: 0;
     }
+
+    .page-cbd .runtime-grid {
+        grid-template-columns: 1fr;
+    }
 }

+ 61 - 1
web-ui.service/web/static/js/page9.js

@@ -161,6 +161,31 @@ function viewCBDServerConfig() {
 
 var cbdWorkStatusTimer = null;
 
+function formatWorkTime(value) {
+    if (value == null || value === "") {
+        return "--";
+    }
+
+    value = String(value);
+
+    if (/^\d{1,2}:\d{1,2}$/.test(value)) {
+        var parts = value.split(":");
+        return ("0" + parts[0]).slice(-2) + ":" +
+            ("0" + parts[1]).slice(-2);
+    }
+
+    if (/^\d{1,2}$/.test(value)) {
+        return ("0" + value).slice(-2) + ":00";
+    }
+
+    if (/^\d{3,4}$/.test(value)) {
+        value = ("0000" + value).slice(-4);
+        return value.substring(0, 2) + ":" + value.substring(2, 4);
+    }
+
+    return "--";
+}
+
 function getCBDWorkStatus() {
     fetch("/api/cbd/getWorkStatus")
         .then(function (r) {
@@ -171,15 +196,42 @@ function getCBDWorkStatus() {
         })
         .then(function (data) {
             setText("text1", data.mcuLastActiveTime, "page9");
-            setText("text2", data.dataReportOKTime,  "page9");
+            setText("text2", data.dataReportOKTime, "page9");
             setText("text3", data.photoUploadOKTime, "page9");
+
+            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");
+            setText("runtimeWt", data.st && data.et ? formatWorkTime(data.st) + " - " + formatWorkTime(data.et) : "--", "page9");
         })
         .catch(function (e) {
             console.error("getCBDWorkStatus() failed:", e);
             setText("text1", null, "page9");
             setText("text2", null, "page9");
             setText("text3", null, "page9");
+
+            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");
+            setText("runtimeWt", null, "page9");
         });
+
     getCBDLogLevel();
 }
 
@@ -282,6 +334,14 @@ function onP9Btn12Click() {
         });
 }
 
+function refreshCBDRunStatus() {
+    writeMCUData({ cmd: "read" })
+        .catch(function (err) {
+            console.error("refreshCBDRunStatus() failed:", err);
+            alert("刷新运行状态失败:" + err.message);
+        });
+}
+
 function disablePUpgradeButtons() {
     document.getElementById("hmiFile").disabled = true;
     document.getElementById("hmiUploadBtn").disabled = true;