From 226e16181a2f12d27ef5d5a20286dc5d80ae7a56 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sun, 12 Jan 2025 10:33:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=92=8C=E7=BB=9F=E8=AE=A1=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/page/gnss_msg_status.html   | 5 +++--
 .../src/main/resources/templates/page/gnss_msg_trx.html      | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html b/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html
index 41328cb6..e0368391 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg_status.html
@@ -58,7 +58,6 @@
 
         var cfg_cols = [
             {field: 'deviceid', title: '设备号', width: 100},
-            {field: 'remark', title: '备注', width: 120},
             {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
             {field: 'roll', title: 'roll'},
             {field: 'pitch', title: 'pitch'},
@@ -69,10 +68,12 @@
             {field: 'chargecurrency', title: '充电电流(mA)'},
             {field: 'temperature', title: '温度(°C)'},
             {field: 'humidity', title: '湿度(%)'},
+            {field: 'remark', title: '备注', width: 120},
             {title: '操作', toolbar: '#currentTableBar', fixed: "right", width: 80}
         ];
         if([[${role}]] != "SUPER_ADMIN") {
-            cfg_cols[2].hide = true;
+            cfg_cols[11].hide = true;
+            cfg_cols[12].hide = true;
         }
         /**
          * 初始化表单，要加上，不然刷新部分组件可能会不加载
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html b/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
index 365826a2..9707b53b 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
@@ -59,7 +59,6 @@
 
         var data_cols = [
             {field: 'deviceid', title: '设备号', width: 100},
-            {field: 'remark', title: '备注', width: 120},
             {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
             {field: 'devicetime', title: '设备时间'},
             {field: 'd3xxbytes', title: 'D3XX'},
@@ -73,6 +72,7 @@
             {field: 'uart2rxbytes', title: '串口2收'},
             {field: 'uart2unknown', title: '串口2未知'},
             {field: 'satelliteinuse', title: '使用卫星数'},
+            {field: 'remark', title: '备注', width: 120},
             {title: '操作', toolbar: '#currentTableBar', fixed: "right", width: 80}
         ];
         if([[${role}]] != "SUPER_ADMIN") {
@@ -86,6 +86,8 @@
             data_cols[11].hide = true;
             data_cols[12].hide = true;
             data_cols[13].hide = true;
+            data_cols[14].hide = true;
+            data_cols[15].hide = true;
         }
         /**
          * 初始化表单，要加上，不然刷新部分组件可能会不加载