From d051fa593501208ab3b621c5ffd247915c1fc48e Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Mon, 4 Jan 2016 16:21:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=BF=BD=E8=B8=AA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=BC=B9=E7=AA=97=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skywalking-webui/src/main/webapp/ftl/index.ftl | 14 ++++++++------ .../src/main/webapp/ftl/lib/ai.cloud/common.ftl | 9 +++++---- skywalking-webui/src/main/webapp/ftl/traceLog.ftl | 3 +-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/skywalking-webui/src/main/webapp/ftl/index.ftl b/skywalking-webui/src/main/webapp/ftl/index.ftl index ea6d9e7ae..945a9f6d8 100644 --- a/skywalking-webui/src/main/webapp/ftl/index.ftl +++ b/skywalking-webui/src/main/webapp/ftl/index.ftl @@ -14,17 +14,19 @@ .leaf { background-color: white; } - .in{display:block;height:370px;} + + .in { + display: block; + /*height: 600px;*/ + } <@common.importJavaScript /> -
<@common.importHeaderInfo userInfo="${userInfo}"/> -
-
-
+
+
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 e9179ccdf..c09e709aa 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 @@ -5,11 +5,10 @@ -<#----> + @@ -94,8 +93,8 @@ <#-- dealTraceLog --> <#macro dealTraceLog> <#if valueList??> -
-
+
+
${traceId!}
调度入口IP：${(valueList[0].address)!}，开始时间：${beginTime?number_to_datetime}，${(valueList?size)!}条调用记录，消耗总时长：${(endTime - beginTime)!'0'} @@ -235,6 +234,8 @@
+ + <@common.detailTraceLog />
diff --git a/skywalking-webui/src/main/webapp/ftl/traceLog.ftl b/skywalking-webui/src/main/webapp/ftl/traceLog.ftl index 6cbf048b7..2ed3b3428 100644 --- a/skywalking-webui/src/main/webapp/ftl/traceLog.ftl +++ b/skywalking-webui/src/main/webapp/ftl/traceLog.ftl @@ -13,8 +13,7 @@ <@common.importJavaScript /> - -<@common.detailTraceLog /> + <@common.dealTraceLog />