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: "
{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}
"},
{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: "{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}
"},
{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;
}
/**
* 初始化表单,要加上,不然刷新部分组件可能会不加载