kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复追踪信息弹窗不展示的问题

This commit is contained in:
zhangxin10 2016-01-04 16:21:15 +08:00
parent c1a90c9b7f
commit d051fa5935
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
skywalking-webui/src/main/webapp/ftl/index.ftl
View File

@ -14,17 +14,19 @@
.leaf {
background-color: white;
}
.in{display:block;height:370px;}
.in {
display: block;
/*height: 600px;*/
}
</style>
<@common.importJavaScript />
</head>
<body>
<div class="container">
<@common.importHeaderInfo userInfo="${userInfo}"/>
<div>
<div class="col-md-12" style="position:absolute;left:0px;right:0px;margin-top:20px;margin-left: 6px;"
id="showTraceLog">
</div>
<div class="container">
<div class="col-md-12" style="position:absolute;left:0px;right:0px;margin-top:20px;margin-left: 6px;"
id="showTraceLog">
</div>
<input type="hidden" id="uid" value="${(userInfo?eval).uid!''}">
<script src="${base}/js/webui-0.1.js?1=1"></script>

9
skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
View File

@ -5,11 +5,10 @@
<script src="${base}/js/jquery/jquery.treetable-3.2.0.js"></script>
<script src="${base}/js/jquery/jquery.backstretch.min.js"></script>
<script src="${base}/js/jquery/jquery-md5.js"></script>
<#--<script src="${base}/js/bootstrap.min-3.3.5.js"></script>-->
<script src="${base}/js/bootstrap.min-3.3.5.js"></script>
<script src="${base}/js/jquery/bootbox.min.js"></script>
<script src="${base}/js/scripts.js"></script>
<style>
.liu{display:none;height:370px;!important}
</style>
</#macro>
@ -94,8 +93,8 @@
<#-- dealTraceLog -->
<#macro dealTraceLog>
<#if valueList??>
<div id="row">
<div class="col-md-12">
<div id="row" style="overflow:hidden">
<div class="col-md-12" style="overflow:hidden">
<h5 style="color:white">
${traceId!}</br>
调度入口IP：${(valueList[0].address)!}，开始时间：${beginTime?number_to_datetime}，${(valueList?size)!}条调用记录，消耗总时长：${(endTime - beginTime)!'0'}
@ -235,6 +234,8 @@
</table>
</div>
</div>
<!-- show detailTraceLog -->
<@common.detailTraceLog />
</div>
</#if>
</#macro>

3
skywalking-webui/src/main/webapp/ftl/traceLog.ftl
View File

@ -13,8 +13,7 @@
<@common.importJavaScript />
</head>
<body>
<!-- show detailTraceLog -->
<@common.detailTraceLog />
<!-- show traceLogInfo -->
<@common.dealTraceLog />
<!-- show originLog -->