From 8f36a0f3240455f92cd597631c778f70de6c84ec Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Wed, 22 May 2024 08:54:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/page/gnss_data_calc.html        |  5 +-
 .../templates/page/gnss_dev_cfg.html          |  2 +-
 .../templates/page/gnss_msg_status.html       | 33 +++++++-----
 .../templates/page/gnss_msg_trx.html          | 50 ++++++++++++-------
 .../resources/templates/page/gnss_status.html | 42 +++++++++-------
 .../resources/templates/page/warning.html     | 12 -----
 6 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
index bfd90896..82556f79 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
@@ -34,7 +34,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label">父设备号</label>
+                            <label class="layui-form-label">关联基站号</label>
                             <div class="layui-input-inline">
                                 <input type="text" name="sl_d.parentid" autocomplete="off" class="layui-input">
                             </div>
@@ -98,8 +98,7 @@
             {field: 'enabled', title: '有效',templet: '#enabledTrans'},
             {field: 'pps', title: '平均延迟'}
         ];
-        if([[${role}]] != "ADMIN" && [[${role}]] != "SUPER_ADMIN" &&
-            !([[${role}]] == "MANAGER" && [[${tenant_id}]] == 0)) {
+        if([[${role}]] != "SUPER_ADMIN") {
             data_cols[10].hide = true;
         }
 		/**
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html b/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
index 8c2a5a33..494a3ead 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
@@ -25,7 +25,7 @@
                             </div>
                         </div>
 						<div class="layui-inline">
-						    <label class="layui-form-label">父设备号</label>
+						    <label class="layui-form-label">关联基站号</label>
 						    <div class="layui-input-inline">
 						        <input type="text" name="parentid" autocomplete="off" class="layui-input">
 						    </div>
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 3ffc93b7..ead2d3c1 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
@@ -47,12 +47,28 @@
     </div>
 </div>
 <script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script th:inline="none">
+<script th:inline="javascript">
     layui.use(['form', 'table', 'laydate'], function () {
         var $ = layui.$;
         var form = layui.form,
             table = layui.table,
             laydate = layui.laydate;
+
+        var cfg_cols = [
+            {field: 'deviceid', title: '设备号'},
+            {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
+            {field: 'devicetime', title: '设备时间'},
+            {field: 'roll', title: 'roll'},
+            {field: 'pitch', title: 'pitch'},
+            {field: 'yaw', title: 'yaw'},
+            {field: 'rssi', title: '信号强度'},
+            {field: 'voltage', title: '电压(mV)'},
+            {field: 'temperature', title: '温度(°C)'},
+            {field: 'humidity', title: '湿度(%)'}
+        ];
+        if([[${role}]] != "SUPER_ADMIN") {
+            cfg_cols[2].hide = true;
+        }
         /**
          * 初始化表单，要加上，不然刷新部分组件可能会不加载
          */
@@ -72,18 +88,9 @@
             url: '/gnss/msg/status/list',
             toolbar: '#toolbarDemo',//开启头部工具栏
             defaultToolbar: ['filter'],
-            cols: [[
-                {field: 'deviceid', title: '设备号'},
-                {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
-                {field: 'devicetime', title: '设备时间'},
-                {field: 'roll', title: 'roll'},
-                {field: 'pitch', title: 'pitch'},
-                {field: 'yaw', title: 'yaw'},
-                {field: 'rssi', title: '信号强度'},
-                {field: 'voltage', title: '电压'},
-                {field: 'temperature', title: '温度'},
-                {field: 'humidity', title: '湿度'}
-            ]],
+            cols: [
+                cfg_cols
+            ],
             limits: [10, 15, 20, 25, 50, 100],
             limit: 15,
             page: 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 4b191568..ad6a4046 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
@@ -47,12 +47,41 @@
     </div>
 </div>
 <script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script th:inline="none">
+<script th:inline="javascript">
     layui.use(['form', 'table', 'laydate'], function () {
         var $ = layui.$;
         var form = layui.form,
             table = layui.table,
             laydate = layui.laydate;
+
+        var data_cols = [
+            {field: 'deviceid', title: '设备号'},
+            {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
+            {field: 'devicetime', title: '设备时间'},
+            {field: 'd3xxbytes', title: 'D3XX'},
+            {field: 'b562bytes', title: 'B562'},
+            {field: 'fixnum', title: '固定解'},
+            {field: 'floatnum', title: '浮点解'},
+            {field: 'uart1txbytes', title: '串口1发'},
+            {field: 'uart1rxbytes', title: '串口1收'},
+            {field: 'uart1unknown', title: '串口1未知'},
+            {field: 'uart2txbytes', title: '串口2发'},
+            {field: 'uart2rxbytes', title: '串口2收'},
+            {field: 'uart2unknown', title: '串口2未知'},
+            {field: 'satelliteinuse', title: '使用卫星数'}
+        ];
+        if([[${role}]] != "SUPER_ADMIN") {
+            data_cols[2].hide = true;
+            data_cols[3].hide = true;
+            data_cols[4].hide = true;
+            data_cols[7].hide = true;
+            data_cols[8].hide = true;
+            data_cols[9].hide = true;
+            data_cols[10].hide = true;
+            data_cols[11].hide = true;
+            data_cols[12].hide = true;
+            data_cols[13].hide = true;
+        }
         /**
          * 初始化表单，要加上，不然刷新部分组件可能会不加载
          */
@@ -72,22 +101,9 @@
             url: '/gnss/msg/trx/list',
             toolbar: '#toolbarDemo',//开启头部工具栏
             defaultToolbar: ['filter'],
-            cols: [[
-                {field: 'deviceid', title: '设备号'},
-                {field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
-                {field: 'devicetime', title: '设备时间'},
-                {field: 'd3xxbytes', title: 'D3XX'},
-                {field: 'b562bytes', title: 'B562'},
-                {field: 'fixnum', title: '固定解'},
-                {field: 'floatnum', title: '浮点解'},
-                {field: 'uart1txbytes', title: '串口1发'},
-                {field: 'uart1rxbytes', title: '串口1收'},
-                {field: 'uart1unknown', title: '串口1未知'},
-                {field: 'uart2txbytes', title: '串口2发'},
-                {field: 'uart2rxbytes', title: '串口2收'},
-                {field: 'uart2unknown', title: '串口2未知'},
-                {field: 'satelliteinuse', title: '使用卫星数'}
-            ]],
+            cols: [
+                data_cols
+            ],
             limits: [10, 15, 20, 25, 50, 100],
             limit: 15,
             page: true,
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_status.html b/sec-beidou/src/main/resources/templates/page/gnss_status.html
index 1d17f1c2..fb2a56fc 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_status.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_status.html
@@ -34,7 +34,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label">父设备号</label>
+                            <label class="layui-form-label">关联基站号</label>
                             <div class="layui-input-inline">
                                 <input type="text" name="sl_d.parentid" autocomplete="off" class="layui-input">
                             </div>
@@ -85,12 +85,29 @@
     }
 </style>
 <script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
-<script th:inline="none">
+<script th:inline="javascript">
     layui.use(['form', 'table'], function () {
         var $ = layui.$,
             form = layui.form,
             table = layui.table;
-			
+        var cfg_cols = [
+            {field: 'deviceid', title: '设备号', sort: true},
+            {field: 'devicetype', title: '设备类型',templet: '#typeTrans'},
+            {field: 'updatetime', title: '更新时间', templet: "<div>{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
+            {field: 'state', title: '状态',templet: '#stateTrans'},
+            {field: 'warning', title: '告警',templet: '#warningTrans'},
+            {field: 'longitude', title: '经度'},
+            {field: 'latitude', title: '纬度'},
+            {field: 'voltage', title: '电压(mV)'},
+            {field: 'temperature', title: '温度(°C)'},
+            {field: 'humidity', title: '湿度(%)'},
+            {field: 'rssi', title: '信号'},
+            {field: 'satelliteinuse', title: '使用卫星数'},
+            {title: '操作', toolbar: '#currentTableBar', align: "center"}
+        ];
+        if([[${role}]] != "SUPER_ADMIN") {
+            cfg_cols[11].hide = true;
+        }
 		/**
 		 * 初始化表单，要加上，不然刷新部分组件可能会不加载
 		 */
@@ -101,22 +118,9 @@
             url: '/gnss/status/list',
             toolbar: '#toolbarDemo',//开启头部工具栏
             defaultToolbar: ['filter'],
-            cols: [[
-                {field: 'deviceid', title: '设备号', sort: true},
-                {field: 'devicetype', title: '设备类型',templet: '#typeTrans'},
-                {field: 'updatetime', title: '更新时间', templet: "<div>{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
-                {field: 'devicetime', title: '设备时间'},
-                {field: 'state', title: '状态',templet: '#stateTrans'},
-                {field: 'warning', title: '告警',templet: '#warningTrans'},
-                {field: 'longitude', title: '经度'},
-                {field: 'latitude', title: '维度'},
-                {field: 'voltage', title: '电压'},
-                {field: 'temperature', title: '温度'},
-                {field: 'humidity', title: '湿度'},
-                {field: 'rssi', title: '信号'},
-                {field: 'satelliteinuse', title: '使用卫星数'},
-                {title: '操作', toolbar: '#currentTableBar', align: "center"}
-            ]],
+            cols: [
+                cfg_cols
+            ],
             limits: [10, 15, 20, 25, 50, 100],
             limit: 15,
             page: true,
diff --git a/sec-beidou/src/main/resources/templates/page/warning.html b/sec-beidou/src/main/resources/templates/page/warning.html
index 0483caa3..410ff7ee 100644
--- a/sec-beidou/src/main/resources/templates/page/warning.html
+++ b/sec-beidou/src/main/resources/templates/page/warning.html
@@ -24,17 +24,6 @@
                                 <input type="text" name="sl_deviceid" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-						<div class="layui-inline">
-						    <label class="layui-form-label">设备类型</label>
-						    <div class="layui-input-inline">
-						        <select name="n_devicetype" lay-search="">
-						            <option value="">选择或搜索</option>
-						            <option value="1">北斗</option>
-						            <option value="2">测斜</option>
-						            <option value="3">DTU</option>
-						        </select>
-						    </div>
-						</div>
 						<div class="layui-inline">
 						    <label class="layui-form-label">告警级别</label>
 						    <div class="layui-input-inline">
@@ -95,7 +84,6 @@
             cols: [[
                 {field: 'createtime', title: '上报时间', width: '15%', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
                 {field: 'deviceid', title: '设备号'},
-                {field: 'devicetype', title: '设备类型'},
                 {field: 'level', title: '告警级别',templet: "<div>{{d.level==2?'严重':'一般'}}</div>"},
                 {field: 'code', title: '告警类型'},
                 {field: 'info', title: '告警内容', width: '35%'}