Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
65e2a14a
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
65e2a14a
编写于
5月 15, 2016
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/wu-sheng/sky-walking
上级
b665322d
46bc141f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
64 addition
and
68 deletion
+64
-68
skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisResultViewResovler.js
...er_components/skywalking/js/analysisResultViewResovler.js
+60
-58
skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl
...ebui/src/main/webapp/pages/anls-result/analysisResult.ftl
+3
-10
skywalking-webui/src/main/webapp/pages/main.ftl
skywalking-webui/src/main/webapp/pages/main.ftl
+1
-0
未找到文件。
skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisResultViewResovler.js
浏览文件 @
65e2a14a
...
@@ -2,6 +2,7 @@ function AnalysisResultViewResolver(param) {
...
@@ -2,6 +2,7 @@ function AnalysisResultViewResolver(param) {
AnalysisResultViewResolver
.
prototype
.
baseUrl
=
param
.
baseUrl
;
AnalysisResultViewResolver
.
prototype
.
baseUrl
=
param
.
baseUrl
;
AnalysisResultViewResolver
.
prototype
.
treeId
=
param
.
treeId
;
AnalysisResultViewResolver
.
prototype
.
treeId
=
param
.
treeId
;
this
.
changetAnalyCondition
(
"
MONTH
"
,
this
.
getCurrentMonth
());
this
.
changetAnalyCondition
(
"
MONTH
"
,
this
.
getCurrentMonth
());
this
.
bindGotoTypicalPageEvent
();
}
}
AnalysisResultViewResolver
.
prototype
.
callChainTreeData
=
[];
AnalysisResultViewResolver
.
prototype
.
callChainTreeData
=
[];
...
@@ -39,7 +40,6 @@ AnalysisResultViewResolver.prototype.reloadMainPage = function () {
...
@@ -39,7 +40,6 @@ AnalysisResultViewResolver.prototype.reloadMainPage = function () {
$
(
"
#analyDate
"
).
val
(
this
.
analyDate
);
$
(
"
#analyDate
"
).
val
(
this
.
analyDate
);
this
.
paintChainTreeDataTable
();
this
.
paintChainTreeDataTable
();
this
.
bindGotoTypicalPageEvent
();
}
}
AnalysisResultViewResolver
.
prototype
.
changetAnalyCondition
=
function
(
type
,
date
)
{
AnalysisResultViewResolver
.
prototype
.
changetAnalyCondition
=
function
(
type
,
date
)
{
...
@@ -95,17 +95,17 @@ AnalysisResultViewResolver.prototype.showTypicalCallTree = function (nodeToken)
...
@@ -95,17 +95,17 @@ AnalysisResultViewResolver.prototype.showTypicalCallTree = function (nodeToken)
}
}
AnalysisResultViewResolver
.
prototype
.
sortTypicalCallChainTreeNode
=
function
(
callChainTreeNodeList
)
{
AnalysisResultViewResolver
.
prototype
.
sortTypicalCallChainTreeNode
=
function
(
callChainTreeNodeList
)
{
for
(
var
i
=
0
;
i
<
callChainTreeNodeList
.
length
-
1
;
i
++
)
{
for
(
var
i
=
0
;
i
<
callChainTreeNodeList
.
length
-
1
;
i
++
)
{
var
testTraceLevelId
=
callChainTreeNodeList
[
i
].
traceLevelId
;
var
testTraceLevelId
=
callChainTreeNodeList
[
i
].
traceLevelId
;
var
index
=
i
;
var
index
=
i
;
for
(
var
j
=
i
+
1
;
j
<
callChainTreeNodeList
.
length
;
j
++
){
for
(
var
j
=
i
+
1
;
j
<
callChainTreeNodeList
.
length
;
j
++
)
{
if
(
!
this
.
compareTraceLevelId
(
testTraceLevelId
,
callChainTreeNodeList
[
j
].
traceLevelId
)){
if
(
!
this
.
compareTraceLevelId
(
testTraceLevelId
,
callChainTreeNodeList
[
j
].
traceLevelId
))
{
index
=
j
;
index
=
j
;
testTraceLevelId
=
callChainTreeNodeList
[
j
].
traceLevelId
;
testTraceLevelId
=
callChainTreeNodeList
[
j
].
traceLevelId
;
}
}
}
}
if
(
index
!=
i
){
if
(
index
!=
i
)
{
var
tmpNode
=
callChainTreeNodeList
[
i
];
var
tmpNode
=
callChainTreeNodeList
[
i
];
callChainTreeNodeList
[
i
]
=
callChainTreeNodeList
[
index
];
callChainTreeNodeList
[
i
]
=
callChainTreeNodeList
[
index
];
callChainTreeNodeList
[
index
]
=
tmpNode
;
callChainTreeNodeList
[
index
]
=
tmpNode
;
...
@@ -167,9 +167,8 @@ AnalysisResultViewResolver.prototype.loadData = function (analyType, analyDate)
...
@@ -167,9 +167,8 @@ AnalysisResultViewResolver.prototype.loadData = function (analyType, analyDate)
break
;
break
;
}
}
}
}
self
.
paintChainTreeDataTable
();
self
.
paintChainTreeDataTable
();
self
.
bindGotoTypicalPageEvent
();
}
}
},
},
error
:
function
()
{
error
:
function
()
{
...
@@ -196,67 +195,70 @@ AnalysisResultViewResolver.prototype.loadData = function (analyType, analyDate)
...
@@ -196,67 +195,70 @@ AnalysisResultViewResolver.prototype.loadData = function (analyType, analyDate)
})
})
}
}
function
pickUpViewPoint
(
nodeToken
)
{
$
(
"
#viewpointStr
"
).
text
(
$
(
"
#
"
+
nodeToken
+
"
ViewPoint
"
).
text
());
$
(
"
#showTypicalCallTreeBtn
"
).
attr
(
"
value
"
,
nodeToken
);
$
(
"
#viewPointPickupModal
"
).
modal
(
'
show
'
);
}
AnalysisResultViewResolver
.
prototype
.
bindGotoTypicalPageEvent
=
function
()
{
AnalysisResultViewResolver
.
prototype
.
bindGotoTypicalPageEvent
=
function
()
{
var
self
=
this
;
var
self
=
this
;
$
(
"
button[name='showTypicalCallTreeBtn']
"
).
each
(
function
()
{
$
(
"
#showTypicalCallTreeBtn
"
).
click
(
function
()
{
$
(
this
).
click
(
function
()
{
var
treeNodeToken
=
$
(
this
).
attr
(
"
value
"
);
var
treeNodeToken
=
$
(
this
).
attr
(
"
value
"
);
$
(
"
#viewPointPickupModal
"
).
modal
(
'
hide
'
);
//$(".modal-backdrop").remove();
self
.
showTypicalCallTree
(
treeNodeToken
);
$
(
"
#modal
"
+
treeNodeToken
).
modal
(
'
hide
'
);
self
.
showTypicalCallTree
(
treeNodeToken
);
var
template
=
$
.
templates
(
"
#typicalCallChainTreesTmpl
"
);
var
htmlOutput
=
template
.
render
({
var
template
=
$
.
templates
(
"
#typicalCallChainTreesTmpl
"
);
"
entryViewPoint
"
:
self
.
callEntrance
,
var
htmlOutput
=
template
.
render
({
"
currentViewPoint
"
:
$
(
"
#
"
+
treeNodeToken
+
"
ViewPoint
"
).
text
()
"
entryViewPoint
"
:
self
.
callEntrance
,
});
"
currentViewPoint
"
:
$
(
"
#
"
+
treeNodeToken
+
"
ViewPoint
"
).
text
()
$
(
"
#mainPanel
"
).
empty
();
});
$
(
"
#mainPanel
"
).
html
(
htmlOutput
);
$
(
"
#mainPanel
"
).
empty
();
$
(
"
#mainPanel
"
).
html
(
htmlOutput
);
template
=
$
.
templates
(
"
#typicalTreeCheckBoxTmpl
"
);
htmlOutput
=
template
.
render
({
"
typicalTreeIds
"
:
self
.
currentTypicalTreeNodeMapping
.
typicalTreeIds
});
template
=
$
.
templates
(
"
#typicalTreeCheckBoxTmpl
"
);
$
(
"
#typicalCheckBoxDiv
"
).
empty
();
htmlOutput
=
template
.
render
({
"
typicalTreeIds
"
:
self
.
currentTypicalTreeNodeMapping
.
typicalTreeIds
});
$
(
"
#typicalCheckBoxDiv
"
).
html
(
htmlOutput
);
$
(
"
#typicalCheckBoxDiv
"
).
empty
();
$
(
"
#typicalCheckBoxDiv
"
).
html
(
htmlOutput
);
$
(
"
input[name='typicalTreeCheckBox']
"
).
each
(
function
()
{
$
(
this
).
change
(
function
()
{
$
(
"
input[name='typicalTreeCheckBox']
"
).
each
(
function
()
{
var
treeIds
=
new
Array
();
$
(
this
).
change
(
function
()
{
$
(
"
input[name='typicalTreeCheckBox']
"
).
each
(
function
()
{
var
treeIds
=
new
Array
();
if
(
$
(
this
).
prop
(
"
checked
"
))
{
$
(
"
input[name='typicalTreeCheckBox']
"
).
each
(
function
()
{
treeIds
.
push
(
$
(
this
).
attr
(
"
value
"
));
if
(
$
(
this
).
prop
(
"
checked
"
))
{
}
treeIds
.
push
(
$
(
this
).
attr
(
"
value
"
));
});
}
var
tmpTpicalTreeNodes
=
{};
});
self
.
currentTypicalTreeNodes
.
callChainTreeNodeList
=
[];
var
tmpTpicalTreeNodes
=
{};
for
(
var
i
=
0
;
i
<
treeIds
.
length
;
i
++
)
{
self
.
currentTypicalTreeNodes
.
callChainTreeNodeList
=
[];
var
tmpNodes
=
self
.
currentTypicalTreeNodeMapping
[
treeIds
[
i
]];
for
(
var
i
=
0
;
i
<
treeIds
.
length
;
i
++
)
{
for
(
var
j
=
0
;
j
<
tmpNodes
.
length
;
j
++
)
{
var
tmpNodes
=
self
.
currentTypicalTreeNodeMapping
[
treeIds
[
i
]];
if
(
tmpTpicalTreeNodes
[
tmpNodes
[
j
].
nodeToken
]
==
undefined
||
tmpTpicalTreeNodes
[
tmpNodes
[
j
].
nodeToken
]
==
""
)
{
for
(
var
j
=
0
;
j
<
tmpNodes
.
length
;
j
++
)
{
self
.
currentTypicalTreeNodes
.
callChainTreeNodeList
.
push
(
tmpNodes
[
j
]);
if
(
tmpTpicalTreeNodes
[
tmpNodes
[
j
].
nodeToken
]
==
undefined
||
tmpTpicalTreeNodes
[
tmpNodes
[
j
].
nodeToken
]
==
""
)
{
tmpTpicalTreeNodes
[
tmpNodes
[
j
].
nodeToken
]
=
{};
self
.
currentTypicalTreeNodes
.
callChainTreeNodeList
.
push
(
tmpNodes
[
j
]);
tmpTpicalTreeNodes
[
tmpNodes
[
j
].
nodeToken
]
=
{};
}
}
}
}
}
}
self
.
sortTypicalCallChainTreeNode
(
self
.
currentTypicalTreeNodes
.
callChainTreeNodeList
);
self
.
sortTypicalCallChainTreeNode
(
self
.
currentTypicalTreeNodes
.
callChainTreeNodeList
);
template
=
$
.
templates
(
"
#typicalTreeTableTmpl
"
);
template
=
$
.
templates
(
"
#typicalTreeTableTmpl
"
);
var
htmlOutput
=
template
.
render
((
self
.
convertAnalysisResult
(
self
.
currentTypicalTreeNodes
)));
var
htmlOutput
=
template
.
render
((
self
.
convertAnalysisResult
(
self
.
currentTypicalTreeNodes
)));
$
(
"
#typicalTreeTableDataBody
"
).
empty
();
$
(
"
#typicalTreeTableDataBody
"
).
empty
();
$
(
"
#typicalTreeTableDataBody
"
).
html
(
htmlOutput
);
$
(
"
#typicalTreeTableDataBody
"
).
html
(
htmlOutput
);
});
});
});
});
template
=
$
.
templates
(
"
#typicalTreeTableTmpl
"
);
template
=
$
.
templates
(
"
#typicalTreeTableTmpl
"
);
var
htmlOutput
=
template
.
render
((
self
.
convertAnalysisResult
(
self
.
currentTypicalTreeNodes
)));
var
htmlOutput
=
template
.
render
((
self
.
convertAnalysisResult
(
self
.
currentTypicalTreeNodes
)));
$
(
"
#typicalTreeTableDataBody
"
).
empty
();
$
(
"
#typicalTreeTableDataBody
"
).
empty
();
$
(
"
#typicalTreeTableDataBody
"
).
html
(
htmlOutput
);
$
(
"
#typicalTreeTableDataBody
"
).
html
(
htmlOutput
);
$
(
"
#rebackCallChainTreeBtn
"
).
click
(
function
()
{
$
(
"
#rebackCallChainTreeBtn
"
).
click
(
function
()
{
self
.
reloadMainPage
();
self
.
reloadMainPage
();
});
});
})
});
});
}
}
...
...
skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl
浏览文件 @
65e2a14a
...
@@ -58,9 +58,8 @@
...
@@ -58,9 +58,8 @@
<td rowspan="{{>rowSpanCount}}" valign="middle">{{>traceLevelId}}</td>
<td rowspan="{{>rowSpanCount}}" valign="middle">{{>traceLevelId}}</td>
{{/if}}
{{/if}}
<td>
<td>
<a href="javascript:
void(0);" data-toggle="modal" data-target="#modal{{>nodeToken}}">
{{>viewPoint}}</a>
<a href="javascript:
pickUpViewPoint('{{>nodeToken}}');">
{{>viewPoint}}</a>
<span style="display:none" id="{{>nodeToken}}ViewPoint">{{>viewPoint}}</span>
<span style="display:none" id="{{>nodeToken}}ViewPoint">{{>viewPoint}}</span>
</div>
</div>
</td>
</td>
<td>{{>anlyResult.totalCall}}</td>
<td>{{>anlyResult.totalCall}}</td>
...
@@ -80,8 +79,6 @@
...
@@ -80,8 +79,6 @@
<span id="{{>nodeToken}}" style="display:none">{{>anlyResultStr}}</span></td>
<span id="{{>nodeToken}}" style="display:none">{{>anlyResultStr}}</span></td>
</tr>
</tr>
</script>
</script>
</#macro>
</#macro>
...
@@ -99,7 +96,7 @@
...
@@ -99,7 +96,7 @@
<div class= "row">
<div class= "row">
<div class="col-md-10">
<div class="col-md-10">
<label>viewpoint:</label><br/>
<label>viewpoint:</label><br/>
<span style="word-wrap:break-word;"
>{{>viewPointStr}}
</span>
<span style="word-wrap:break-word;"
id="viewpointStr">
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -145,7 +142,6 @@
...
@@ -145,7 +142,6 @@
</div>
</div>
</div>
</div>
<hr/>
<hr/>
</script>
</script>
</#macro>
</#macro>
...
@@ -155,7 +151,6 @@
...
@@ -155,7 +151,6 @@
{{for typicalTreeIds}}
{{for typicalTreeIds}}
<input name="typicalTreeCheckBox" type="checkbox" checked value="{{>callTreeToken}}"/>典型调用链{{: #index}}
<input name="typicalTreeCheckBox" type="checkbox" checked value="{{>callTreeToken}}"/>典型调用链{{: #index}}
{{/for}}
{{/for}}
</script>
</script>
</#macro>
</#macro>
...
@@ -166,7 +161,7 @@
...
@@ -166,7 +161,7 @@
<td rowspan="{{>rowSpanCount}}" valign="middle">{{>traceLevelId}}</td>
<td rowspan="{{>rowSpanCount}}" valign="middle">{{>traceLevelId}}</td>
{{/if}}
{{/if}}
<td>
<td>
<
a href="javascript:void(0);" data-toggle="modal" data-target="#modal{{>nodeToken}}">{{>viewPoint}}</a
>
<
span>{{>viewPoint}}</span
>
</td>
</td>
<td>{{>anlyResult.totalCall}}</td>
<td>{{>anlyResult.totalCall}}</td>
<td>{{>anlyResult.correctNumber}}</td>
<td>{{>anlyResult.correctNumber}}</td>
...
@@ -184,8 +179,6 @@
...
@@ -184,8 +179,6 @@
<td>{{>anlyResult.averageCost}}ms
<td>{{>anlyResult.averageCost}}ms
<span id="{{>nodeToken}}" style="display:none">{{>anlyResultStr}}</span></td>
<span id="{{>nodeToken}}" style="display:none">{{>anlyResultStr}}</span></td>
</tr>
</tr>
</script>
</script>
</#macro>
</#macro>
...
...
skywalking-webui/src/main/webapp/pages/main.ftl
浏览文件 @
65e2a14a
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
<
@
anlyResult.typicalCallChainTrees
/>
<
@
anlyResult.typicalCallChainTrees
/>
<
@
anlyResult.typicalCallChainTreeTable
/>
<
@
anlyResult.typicalCallChainTreeTable
/>
<
@
anlyResult.typicalCallChainCheckBox
/>
<
@
anlyResult.typicalCallChainCheckBox
/>
<
@
anlyResult.viewPointPickUp
/>
<p
id=
"baseUrl"
style=
"display: none"
>
${_base}
</p>
<p
id=
"baseUrl"
style=
"display: none"
>
${_base}
</p>
<div
class=
"container"
id=
"mainPanel"
>
<div
class=
"container"
id=
"mainPanel"
>
<p
id=
"searchType"
style=
"display: none"
>
${searchType!''}
</p>
<p
id=
"searchType"
style=
"display: none"
>
${searchType!''}
</p>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录