From fec9dc24ab57c77876eae358de090daa0991be16 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 四月 2022 23:23:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ApiLogController.java | 4 +++-
src/main/webapp/views/apiLog/apiLog.html | 17 +++++++++++++----
src/main/webapp/static/js/apiLog/apiLog.js | 18 +++++++++---------
3 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 1ba16f5..1e450a3 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -42,7 +42,9 @@
EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/webapp/static/js/apiLog/apiLog.js b/src/main/webapp/static/js/apiLog/apiLog.js
index 8b66d77..9e7dd31 100644
--- a/src/main/webapp/static/js/apiLog/apiLog.js
+++ b/src/main/webapp/static/js/apiLog/apiLog.js
@@ -22,23 +22,23 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'uuid', align: 'center',title: '鏃ュ織缂栧彿'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'uuid', align: 'center',title: '鏃ュ織缂栧彿'}
,{field: 'namespace', align: 'center',title: '鍚嶇О绌洪棿'}
,{field: 'url', align: 'center',title: '鎺ュ彛鍦板潃'}
,{field: 'appkey', align: 'center',title: '骞冲彴瀵嗛挜'}
- ,{field: 'timestamp', align: 'center',title: '鏃堕棿鎴�'}
+ // ,{field: 'timestamp', align: 'center',title: '鏃堕棿鎴�'}
,{field: 'clientIp', align: 'center',title: '瀹㈡埛绔疘P'}
,{field: 'request', align: 'center',title: '璇锋眰鍐呭'}
,{field: 'response', align: 'center',title: '鍝嶅簲鍐呭'}
- ,{field: 'err', align: 'center',title: '寮傚父鍐呭'}
- ,{field: 'result$', align: 'center',title: '缁撴灉'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'err', align: 'center',title: '寮傚父鍐呭'}
+ ,{field: 'result$', align: 'center',title: '缁撴灉', templet: '#resTpl', width: 80}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index 0cb9836..9efb25c 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -18,9 +18,9 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
+ <label class="layui-form-label">鍚嶇О绌洪棿:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="namespace" placeholder="璇疯緭鍏�..." autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -40,17 +40,26 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
</script>
+<script type="text/html" id="resTpl">
+ <span name="settle"
+ {{# if( d.result === 1){ }}
+ class="layui-badge layui-badge-green" >{{d.result$}}</span>
+ {{# }else { }}
+ class="layui-badge layui-badge-red" >{{d.result$}}</span>
+ {{# } }}
+</script>
+
<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>
--
Gitblit v1.9.1