From db64aad92744205992d9f74db5c4bb579563b39a Mon Sep 17 00:00:00 2001
From: Heiky <hongtaoguo0214@sina.com>
Date: Wed, 9 Dec 2020 18:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=87=8D=E5=A4=8D=E6=9F=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/logging/logging-details.html   |  7 ++++---
 .../resources/templates/system/logging/main.html    | 13 ++++++++++---
 .../system/controller/SysLoggingController.java     | 10 ++--------
 3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/pear-entrance/src/main/resources/templates/system/logging/logging-details.html b/pear-entrance/src/main/resources/templates/system/logging/logging-details.html
index 20ba327e..59026b91 100644
--- a/pear-entrance/src/main/resources/templates/system/logging/logging-details.html
+++ b/pear-entrance/src/main/resources/templates/system/logging/logging-details.html
@@ -8,7 +8,6 @@
 <body>
 <div>
     <div>
-        <input id="details" type="hidden" th:value="${loggingDetails}">
         <div>
             <pre id="json-renderer"></pre>
         </div>
@@ -19,8 +18,10 @@
 <script th:src="@{/component/json-viewer/jquery.json-viewer.js}"></script>
 
 <script>
-    let details = $("#details").val();
-    $("#json-renderer").jsonViewer(JSON.parse(details));
+    function showJSON(details) {
+        console.log(details);
+        $("#json-renderer").jsonViewer(details);
+    }
 </script>
 
 </body>
diff --git a/pear-entrance/src/main/resources/templates/system/logging/main.html b/pear-entrance/src/main/resources/templates/system/logging/main.html
index 6c483d31..7535b7e2 100644
--- a/pear-entrance/src/main/resources/templates/system/logging/main.html
+++ b/pear-entrance/src/main/resources/templates/system/logging/main.html
@@ -34,7 +34,9 @@
 </script>
 
 <script type="text/html" id="log-bar">
-    <button class="pear-btn pear-btn-sm pear-btn-primary"  lay-event="details"><i class="pear-icon pear-icon-edit"></i></button>
+    <button class="pear-btn pear-btn-sm pear-btn-primary" lay-event="details">
+        <i class="pear-icon pear-icon-edit"></i>
+    </button>
 </script>
 
 <script type="text/html" id="log-createTime">
@@ -112,13 +114,18 @@
             }
         });
 
-        window.details = function(obj){
+        window.details = function (obj) {
+            console.log(obj.data)
             layer.open({
                 type: 2,
                 title: '详细信息',
                 shade: 0,
                 area: ['400px', '400px'],
-                content: MODULE_PATH + "details?id="+obj.data['id']
+                content: MODULE_PATH + "details",
+                success: function (layero) {
+                    let iframeWin = window[layero.find('iframe')[0]['name']];
+                    iframeWin.showJSON(obj.data);
+                }
             });
         }
     })
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java
index 4d07c21a..41b15010 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysLoggingController.java
@@ -79,13 +79,7 @@ public class SysLoggingController extends BaseController {
     }
 
     @GetMapping("/details")
-    public ModelAndView details(String id){
-        Map<String, Object> params = new HashMap<>();
-        try {
-            params.put("loggingDetails", objectMapper.writeValueAsString(loggingService.getById(id)));
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return JumpPage("system/logging/logging-details", params);
+    public ModelAndView details(){
+        return JumpPage("system/logging/logging-details");
     }
 }
-- 
Gitee

