From 02bdcd5abe1ab268b2d9537835b38bcbbfecb6a4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 17 十一月 2025 13:39:06 +0800
Subject: [PATCH] #异常日志显示更新
---
src/main/webapp/static/js/basRgvErrorLog/basRgvErrorLog.js | 150 ++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 90 deletions(-)
diff --git a/src/main/webapp/static/js/basRgvErrorLog/basRgvErrorLog.js b/src/main/webapp/static/js/basRgvErrorLog/basRgvErrorLog.js
index cb42cc8..e46017c 100644
--- a/src/main/webapp/static/js/basRgvErrorLog/basRgvErrorLog.js
+++ b/src/main/webapp/static/js/basRgvErrorLog/basRgvErrorLog.js
@@ -9,6 +9,27 @@
var form = layui.form;
var admin = layui.admin;
+ // 寮傚父椤规槧灏�
+ var errorNames = {
+ emergencyStop: '鎬ュ仠瑙﹀彂',
+ slot1EmptyNoData: '1鍙蜂綅鏈夌墿鏃犺祫鏂�',
+ slot2EmptyNoData: '2鍙蜂綅鏈夌墿鏃犺祫鏂�',
+ commandErrorChainConflict: '鍛戒护閿欒璧伴摼鏉″啿绐�',
+ targetPositionIssue: '鐩爣浣嶄笅鍙戦敊璇�',
+ travelInverterError: '璧拌鍙橀鍣ㄥ紓甯�',
+ photoelectric1Error: '1鍙峰厜鐢靛紓甯�',
+ photoelectric2Error: '2鍙峰厜鐢靛紓甯�',
+ timeoutConnectionWithLine: '涓庤緭绾挎椂鎺ヨ秴鏃�',
+ leftRollerTimeout: '宸︿晶婊氱瓛杩愯瓒呮椂',
+ rightRollerTimeout: '鍙充晶婊氱瓛杩愯瓒呮椂',
+ rgvRunTimeout: 'rgv杩愯瓒呮椂',
+ position1ChainInverterError: '1鍙峰伐浣嶉摼鏉″彉棰戝櫒寮傚父',
+ position2ChainInverterError: '2鍙峰伐浣嶉摼鏉″彉棰戝櫒寮傚父',
+ frontRearLimit: '鍓嶅悗鏋侀檺浣�'
+ // 鍏朵粬闅愯棌鍒楀彲浠ユ寜闇�鍔犲叆
+ };
+ var errorFields = Object.keys(errorNames);
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#basRgvErrorLog',
@@ -21,49 +42,15 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'rgvNo', align: 'center',title: '缂栧彿'}
- ,{field: 'emergencyStop', align: 'center',title: '鎬ュ仠瑙﹀彂'}
- ,{field: 'slot1EmptyNoData', align: 'center',title: '1鍙蜂綅鏈夌墿鏃犺祫鏂�'}
- ,{field: 'slot2EmptyNoData', align: 'center',title: '2鍙蜂綅鏈夌墿鏃犺祫鏂�'}
- ,{field: 'commandErrorChainConflict', align: 'center',title: '鍛戒护閿欒璧伴摼鏉″啿绐�'}
- ,{field: 'targetPositionIssue', align: 'center',title: '鐩爣浣嶄笅鍙戦敊璇�'}
- ,{field: 'travelInverterError', align: 'center',title: '璧拌鍙橀鍣ㄥ紓甯�'}
- ,{field: 'photoelectric1Error', align: 'center',title: '1鍙峰厜鐢靛紓甯�'}
- ,{field: 'photoelectric2Error', align: 'center',title: '2鍙峰厜鐢靛紓甯�'}
- ,{field: 'timeoutConnectionWithLine', align: 'center',title: '涓庤緭绾挎椂鎺ヨ秴鏃�'}
- ,{field: 'leftRollerTimeout', align: 'center',title: '宸︿晶婊氱瓛杩愯瓒呮椂'}
- ,{field: 'rightRollerTimeout', align: 'center',title: '鍙充晶婊氱瓛杩愯瓒呮椂'}
- ,{field: 'rgvRunTimeout', align: 'center',title: 'rgv杩愯瓒呮椂'}
- ,{field: 'position1ChainInverterError', align: 'center',title: '1鍙峰伐浣嶉摼鏉″彉棰戝櫒寮傚父'}
- ,{field: 'position2ChainInverterError', align: 'center',title: '2鍙峰伐浣嶉摼鏉″彉棰戝櫒寮傚父'}
- ,{field: 'frontRearLimit', align: 'center',title: '鍓嶅悗鏋侀檺浣�'}
- ,{field: 'emergencyButton', align: 'center',title: '鎬ュ仠鎸夐挳',hide:true}
- ,{field: 'forwardButton', align: 'center',title: '鎬ュ仠鎸夐挳',hide:true}
- ,{field: 'reverseButton', align: 'center',title: '鍚庨��鎸夐挳',hide:true}
- ,{field: 'localRemote', align: 'center',title: '鏈湴/杩滅▼',hide:true}
- // ,{field: 'id', align: 'center',title: ''}
- ,{field: 'reset', align: 'center',title: '澶嶄綅',hide:true}
- ,{field: 'travelBrakeSwitch', align: 'center',title: '璧拌鎶遍椄寮�鍏抽挳',hide:true}
- ,{field: 'travelSpeedLimitPhotoelectric', align: 'center',title: '璧拌寮哄埗鍑忛�熷厜鐢�'}
- ,{field: 'leftOverlimit1', align: 'center',title: '宸﹁秴闄� 1'}
- ,{field: 'rightOverlimit1', align: 'center',title: '鍙宠秴闄� 1'}
- ,{field: 'leftAtPosition1', align: 'center',title: '宸﹀埌浣� 1',hide:true}
- ,{field: 'rightAtPosition1', align: 'center',title: '鍙冲埌浣� 1',hide:true}
- ,{field: 'chainForward1', align: 'center',title: '閾炬潯鍓嶈繘 1',hide:true}
- ,{field: 'chainReverse1', align: 'center',title: '閾炬潯鍚庨�� 1',hide:true}
- ,{field: 'inverterAlarm', align: 'center',title: '鍙橀鍣ㄦ姤璀�'}
- ,{field: 'leftOverlimit2', align: 'center',title: '宸﹁秴闄� 2'}
- ,{field: 'rightOverlimit2', align: 'center',title: '鍙宠秴闄� 2'}
- ,{field: 'leftAtPosition2', align: 'center',title: '宸﹀埌浣� 2',hide:true}
- ,{field: 'rightAtPosition2', align: 'center',title: '鍙冲埌浣� 2',hide:true}
- ,{field: 'cargoSpeedReduction', align: 'center',title: '璐х墿鍑忛��',hide:true}
- ,{field: 'conveyorInverterAlarm2', align: 'center',title: '杈撻�佸彉棰戝櫒鎶ヨ 2',hide:true}
- ,{field: 'leftConveyor2', align: 'center',title: '宸﹁緭閫� 2',hide:true}
- ,{field: 'rightConveyor2', align: 'center',title: '鍙宠緭閫� 2',hide:true}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
-
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ {type: 'checkbox'},
+ {field: 'rgvNo', align: 'center', title: '缂栧彿'},
+ {field: 'errors', align: 'center', title: '寮傚父椤�',
+ templet: function(d){
+ return errorFields.filter(f => d[f] === 'Y').map(f => errorNames[f]).join(', ');
+ }
+ },
+ {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿'},
+ {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
@@ -84,7 +71,7 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -111,32 +98,21 @@
showEditModel();
break;
case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) { return d.id; }));
+ break;
case 'exportData':
admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
+ var titles=['缂栧彿','寮傚父椤�','鍒涘缓鏃堕棿'];
+ var fields=['rgvNo','errors','createTime$'];
var exportData = {};
$.each($('#search-box [name]').serializeArray(), function() {
exportData[this.name] = this.value;
});
- var param = {
- 'basRgvErrorLog': exportData,
- 'fields': fields
- };
+ var param = {'basRgvErrorLog': exportData, 'fields': fields};
$.ajax({
url: baseUrl+"/basRgvErrorLog/export/auth",
headers: {'token': localStorage.getItem('token')},
@@ -164,6 +140,22 @@
table.on('tool(basRgvErrorLog)', function(obj){
var data = obj.data;
switch (obj.event) {
+ case 'detlShow':
+ layer.open({
+ type: 2,
+ title: '寮傚父鏄庣粏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'logDetl.html',
+ success: function(layero, index){
+ var iframeWin = window[layero.find('iframe')[0]['name']];
+ iframeWin.setCreateTime(data.createTime$);
+ iframeWin.setUuid(data.id);
+ console.log(data.id);
+ }
+ });
+ break;
case 'edit':
showEditModel(data);
break;
@@ -173,7 +165,6 @@
}
});
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
admin.open({
type: 1,
@@ -211,12 +202,8 @@
});
}
- /* 鍒犻櫎 */
function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
- skin: 'layui-layer-admin',
- shade: .1
- }, function (i) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {skin: 'layui-layer-admin', shade: .1}, function (i) {
layer.close(i);
var loadIndex = layer.load(2);
$.ajax({
@@ -239,40 +226,26 @@
});
}
- // 鎼滅储
form.on('submit(search)', function (data) {
pageCurr = 1;
tableReload(false);
});
- // 閲嶇疆
form.on('submit(reset)', function (data) {
pageCurr = 1;
clearFormVal($('#search-box'));
tableReload(false);
});
- // 鏃堕棿閫夋嫨鍣�
function layDateRender(data) {
setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
- });
-
+ layDate.render({elem: '.layui-laydate-range', type: 'datetime', range: true});
+ layDate.render({elem: '#createTime\\$', type: 'datetime', value: data!==undefined?data['createTime$']:null});
}, 300);
}
layDateRender();
-
});
-// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
});
@@ -282,8 +255,5 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
+ tableIns.reload({where: searchData, page: {curr: pageCurr}});
}
--
Gitblit v1.9.1