From 5e29b1323d051893de577c1a33c8bd30545fde1e Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 17 十一月 2025 13:40:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js | 141 ++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 79 deletions(-)
diff --git a/src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js b/src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js
index 27ab919..4f8bc9d 100644
--- a/src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js
+++ b/src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js
@@ -9,6 +9,28 @@
var form = layui.form;
var admin = layui.admin;
+ // 寮傚父椤规槧灏�
+ var errorNames = {
+ passTimeOut: '鐗╀綋杩�/鍑鸿秴鏃�',
+ objectNoIdError: '鏈夌墿浣撴棤鏁版嵁',
+ idNoObjectError: '鏈夋暟鎹棤鐗╀綋',
+ lmfrError: '绾夸綋鐢垫満鐑户鎶ヨ',
+ liftError: '椤跺崌鎶ヨ',
+ dlfrError: '椤跺崌鐢垫満鐑户鎶ヨ',
+ dmfrError: '椤跺崌妯Щ鐢垫満鐑户鎶ヨ',
+ vfdError: '鍙橀鏁呴殰',
+ srvError: '浼烘湇鏁呴殰',
+ res1:'棰勭暀1',
+ res2:'棰勭暀2',
+ res3:'棰勭暀3',
+ communicationTimeOut: '涓庝笂浣嶆満閫氳瓒呮椂',
+ parameterIncompleteError: '淇℃伅鍙傛暟涓嶅叏',
+ dataNotClear: '淇℃伅鏁版嵁鏈竻闄�',
+ setParameterError: '鍙傛暟璁剧疆鎶ヨ',
+ dataError: '鏁版嵁閿欒'
+ };
+ var errorFields = Object.keys(errorNames);
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#basDevpErrorLog',
@@ -21,53 +43,14 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'devNo', align: 'center',title: '杈撻�佺紪鍙�'}
- ,{field: 'passTimeOut', align: 'center',title: '鐗╀綋杩�/鍑鸿秴鏃�'}
- ,{field: 'objectNoIdError', align: 'center',title: '鏈夌墿浣撴棤鏁版嵁'}
- ,{field: 'idNoObjectError', align: 'center',title: '鏈夋暟鎹棤鐗╀綋'}
- ,{field: 'lmfrError', align: 'center',title: '绾夸綋鐢垫満鐑户鎶ヨ'}
- ,{field: 'liftError', align: 'center',title: '椤跺崌鎶ヨ'}
- ,{field: 'dlfrError', align: 'center',title: '椤跺崌鐢垫満鐑户鎶ヨ'}
- ,{field: 'dmfrError', align: 'center',title: '椤跺崌妯Щ鐢垫満鐑户鎶ヨ'}
- ,{field: 'vfdError', align: 'center',title: '鍙橀鏁呴殰'}
- ,{field: 'srvError', align: 'center',title: '浼烘湇鏁呴殰'}
- ,{field: 'res1', align: 'center',title: '棰勭暀1',hide:true}
- ,{field: 'res2', align: 'center',title: '棰勭暀2',hide:true}
- ,{field: 'res3', align: 'center',title: '棰勭暀3',hide:true}
- ,{field: 'communicationTimeOut', align: 'center',title: '涓庝笂浣嶆満閫氳瓒呮椂'}
- ,{field: 'parameterIncompleteError', align: 'center',title: '淇℃伅鍙傛暟涓嶅叏'}
- ,{field: 'dataNotClear', align: 'center',title: '淇℃伅鏁版嵁鏈竻闄�'}
- ,{field: 'setParameterError', align: 'center',title: '鍙傛暟璁剧疆鎶ヨ'}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
- // ,{field: 'inEnable', align: 'center',title: '',hide:true}
- // ,{field: 'outEnable', align: 'center',title: '',hide:true}
- ,{field: 'dataError', align: 'center',title: '鏁版嵁閿欒'}
- // ,{field: 'id', align: 'center',title: '',hide:true}
- ,{field: 'sensorGArrive', align: 'center',title: '鐩寸嚎鍏夌數',hide:true}
- ,{field: 'sensorGDec', align: 'center',title: '鍑忛�熷厜鐢�',hide:true}
- ,{field: 'sensorGArrive2', align: 'center',title: '鐩寸嚎鍑稿嚭',hide:true}
- ,{field: 'sensorLimit', align: 'center',title: '闄愪綅淇濇姢鍏夌數',hide:true}
- ,{field: 'emergency', align: 'center',title: '鎬ュ仠',hide:true}
- ,{field: 'sensorGLeave', align: 'center',title: '鍏夌數绂诲紑1',hide:true}
- ,{field: 'sensorGLeave2', align: 'center',title: '鍏夌數绂诲紑2',hide:true}
- ,{field: 'sensorCUp', align: 'center',title: '椤跺崌涓婂崌',hide:true}
- ,{field: 'sensorCDown', align: 'center',title: '椤跺崌涓嬮檷',hide:true}
- ,{field: 'liftMotorFr', align: 'center',title: '椤跺崌鐑户',hide:true}
- ,{field: 'lineMotorFr', align: 'center',title: '鐩寸嚎鐑户',hide:true}
- ,{field: 'tranMotorFr', align: 'center',title: '绉绘牻鐑户',hide:true}
- ,{field: 'rst1', align: 'center',title: '澶囩敤1',hide:true}
- ,{field: 'rst2', align: 'center',title: '澶囩敤2',hide:true}
- ,{field: 'rst3', align: 'center',title: '澶囩敤3',hide:true}
- ,{field: 'rst4', align: 'center',title: '澶囩敤4',hide:true}
- ,{field: 'sensorArriveD', align: 'center',title: '鐩磋鏂瑰悜鍒颁綅',hide:true}
- ,{field: 'sensorDecD', align: 'center',title: '鐩磋鏂瑰悜鍑忛��',hide:true}
- ,{field: 'sensorArriveL', align: 'center',title: '宸︾Щ鏂瑰悜鍒颁綅',hide:true}
- ,{field: 'sensorDecL', align: 'center',title: '宸︾Щ鏂瑰悜鍑忛��',hide:true}
- ,{field: 'sensorArriveR', align: 'center',title: '鍙崇Щ鏂瑰悜鍒颁綅',hide:true}
- ,{field: 'sensorDecR', align: 'center',title: '鍙崇Щ鏂瑰悜鍑忛��',hide:true}
-
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ {field: 'devNo', 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',
@@ -89,7 +72,7 @@
top.location.href = baseUrl+"/";
}
pageCurr=curr;
- limit();
+ limit && limit();
}
});
@@ -115,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=['devNo','errors','createTime$'];
var exportData = {};
$.each($('#search-box [name]').serializeArray(), function() {
exportData[this.name] = this.value;
});
- var param = {
- 'basDevpErrorLog': exportData,
- 'fields': fields
- };
+ var param = {'basDevpErrorLog': exportData, 'fields': fields};
$.ajax({
url: baseUrl+"/basDevpErrorLog/export/auth",
headers: {'token': localStorage.getItem('token')},
@@ -168,6 +140,22 @@
table.on('tool(basDevpErrorLog)', 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;
@@ -217,10 +205,7 @@
/* 鍒犻櫎 */
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({
@@ -260,20 +245,18 @@
function layDateRender(data) {
setTimeout(function () {
layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ elem: '.layui-laydate-range',
+ type: 'datetime',
+ range: true
});
layDate.render({
elem: '#createTime\\$',
type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
+ value: data!==undefined?data['createTime$']:null
});
-
}, 300);
}
layDateRender();
-
});
// 鍏抽棴鍔ㄤ綔
@@ -289,5 +272,5 @@
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
}
--
Gitblit v1.9.1