From c269d81e8f6c0d85935e05bb5dcb47e465d5da8e Mon Sep 17 00:00:00 2001
From: Administrator <55846420@qq.com>
Date: Thu, 17 Dec 2015 18:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=9D=A1=E6=97=A5?=
=?UTF-8?q?=E5=BF=97=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/webapp/ftl/lib/ai.cloud/common.ftl | 27 +++++++++++++++++--
.../src/main/webapp/ftl/traceLog.ftl | 12 ++++++++-
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl b/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
index c33ff42c9..14241ba48 100644
--- a/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
+++ b/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
@@ -111,7 +111,7 @@
| ${logInfo.spanTypeName!'UNKNOWN'} |
${logInfo.statusCodeName!'MISSING'} |
- ${logInfo.viewPointIdSub!}
|
${logInfo.address!} |
@@ -250,6 +250,8 @@
+ -
+ 服务/方法：${logInfo.viewPointId!''}
-
调用类型：${logInfo.spanTypeName!'UNKNOWN'}
-
@@ -280,4 +282,25 @@
-
\ No newline at end of file
+
+
+<#macro detailTraceLog>
+
+
+
diff --git a/skywalking-webui/src/main/webapp/ftl/traceLog.ftl b/skywalking-webui/src/main/webapp/ftl/traceLog.ftl
index ed7bc3eca..84153a869 100644
--- a/skywalking-webui/src/main/webapp/ftl/traceLog.ftl
+++ b/skywalking-webui/src/main/webapp/ftl/traceLog.ftl
@@ -12,10 +12,13 @@
+
+ <@common.detailTraceLog />
+
<@common.dealTraceLog />
-
+
<@common.importOriginLog />
@@ -54,6 +57,13 @@
}
});
+ $("a[name='detailInfo']").each(function(index,ele){
+ $(this).bind("click",function(){
+ $("#detailContent").html($("#collapse"+index).html());
+ $("#detailLog").modal('show');
+ });
+ });
+
$('#example-advanced').treetable('expandAll');
});