From 5df08a26a950ea2bb5adb86699bc9a9058b70cc5 Mon Sep 17 00:00:00 2001
From: wangfq <wangfq@collectpublish.net>
Date: Wed, 10 Jun 2026 10:01:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=20TCP=20=E8=BF=9E=E6=8E=A5/?=
 =?UTF-8?q?=E6=96=AD=E5=BC=80=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 edc-web/app/templates/device_logs.html | 7 ++++++-
 edc_server                             | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/edc-web/app/templates/device_logs.html b/edc-web/app/templates/device_logs.html
index 405abd5..df0c2dc 100644
--- a/edc-web/app/templates/device_logs.html
+++ b/edc-web/app/templates/device_logs.html
@@ -13,6 +13,8 @@
             <option value="online">在线</option>
             <option value="offline">离线</option>
             <option value="poor">通信不良</option>
+            <option value="tcp_connect">TCP连接</option>
+            <option value="tcp_disconnect">TCP断开</option>
         </select>
     </label>
     <button onclick="searchLogs(1)" class="btn-search">查询</button>
@@ -68,6 +70,8 @@ function renderTable(records) {
         if (r.event_type === 'online' || r.event_type === 'login') typeStyle = 'color:#27ae60;font-weight:bold;';
         else if (r.event_type === 'offline') typeStyle = 'color:#e74c3c;font-weight:bold;';
         else if (r.event_type === 'poor') typeStyle = 'color:#f39c12;font-weight:bold;';
+        else if (r.event_type === 'tcp_disconnect') typeStyle = 'color:#e74c3c;';
+        else if (r.event_type === 'tcp_connect') typeStyle = 'color:#3498db;';
         return `
         <tr>
             <td>${r.id}</td>
@@ -81,7 +85,8 @@ function renderTable(records) {
 }
 
 function eventLabel(t) {
-    const m = {login: '登录', online: '在线', offline: '离线', poor: '通信不良'};
+    const m = {login: '登录', online: '在线', offline: '离线', poor: '通信不良',
+               tcp_connect: 'TCP连接', tcp_disconnect: 'TCP断开'};
     return m[t] || t;
 }
 
diff --git a/edc_server b/edc_server
index 11f1c4f..c875cf3 160000
--- a/edc_server
+++ b/edc_server
@@ -1 +1 @@
-Subproject commit 11f1c4f55bee79239ea0b7de9d88ab64e81e9c4a
+Subproject commit c875cf383ba9cb149a7d48fe23f2d102b622b475