1、优化UI
This commit is contained in:
weidong
parent
1aee2adc0f
commit
8f36a0f324
@ -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;
|
||||
}
|
||||
/**
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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%'}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user