From 0f423073e7cdfb8cbfe527aa6d0286b3b732c221 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 17 十一月 2025 09:16:14 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basErrLog/basErrLog.html | 3
src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java | 16 +++++
src/main/webapp/views/basErrLog/logDetl.html | 133 ++++++++++++++++++++++++++++++++++++++++++++
src/main/webapp/static/js/basErrLog/basErrLog.js | 24 +++++++
4 files changed, 173 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
index 53eb61e..7c4e651 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
@@ -49,6 +49,22 @@
}
return R.ok(basCrnErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
+ /**
+ * 鏍规嵁绮剧‘鐨� createTime 鏌ヨ
+ */
+ @RequestMapping(value = "/basCrnErrorLog/listByUuid/auth")
+ @ManagerAuth
+ public R listByUuid(@RequestParam String uuid,
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit) {
+
+ EntityWrapper<BasCrnErrorLog> wrapper = new EntityWrapper<>();
+ // 绮剧‘鍖归厤褰撳ぉ鐨勬暟鎹紝鎴栬�呮煇涓叿浣撴椂闂�
+ wrapper.eq("id", uuid); // 濡傛灉甯屾湜绮剧‘鍒扮
+
+ Page<BasCrnErrorLog> page = basCrnErrorLogService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(page);
+ }
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
diff --git a/src/main/webapp/static/js/basErrLog/basErrLog.js b/src/main/webapp/static/js/basErrLog/basErrLog.js
index a38e3b6..2e0b24b 100644
--- a/src/main/webapp/static/js/basErrLog/basErrLog.js
+++ b/src/main/webapp/static/js/basErrLog/basErrLog.js
@@ -42,7 +42,7 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
pageName: 'curr',
@@ -188,6 +188,28 @@
table.on('tool(basErrLog)', function(obj){
var data = obj.data;
switch (obj.event) {
+ // 鏄庣粏灞曠ず
+ case 'detlShow':
+ // wrkNo = data.wrkNo;
+ // 琛ㄦ牸涓嬫柟鏄剧ず
+ // locDetl(data.wrkNo);
+ // 寮瑰眰鏄剧ず
+ 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.startTime);
+ iframeWin.setUuid(data.uuid);
+ console.log(data.uuid);
+
+ }
+ });
+ break;
// 璇︽儏
case 'detail':
layer.open({
diff --git a/src/main/webapp/views/basErrLog/basErrLog.html b/src/main/webapp/views/basErrLog/basErrLog.html
index b3fc226..36d9667 100644
--- a/src/main/webapp/views/basErrLog/basErrLog.html
+++ b/src/main/webapp/views/basErrLog/basErrLog.html
@@ -65,8 +65,7 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+ <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/basErrLog/logDetl.html b/src/main/webapp/views/basErrLog/logDetl.html
new file mode 100644
index 0000000..b04b078
--- /dev/null
+++ b/src/main/webapp/views/basErrLog/logDetl.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ </style>
+</head>
+<body>
+<div class="layui-inline" style="width:31%;margin-top: 20px">
+ <label class="layui-form-label">鍙戠敓鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="createTime" class="layui-input" type="text" disabled="disabled">
+ </div>
+</div>
+<table class="layui-hide" id="logDetlByTime" lay-filter="logDetlByTime"></table>
+</body>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
+<script type="text/javascript">
+ var tableIns1; // 鍏ㄥ眬鍙橀噺
+ var pageCur;
+ function getCol() {
+ var cols = [
+ {field: 'crnNo', align: 'center',title: '缂栧彿'}
+ ,{field: 'ibDriveFault', align: 'center',title: '琛岃蛋鍙橀鍣ㄦ晠闅�'}
+ ,{field: 'ibSupplyFault', align: 'center',title: '鎻愬叡鍙橀鍣ㄦ晠闅�'}
+ ,{field: 'ibForkDriveFault', align: 'center',title: '璐у弶鍙橀鍣ㄦ晠闅�'}
+ ,{field: 'ibDriveCircuitFault', align: 'center',title: '琛岃蛋鏂矾鍣ㄦ晠闅�'}
+ ,{field: 'ibLiftCircuitFault', align: 'center',title: '鎻愬崌鏂矾鍣ㄦ晠闅�'}
+ ,{field: 'ibForkCircuitFault', align: 'center',title: '璐у弶鏂矾鍣ㄦ晠闅�'}
+ ,{field: 'ibForwardLimit', align: 'center',title: '鍓嶈繘闄愪綅',hide:true}
+ ,{field: 'ibReverseLimit', align: 'center',title: '鍚庨��闄愪綅',hide:true}
+ ,{field: 'ibDriveStart', align: 'center',title: '琛岃蛋鍘熺偣',hide:true}
+ ,{field: 'ibForwardBrakeSpeed', align: 'center',title: '鍓嶈繘寮哄埗浣庨��',hide:true}
+ ,{field: 'ibReverseBrakeSpeed', align: 'center',title: '鍚庨��寮哄埗浣庨��',hide:true}
+ ,{field: 'ibUpLimit', align: 'center',title: '涓婂崌闄愪綅',hide:true}
+ ,{field: 'ibDownLimit', align: 'center',title: '涓嬮檺闄愪綅',hide:true}
+ ,{field: 'ibUpOrigin', align: 'center',title: '鎻愬崌鍘熺偣',hide:true}
+ ,{field: 'ibUpBrakeSpeed', align: 'center',title: '涓婂崌寮哄埗浣庨��',hide:true}
+ ,{field: 'ibDownBrakeSpeed', align: 'center',title: '涓嬮檷寮哄埗浣庨��',hide:true}
+ ,{field: 'ibPlatformSignal', align: 'center',title: '杞借揣鍙版帰璐�'}
+ ,{field: 'ibForkMidSignal', align: 'center',title: '璐у弶涓綅淇″彿'}
+ ,{field: 'ibForkLeftLimit', align: 'center',title: '璐у弶宸︽瀬闄�'}
+ // ,{field: 'id', align: 'center',title: ''}
+ ,{field: 'ibForkRightLimit', align: 'center',title: '璐у弶鍙虫瀬闄�'}
+ ,{field: 'ibFrontOverLimit', align: 'center',title: '鍓嶈秴闄�'}
+ ,{field: 'ibRearOverLimit', align: 'center',title: '鍚庤秴闄�'}
+ ,{field: 'ibLeftOverLimit', align: 'center',title: '宸﹁秴闄�'}
+ ,{field: 'ibRightOverLimit', align: 'center',title: '鍙宠秴闄�'}
+ ,{field: 'ibHighOverLimit1', align: 'center',title: '楂樿秴闄�1'}
+ ,{field: 'ibHighOverLimit2', align: 'center',title: '楂樿秴闄�2'}
+ ,{field: 'ibHighOverLimit3', align: 'center',title: '楂樿秴闄�3'}
+ ,{field: 'ibOneExtendLeftLoad1', align: 'center',title: '涓�浼稿乏渚ф帰璐�1',hide:true}
+ ,{field: 'ibOneExtendLeftLoad2', align: 'center',title: '涓�浼稿乏渚ф帰璐�2',hide:true}
+ ,{field: 'ibOneExtendRightLoad1', align: 'center',title: '涓�浼稿彸渚ф帰璐�1',hide:true}
+ ,{field: 'ibOneExtendRightLoad2', align: 'center',title: '涓�浼稿彸渚ф帰璐�2',hide:true}
+ ,{field: 'ibTwoExtendLeftLoad1', align: 'center',title: '浜屼几宸︿晶鎺㈣揣1',hide:true}
+ ,{field: 'ibTwoExtendLeftLoad2', align: 'center',title: '浜屼几宸︿晶鎺㈣揣2',hide:true}
+ ,{field: 'ibTwoExtendRightLoad1', align: 'center',title: '浜屼几鍙充晶鎺㈣揣1',hide:true}
+ ,{field: 'ibTwoExtendRightLoad2', align: 'center',title: '浜屼几鍙充晶鎺㈣揣2',hide:true}
+ ,{field: 'ibSpeedSignal1', align: 'center',title: '瓒呴�熶俊鍙�1',hide:true}
+ ,{field: 'ibSpeedSignal2', align: 'center',title: '瓒呴�熶俊鍙�2',hide:true}
+ ,{field: 'ibOverweightSignal1', align: 'center',title: '瓒呴噸淇″彿1',hide:true}
+ ,{field: 'ibOverweightSignal2', align: 'center',title: '瓒呴噸淇″彿2',hide:true}
+ ,{field: 'ibRopeReleaseSignal1', align: 'center',title: '鏉剧怀淇″彿1',hide:true}
+ ,{field: 'ibRopeReleaseSignal2', align: 'center',title: '鏉剧怀淇″彿2',hide:true}
+ ,{field: 'ibSafetyClamp', align: 'center',title: '瀹夊叏閽�',hide:true}
+ ,{field: 'ibTightener', align: 'center',title: '寮犵揣鍣�',hide:true}
+ ,{field: 'ibSpeedLimiter', align: 'center',title: '闄愰�熷櫒',hide:true}
+ ,{field: 'ibSafetyDoorOpen', align: 'center',title: '瀹夊叏闂ㄦ墦寮�',hide:true}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ];
+ return cols;
+ }
+ // 鏍煎紡鍖栨椂闂村嚱鏁�
+ function formatDateTime(isoString) {
+ const date = new Date(isoString);
+ const y = date.getFullYear();
+ const m = String(date.getMonth() + 1).padStart(2, '0');
+ const d = String(date.getDate()).padStart(2, '0');
+ const hh = String(date.getHours()).padStart(2, '0');
+ const mm = String(date.getMinutes()).padStart(2, '0');
+ const ss = String(date.getSeconds()).padStart(2, '0');
+ return `${y}-${m}-${d} ${hh}:${mm}:${ss}`;
+ }
+
+ // 娓叉煋琛ㄦ牸鍑芥暟
+ function renderTable() {
+ if(!parentUuid) return; // 娌uid灏变笉娓叉煋
+
+ layui.use(['table','form'], function(){
+ var table = layui.table;
+
+ tableIns1 = table.render({
+ elem: '#logDetlByTime',
+ url: baseUrl + '/basCrnErrorLog/listByUuid/auth',
+ headers: { token: localStorage.getItem('token') },
+ where: { uuid: parentUuid },
+ page: true,
+ limit: 16,
+ cols: [getCol()],
+ parseData: function(res){ // 杞崲鎺ュ彛杩斿洖鐨勬暟鎹�
+ console.log(res);
+ return res;
+ }
+ });
+ });
+ }
+
+ // 鐖堕〉闈㈣皟鐢� setUuid 鍚庤缃� uuid 骞舵覆鏌撹〃鏍�
+ function setUuid(uuid){
+ parentUuid = uuid;
+ renderTable();
+ }
+
+ // 鐖堕〉闈㈣皟鐢� setCreateTime 璁剧疆鏃堕棿鏄剧ず
+ function setCreateTime(value){
+ $('#createTime').val(formatDateTime(value));
+ }
+
+</script>
+</html>
+
--
Gitblit v1.9.1