Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
7756ada0
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7756ada0
编写于
6月 10, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the jsp file path
上级
d3302662
变更
30
隐藏空白更改
内联
并排
Showing
30 changed file
with
696 addition
and
50 deletion
+696
-50
cat-home/src/main/java/com/dianping/cat/system/page/alarm/JspFile.java
...main/java/com/dianping/cat/system/page/alarm/JspFile.java
+25
-25
cat-home/src/main/java/com/dianping/cat/system/page/config/JspFile.java
...ain/java/com/dianping/cat/system/page/config/JspFile.java
+8
-8
cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-codegen.xml
...rces/META-INF/dal/model/topology-graph-config-codegen.xml
+12
-1
cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-model.xml
...ources/META-INF/dal/model/topology-graph-config-model.xml
+13
-2
cat-home/src/main/webapp/css/select2.css
cat-home/src/main/webapp/css/select2.css
+615
-0
cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp
...me/src/main/webapp/jsp/system/aggregation/aggregation.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/aggregation/aggregationUpdate.jsp
.../main/webapp/jsp/system/aggregation/aggregationUpdate.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/alarm/alarm.jsp
cat-home/src/main/webapp/jsp/system/alarm/alarm.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmExceptionRules.jsp
.../src/main/webapp/jsp/system/alarm/alarmExceptionRules.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmOpState.jsp
cat-home/src/main/webapp/jsp/system/alarm/alarmOpState.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmRecordDetail.jsp
...me/src/main/webapp/jsp/system/alarm/alarmRecordDetail.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmRecordList.jsp
...home/src/main/webapp/jsp/system/alarm/alarmRecordList.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmRuleAdd.jsp
cat-home/src/main/webapp/jsp/system/alarm/alarmRuleAdd.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmRuleUpdate.jsp
...home/src/main/webapp/jsp/system/alarm/alarmRuleUpdate.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmServiceRules.jsp
...me/src/main/webapp/jsp/system/alarm/alarmServiceRules.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateAdd.jsp
...ome/src/main/webapp/jsp/system/alarm/alarmTemplateAdd.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateList.jsp
...me/src/main/webapp/jsp/system/alarm/alarmTemplateList.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateUpdate.jsp
.../src/main/webapp/jsp/system/alarm/alarmTemplateUpdate.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/scheduledReportAdd.jsp
...e/src/main/webapp/jsp/system/alarm/scheduledReportAdd.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/scheduledReportUpdate.jsp
...rc/main/webapp/jsp/system/alarm/scheduledReportUpdate.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/alarm/scheduledReports.jsp
...ome/src/main/webapp/jsp/system/alarm/scheduledReports.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/config.jsp
cat-home/src/main/webapp/jsp/system/config.jsp
+0
-5
cat-home/src/main/webapp/jsp/system/project/project.jsp
cat-home/src/main/webapp/jsp/system/project/project.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/project/projectUpdate.jsp
...home/src/main/webapp/jsp/system/project/projectUpdate.jsp
+1
-1
cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigAdd.jsp
...webapp/jsp/system/topology/topologyGraphEdgeConfigAdd.jsp
+0
-0
cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp
...n/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp
+2
-2
cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigAdd.jsp
...webapp/jsp/system/topology/topologyGraphNodeConfigAdd.jsp
+7
-1
cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp
...n/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp
+5
-2
cat-home/src/main/webapp/jsp/system/topology/topologyGraphOpState.jsp
.../main/webapp/jsp/system/topology/topologyGraphOpState.jsp
+0
-0
cat-home/src/test/resources/com/dianping/cat/report/page/dependency/topology-graph-config.xml
...ping/cat/report/page/dependency/topology-graph-config.xml
+5
-0
未找到文件。
cat-home/src/main/java/com/dianping/cat/system/page/alarm/JspFile.java
浏览文件 @
7756ada0
package
com.dianping.cat.system.page.alarm
;
package
com.dianping.cat.system.page.alarm
;
public
enum
JspFile
{
public
enum
JspFile
{
ALARM_RECORD_DETAIL
(
"/jsp/system/alarmRecordDetail.jsp"
),
ALARM_RECORD_DETAIL
(
"/jsp/system/alarm
/alarm
RecordDetail.jsp"
),
ALARM_RECORD_LIST
(
"/jsp/system/alarmRecordList.jsp"
),
ALARM_RECORD_LIST
(
"/jsp/system/alarm
/alarm
RecordList.jsp"
),
ALARM_RULE_ADD
(
"/jsp/system/alarmRuleAdd.jsp"
),
ALARM_RULE_ADD
(
"/jsp/system/alarm
/alarm
RuleAdd.jsp"
),
ALARM_RULE_ADD_SUBMIT
(
"/jsp/system/alarmOpState.jsp"
),
ALARM_RULE_ADD_SUBMIT
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
ALARM_RULE_UPDATE
(
"/jsp/system/alarmRuleUpdate.jsp"
),
ALARM_RULE_UPDATE
(
"/jsp/system/alarm
/alarm
RuleUpdate.jsp"
),
ALARM_RULE_UPDATE_SUBMIT
(
"/jsp/system/alarmOpState.jsp"
),
ALARM_RULE_UPDATE_SUBMIT
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
ALARM_TEMPLATE_ADD
(
"/jsp/system/alarmTemplateAdd.jsp"
),
ALARM_TEMPLATE_ADD
(
"/jsp/system/alarm
/alarm
TemplateAdd.jsp"
),
ALARM_TEMPLATE_ADD_SUBMIT
(
"/jsp/system/alarmOpState.jsp"
),
ALARM_TEMPLATE_ADD_SUBMIT
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
ALARM_TEMPLATE_DELETE
(
"/jsp/system/alarmTemplateList.jsp"
),
ALARM_TEMPLATE_DELETE
(
"/jsp/system/alarm
/alarm
TemplateList.jsp"
),
ALARM_TEMPLATE_LIST
(
"/jsp/system/alarmTemplateList.jsp"
),
ALARM_TEMPLATE_LIST
(
"/jsp/system/alarm
/alarm
TemplateList.jsp"
),
ALARM_TEMPLATE_UPDATE
(
"/jsp/system/alarmTemplateUpdate.jsp"
),
ALARM_TEMPLATE_UPDATE
(
"/jsp/system/alarm
/alarm
TemplateUpdate.jsp"
),
ALARM_TEMPLATE_UPDATE_SUBMIT
(
"/jsp/system/alarmOpState.jsp"
),
ALARM_TEMPLATE_UPDATE_SUBMIT
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
EXCEPTION_ALARM_RULE_DELETE
(
"/jsp/system/alarmExceptionRules.jsp"
),
EXCEPTION_ALARM_RULE_DELETE
(
"/jsp/system/alarm
/alarm
ExceptionRules.jsp"
),
EXCEPTION_ALARM_RULE_LIST
(
"/jsp/system/alarmExceptionRules.jsp"
),
EXCEPTION_ALARM_RULE_LIST
(
"/jsp/system/alarm
/alarm
ExceptionRules.jsp"
),
EXCEPTION_ALARM_RULE_SUB
(
"/jsp/system/alarmOpState.jsp"
),
EXCEPTION_ALARM_RULE_SUB
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
SCHEDULED_REPORT_ADD
(
"/jsp/system/scheduledReportAdd.jsp"
),
SCHEDULED_REPORT_ADD
(
"/jsp/system/
alarm/
scheduledReportAdd.jsp"
),
SCHEDULED_REPORT_ADD_SUBMIT
(
"/jsp/system/alarmOpState.jsp"
),
SCHEDULED_REPORT_ADD_SUBMIT
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
SCHEDULED_REPORT_DELETE
(
"/jsp/system/scheduledReports.jsp"
),
SCHEDULED_REPORT_DELETE
(
"/jsp/system/
alarm/
scheduledReports.jsp"
),
SCHEDULED_REPORT_LIST
(
"/jsp/system/scheduledReports.jsp"
),
SCHEDULED_REPORT_LIST
(
"/jsp/system/
alarm/
scheduledReports.jsp"
),
SCHEDULED_REPORT_SUB
(
"/jsp/system/alarmOpState.jsp"
),
SCHEDULED_REPORT_SUB
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
SCHEDULED_REPORT_UPDATE
(
"/jsp/system/scheduledReportUpdate.jsp"
),
SCHEDULED_REPORT_UPDATE
(
"/jsp/system/
alarm/
scheduledReportUpdate.jsp"
),
SCHEDULED_REPORT_UPDATE_SUBMIT
(
"/jsp/system/alarmOpState.jsp"
),
SCHEDULED_REPORT_UPDATE_SUBMIT
(
"/jsp/system/alarm
/alarm
OpState.jsp"
),
SERVICE_ALARM_RULE_DELETE
(
"/jsp/system/alarmServiceRules.jsp"
),
SERVICE_ALARM_RULE_DELETE
(
"/jsp/system/alarm
/alarm
ServiceRules.jsp"
),
SERVICE_ALARM_RULE_LIST
(
"/jsp/system/alarmServiceRules.jsp"
),
SERVICE_ALARM_RULE_LIST
(
"/jsp/system/alarm
/alarm
ServiceRules.jsp"
),
SERVICE_ALARM_RULE_SUB
(
"/jsp/system/alarmOpState.jsp"
)
SERVICE_ALARM_RULE_SUB
(
"/jsp/system/alarm
/alarm
OpState.jsp"
)
;
;
...
...
cat-home/src/main/java/com/dianping/cat/system/page/config/JspFile.java
浏览文件 @
7756ada0
package
com.dianping.cat.system.page.config
;
package
com.dianping.cat.system.page.config
;
public
enum
JspFile
{
public
enum
JspFile
{
PROJECT_ALL
(
"/jsp/system/project.jsp"
),
PROJECT_ALL
(
"/jsp/system/project
/project
.jsp"
),
PROJECT_UPATE
(
"/jsp/system/projectUpdate.jsp"
),
PROJECT_UPATE
(
"/jsp/system/project
/project
Update.jsp"
),
AGGREGATION_ALL
(
"/jsp/system/aggregation.jsp"
),
AGGREGATION_ALL
(
"/jsp/system/aggregation
/aggregation
.jsp"
),
AGGREGATION_UPATE
(
"/jsp/system/aggregationUpdate.jsp"
),
AGGREGATION_UPATE
(
"/jsp/system/aggregation
/aggregation
Update.jsp"
),
TOPOLOGY_GRAPH_NODE_CONFIG_ADD_OR_UPDATE
(
"/jsp/system/topologyGraphNodeConfigAdd.jsp"
),
TOPOLOGY_GRAPH_NODE_CONFIG_ADD_OR_UPDATE
(
"/jsp/system/topology
/topology
GraphNodeConfigAdd.jsp"
),
TOPOLOGY_GRAPH_NODE_CONFIG_LIST
(
"/jsp/system/topologyGraphNodeConfigs.jsp"
),
TOPOLOGY_GRAPH_NODE_CONFIG_LIST
(
"/jsp/system/topology
/topology
GraphNodeConfigs.jsp"
),
TOPOLOGY_GRAPH_EDGE_CONFIG_ADD_OR_UPDATE
(
"/jsp/system/topologyGraphEdgeConfigAdd.jsp"
),
TOPOLOGY_GRAPH_EDGE_CONFIG_ADD_OR_UPDATE
(
"/jsp/system/topology
/topology
GraphEdgeConfigAdd.jsp"
),
TOPOLOGY_GRAPH_EDGE_CONFIG_LIST
(
"/jsp/system/topologyGraphEdgeConfigs.jsp"
),
TOPOLOGY_GRAPH_EDGE_CONFIG_LIST
(
"/jsp/system/topology
/topology
GraphEdgeConfigs.jsp"
),
;
;
...
...
cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-codegen.xml
浏览文件 @
7756ada0
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<entity
name=
"topology-graph-config"
root=
"true"
>
<entity
name=
"topology-graph-config"
root=
"true"
>
<entity-ref
name=
"node-config"
type=
"list"
names=
"node-configs"
/>
<entity-ref
name=
"node-config"
type=
"list"
names=
"node-configs"
/>
<entity-ref
name=
"edge-config"
type=
"list"
names=
"edge-configs"
/>
<entity-ref
name=
"edge-config"
type=
"list"
names=
"edge-configs"
/>
<entity-ref
name=
"product-line"
type=
"list"
names=
"product-lines"
/>
</entity>
</entity>
<entity
name=
"node-config"
>
<entity
name=
"node-config"
>
<attribute
name=
"type"
value-type=
"String"
/>
<attribute
name=
"type"
value-type=
"String"
/>
...
@@ -10,7 +11,7 @@
...
@@ -10,7 +11,7 @@
<attribute
name=
"default-error-threshold"
value-type=
"int"
/>
<attribute
name=
"default-error-threshold"
value-type=
"int"
/>
<attribute
name=
"default-warning-response-time"
value-type=
"double"
/>
<attribute
name=
"default-warning-response-time"
value-type=
"double"
/>
<attribute
name=
"default-error-response-time"
value-type=
"double"
/>
<attribute
name=
"default-error-response-time"
value-type=
"double"
/>
<entity-ref
name=
"domain-config"
type=
"list"
names=
"domains"
/>
<entity-ref
name=
"domain-config"
type=
"list"
names=
"domain
-config
s"
/>
</entity>
</entity>
<entity
name=
"domain-config"
>
<entity
name=
"domain-config"
>
<attribute
name=
"id"
value-type=
"String"
/>
<attribute
name=
"id"
value-type=
"String"
/>
...
@@ -29,5 +30,15 @@
...
@@ -29,5 +30,15 @@
<attribute
name=
"warning-response-time"
value-type=
"double"
/>
<attribute
name=
"warning-response-time"
value-type=
"double"
/>
<attribute
name=
"error-response-time"
value-type=
"double"
/>
<attribute
name=
"error-response-time"
value-type=
"double"
/>
</entity>
</entity>
<entity
name=
"product-line"
>
<attribute
name=
"id"
value-type=
"String"
/>
<attribute
name=
"title"
value-type=
"String"
/>
<attribute
name=
"order"
value-type=
"int"
/>
<attribute
name=
"important"
value-type=
"boolean"
/>
<entity-ref
name=
"domain"
type=
"list"
names=
"domains"
/>
</entity>
<entity
name=
"domain"
>
<attribute
name=
"id"
value-type=
"String"
/>
</entity>
</model>
</model>
cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-model.xml
浏览文件 @
7756ada0
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<model
model-package=
"com.dianping.cat.home.dependency.config"
enable-merger=
"true"
enable-sax-parser=
"true"
<model
model-package=
"com.dianping.cat.home.dependency.config"
enable-merger=
"true"
enable-sax-parser=
"true"
enable-base-visitor=
"true"
enable-json-parser=
"true"
enable-json-builder=
"true"
>
enable-base-visitor=
"true"
>
<entity
name=
"topology-graph-config"
root=
"true"
>
<entity
name=
"topology-graph-config"
root=
"true"
>
<entity-ref
name=
"node-config"
type=
"map"
names=
"node-configs"
method-find-or-create=
"true"
/>
<entity-ref
name=
"node-config"
type=
"map"
names=
"node-configs"
method-find-or-create=
"true"
/>
<entity-ref
name=
"edge-config"
type=
"map"
names=
"edge-configs"
method-find-or-create=
"true"
/>
<entity-ref
name=
"edge-config"
type=
"map"
names=
"edge-configs"
method-find-or-create=
"true"
/>
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
<attribute
name=
"default-error-threshold"
value-type=
"int"
/>
<attribute
name=
"default-error-threshold"
value-type=
"int"
/>
<attribute
name=
"default-warning-response-time"
value-type=
"double"
/>
<attribute
name=
"default-warning-response-time"
value-type=
"double"
/>
<attribute
name=
"default-error-response-time"
value-type=
"double"
/>
<attribute
name=
"default-error-response-time"
value-type=
"double"
/>
<entity-ref
name=
"domain-config"
type=
"map"
names=
"domains"
method-find-or-create=
"true"
/>
<entity-ref
name=
"domain-config"
type=
"map"
names=
"domainConfigs"
method-find-or-create=
"true"
/>
<entity-ref
name=
"product-line"
type=
"map"
names=
"product-lines"
method-find-or-create=
"true"
/>
</entity>
</entity>
<entity
name=
"domain-config"
>
<entity
name=
"domain-config"
>
<attribute
name=
"id"
value-type=
"String"
key=
"true"
/>
<attribute
name=
"id"
value-type=
"String"
key=
"true"
/>
...
@@ -30,6 +31,16 @@
...
@@ -30,6 +31,16 @@
<attribute
name=
"warning-response-time"
value-type=
"double"
primitive=
"true"
/>
<attribute
name=
"warning-response-time"
value-type=
"double"
primitive=
"true"
/>
<attribute
name=
"error-response-time"
value-type=
"double"
primitive=
"true"
/>
<attribute
name=
"error-response-time"
value-type=
"double"
primitive=
"true"
/>
</entity>
</entity>
<entity
name=
"product-line"
>
<attribute
name=
"id"
value-type=
"String"
key=
"true"
/>
<attribute
name=
"title"
value-type=
"String"
/>
<attribute
name=
"order"
value-type=
"double"
primitive=
"true"
/>
<attribute
name=
"important"
value-type=
"boolean"
primitive=
"true"
/>
<entity-ref
name=
"domain"
type=
"map"
names=
"domains"
method-find-or-create=
"true"
/>
</entity>
<entity
name=
"domain"
>
<attribute
name=
"id"
value-type=
"String"
key=
"true"
/>
</entity>
</model>
</model>
...
...
cat-home/src/main/webapp/css/select2.css
0 → 100644
浏览文件 @
7756ada0
/*
Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013
*/
.select2-container
{
position
:
relative
;
display
:
inline-block
;
/* inline-block for ie7 */
zoom
:
1
;
*
display
:
inline
;
vertical-align
:
middle
;
}
.select2-container
,
.select2-drop
,
.select2-search
,
.select2-search
input
{
/*
Force border-box so that % widths fit the parent
container without overlap because of margin/padding.
More Info : http://www.quirksmode.org/css/box.html
*/
-webkit-box-sizing
:
border-box
;
/* webkit */
-khtml-box-sizing
:
border-box
;
/* konqueror */
-moz-box-sizing
:
border-box
;
/* firefox */
-ms-box-sizing
:
border-box
;
/* ie */
box-sizing
:
border-box
;
/* css3 */
}
.select2-container
.select2-choice
{
display
:
block
;
height
:
26px
;
padding
:
0
0
0
8px
;
overflow
:
hidden
;
position
:
relative
;
border
:
1px
solid
#aaa
;
white-space
:
nowrap
;
line-height
:
26px
;
color
:
#444
;
text-decoration
:
none
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding
;
background-clip
:
padding-box
;
-webkit-touch-callout
:
none
;
-webkit-user-select
:
none
;
-khtml-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
user-select
:
none
;
background-color
:
#fff
;
background-image
:
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
color-stop
(
0
,
#eeeeee
),
color-stop
(
0.5
,
white
));
background-image
:
-webkit-linear-gradient
(
center
bottom
,
#eeeeee
0%
,
white
50%
);
background-image
:
-moz-linear-gradient
(
center
bottom
,
#eeeeee
0%
,
white
50%
);
background-image
:
-o-linear-gradient
(
bottom
,
#eeeeee
0%
,
#ffffff
50%
);
background-image
:
-ms-linear-gradient
(
top
,
#ffffff
0%
,
#eeeeee
50%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ffffff'
,
endColorstr
=
'#eeeeee'
,
GradientType
=
0
);
background-image
:
linear-gradient
(
top
,
#ffffff
0%
,
#eeeeee
50%
);
}
.select2-container.select2-drop-above
.select2-choice
{
border-bottom-color
:
#aaa
;
-webkit-border-radius
:
0
0
4px
4px
;
-moz-border-radius
:
0
0
4px
4px
;
border-radius
:
0
0
4px
4px
;
background-image
:
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
color-stop
(
0
,
#eeeeee
),
color-stop
(
0.9
,
white
));
background-image
:
-webkit-linear-gradient
(
center
bottom
,
#eeeeee
0%
,
white
90%
);
background-image
:
-moz-linear-gradient
(
center
bottom
,
#eeeeee
0%
,
white
90%
);
background-image
:
-o-linear-gradient
(
bottom
,
#eeeeee
0%
,
white
90%
);
background-image
:
-ms-linear-gradient
(
top
,
#eeeeee
0%
,
#ffffff
90%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ffffff'
,
endColorstr
=
'#eeeeee'
,
GradientType
=
0
);
background-image
:
linear-gradient
(
top
,
#eeeeee
0%
,
#ffffff
90%
);
}
.select2-container
.select2-choice
span
{
margin-right
:
26px
;
display
:
block
;
overflow
:
hidden
;
white-space
:
nowrap
;
-ms-text-overflow
:
ellipsis
;
-o-text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
}
.select2-container
.select2-choice
abbr
{
display
:
block
;
width
:
12px
;
height
:
12px
;
position
:
absolute
;
right
:
26px
;
top
:
8px
;
font-size
:
1px
;
text-decoration
:
none
;
border
:
0
;
background
:
url('../img/select2.png')
right
top
no-repeat
;
cursor
:
pointer
;
outline
:
0
;
}
.select2-container
.select2-choice
abbr
:hover
{
background-position
:
right
-11px
;
cursor
:
pointer
;
}
.select2-drop-mask
{
position
:
absolute
;
left
:
0
;
top
:
0
;
z-index
:
9998
;
background-color
:
#fff
;
opacity
:
0
;
-ms-filter
:
"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"
;
/* works in IE 8 */
filter
:
"alpha(opacity=0)"
;
/* expected to work in IE 8 */
filter
:
alpha
(
opacity
=
0
);
/* IE 4-7 */
}
.select2-drop
{
width
:
100%
;
margin-top
:
-1px
;
position
:
absolute
;
z-index
:
9999
;
top
:
100%
;
background
:
#fff
;
color
:
#000
;
border
:
1px
solid
#aaa
;
border-top
:
0
;
-webkit-border-radius
:
0
0
4px
4px
;
-moz-border-radius
:
0
0
4px
4px
;
border-radius
:
0
0
4px
4px
;
-webkit-box-shadow
:
0
4px
5px
rgba
(
0
,
0
,
0
,
.15
);
-moz-box-shadow
:
0
4px
5px
rgba
(
0
,
0
,
0
,
.15
);
box-shadow
:
0
4px
5px
rgba
(
0
,
0
,
0
,
.15
);
}
.select2-drop.select2-drop-above
{
margin-top
:
1px
;
border-top
:
1px
solid
#aaa
;
border-bottom
:
0
;
-webkit-border-radius
:
4px
4px
0
0
;
-moz-border-radius
:
4px
4px
0
0
;
border-radius
:
4px
4px
0
0
;
-webkit-box-shadow
:
0
-4px
5px
rgba
(
0
,
0
,
0
,
.15
);
-moz-box-shadow
:
0
-4px
5px
rgba
(
0
,
0
,
0
,
.15
);
box-shadow
:
0
-4px
5px
rgba
(
0
,
0
,
0
,
.15
);
}
.select2-container
.select2-choice
div
{
display
:
block
;
width
:
18px
;
height
:
100%
;
position
:
absolute
;
right
:
0
;
top
:
0
;
border-left
:
1px
solid
#aaa
;
-webkit-border-radius
:
0
4px
4px
0
;
-moz-border-radius
:
0
4px
4px
0
;
border-radius
:
0
4px
4px
0
;
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding
;
background-clip
:
padding-box
;
background
:
#ccc
;
background-image
:
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
color-stop
(
0
,
#ccc
),
color-stop
(
0.6
,
#eee
));
background-image
:
-webkit-linear-gradient
(
center
bottom
,
#ccc
0%
,
#eee
60%
);
background-image
:
-moz-linear-gradient
(
center
bottom
,
#ccc
0%
,
#eee
60%
);
background-image
:
-o-linear-gradient
(
bottom
,
#ccc
0%
,
#eee
60%
);
background-image
:
-ms-linear-gradient
(
top
,
#cccccc
0%
,
#eeeeee
60%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#eeeeee'
,
endColorstr
=
'#cccccc'
,
GradientType
=
0
);
background-image
:
linear-gradient
(
top
,
#cccccc
0%
,
#eeeeee
60%
);
}
.select2-container
.select2-choice
div
b
{
display
:
block
;
width
:
100%
;
height
:
100%
;
background
:
url('../img/select2.png')
no-repeat
0
1px
;
}
.select2-search
{
display
:
inline-block
;
width
:
100%
;
min-height
:
26px
;
margin
:
0
;
padding-left
:
4px
;
padding-right
:
4px
;
position
:
relative
;
z-index
:
10000
;
white-space
:
nowrap
;
}
.select2-search-hidden
{
display
:
block
;
position
:
absolute
;
left
:
-10000px
;
}
.select2-search
input
{
width
:
100%
;
height
:
auto
!important
;
min-height
:
26px
;
padding
:
4px
20px
4px
5px
;
margin
:
0
;
outline
:
0
;
font-family
:
sans-serif
;
font-size
:
1em
;
border
:
1px
solid
#aaa
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
background
:
#fff
url('../img/select2.png')
no-repeat
100%
-22px
;
background
:
url('../img/select2.png')
no-repeat
100%
-22px
,
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
color-stop
(
0.85
,
white
),
color-stop
(
0.99
,
#eeeeee
));
background
:
url('../img/select2.png')
no-repeat
100%
-22px
,
-webkit-linear-gradient
(
center
bottom
,
white
85%
,
#eeeeee
99%
);
background
:
url('../img/select2.png')
no-repeat
100%
-22px
,
-moz-linear-gradient
(
center
bottom
,
white
85%
,
#eeeeee
99%
);
background
:
url('../img/select2.png')
no-repeat
100%
-22px
,
-o-linear-gradient
(
bottom
,
white
85%
,
#eeeeee
99%
);
background
:
url('../img/select2.png')
no-repeat
100%
-22px
,
-ms-linear-gradient
(
top
,
#ffffff
85%
,
#eeeeee
99%
);
background
:
url('../img/select2.png')
no-repeat
100%
-22px
,
linear-gradient
(
top
,
#ffffff
85%
,
#eeeeee
99%
);
}
.select2-drop.select2-drop-above
.select2-search
input
{
margin-top
:
4px
;
}
.select2-search
input
.select2-active
{
background
:
#fff
url('../img/select2-spinner.gif')
no-repeat
100%
;
background
:
url('../img/select2-spinner.gif')
no-repeat
100%
,
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
color-stop
(
0.85
,
white
),
color-stop
(
0.99
,
#eeeeee
));
background
:
url('../img/select2-spinner.gif')
no-repeat
100%
,
-webkit-linear-gradient
(
center
bottom
,
white
85%
,
#eeeeee
99%
);
background
:
url('../img/select2-spinner.gif')
no-repeat
100%
,
-moz-linear-gradient
(
center
bottom
,
white
85%
,
#eeeeee
99%
);
background
:
url('../img/select2-spinner.gif')
no-repeat
100%
,
-o-linear-gradient
(
bottom
,
white
85%
,
#eeeeee
99%
);
background
:
url('../img/select2-spinner.gif')
no-repeat
100%
,
-ms-linear-gradient
(
top
,
#ffffff
85%
,
#eeeeee
99%
);
background
:
url('../img/select2-spinner.gif')
no-repeat
100%
,
linear-gradient
(
top
,
#ffffff
85%
,
#eeeeee
99%
);
}
.select2-container-active
.select2-choice
,
.select2-container-active
.select2-choices
{
border
:
1px
solid
#5897fb
;
outline
:
none
;
-webkit-box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,
.3
);
-moz-box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,
.3
);
box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,
.3
);
}
.select2-dropdown-open
.select2-choice
{
border-bottom-color
:
transparent
;
-webkit-box-shadow
:
0
1px
0
#fff
inset
;
-moz-box-shadow
:
0
1px
0
#fff
inset
;
box-shadow
:
0
1px
0
#fff
inset
;
-webkit-border-bottom-left-radius
:
0
;
-moz-border-radius-bottomleft
:
0
;
border-bottom-left-radius
:
0
;
-webkit-border-bottom-right-radius
:
0
;
-moz-border-radius-bottomright
:
0
;
border-bottom-right-radius
:
0
;
background-color
:
#eee
;
background-image
:
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
color-stop
(
0
,
white
),
color-stop
(
0.5
,
#eeeeee
));
background-image
:
-webkit-linear-gradient
(
center
bottom
,
white
0%
,
#eeeeee
50%
);
background-image
:
-moz-linear-gradient
(
center
bottom
,
white
0%
,
#eeeeee
50%
);
background-image
:
-o-linear-gradient
(
bottom
,
white
0%
,
#eeeeee
50%
);
background-image
:
-ms-linear-gradient
(
top
,
#ffffff
0%
,
#eeeeee
50%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#eeeeee'
,
endColorstr
=
'#ffffff'
,
GradientType
=
0
);
background-image
:
linear-gradient
(
top
,
#ffffff
0%
,
#eeeeee
50%
);
}
.select2-dropdown-open
.select2-choice
div
{
background
:
transparent
;
border-left
:
none
;
filter
:
none
;
}
.select2-dropdown-open
.select2-choice
div
b
{
background-position
:
-18px
1px
;
}
/* results */
.select2-results
{
max-height
:
200px
;
padding
:
0
0
0
4px
;
margin
:
4px
4px
4px
0
;
position
:
relative
;
overflow-x
:
hidden
;
overflow-y
:
auto
;
-webkit-tap-highlight-color
:
rgba
(
0
,
0
,
0
,
0
);
}
.select2-results
ul
.select2-result-sub
{
margin
:
0
;
}
.select2-results
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
20px
}
.select2-results
ul
.select2-result-sub
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
40px
}
.select2-results
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
60px
}
.select2-results
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
80px
}
.select2-results
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
100px
}
.select2-results
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
110px
}
.select2-results
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
ul
.select2-result-sub
>
li
.select2-result-label
{
padding-left
:
120px
}
.select2-results
li
{
list-style
:
none
;
display
:
list-item
;
background-image
:
none
;
}
.select2-results
li
.select2-result-with-children
>
.select2-result-label
{
font-weight
:
bold
;
}
.select2-results
.select2-result-label
{
padding
:
3px
7px
4px
;
margin
:
0
;
cursor
:
pointer
;
min-height
:
1em
;
-webkit-touch-callout
:
none
;
-webkit-user-select
:
none
;
-khtml-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
user-select
:
none
;
}
.select2-results
.select2-highlighted
{
background
:
#3875d7
;
color
:
#fff
;
}
.select2-results
li
em
{
background
:
#feffde
;
font-style
:
normal
;
}
.select2-results
.select2-highlighted
em
{
background
:
transparent
;
}
.select2-results
.select2-highlighted
ul
{
background
:
white
;
color
:
#000
;
}
.select2-results
.select2-no-results
,
.select2-results
.select2-searching
,
.select2-results
.select2-selection-limit
{
background
:
#f4f4f4
;
display
:
list-item
;
}
/*
disabled look for disabled choices in the results dropdown
*/
.select2-results
.select2-disabled.select2-highlighted
{
color
:
#666
;
background
:
#f4f4f4
;
display
:
list-item
;
cursor
:
default
;
}
.select2-results
.select2-disabled
{
background
:
#f4f4f4
;
display
:
list-item
;
cursor
:
default
;
}
.select2-results
.select2-selected
{
display
:
none
;
}
.select2-more-results.select2-active
{
background
:
#f4f4f4
url('../img/select2-spinner.gif')
no-repeat
100%
;
}
.select2-more-results
{
background
:
#f4f4f4
;
display
:
list-item
;
}
/* disabled styles */
.select2-container.select2-container-disabled
.select2-choice
{
background-color
:
#f4f4f4
;
background-image
:
none
;
border
:
1px
solid
#ddd
;
cursor
:
default
;
}
.select2-container.select2-container-disabled
.select2-choice
div
{
background-color
:
#f4f4f4
;
background-image
:
none
;
border-left
:
0
;
}
.select2-container.select2-container-disabled
.select2-choice
abbr
{
display
:
none
}
/* multiselect */
.select2-container-multi
.select2-choices
{
height
:
auto
!important
;
height
:
1%
;
margin
:
0
;
padding
:
0
;
position
:
relative
;
border
:
1px
solid
#aaa
;
cursor
:
text
;
overflow
:
hidden
;
background-color
:
#fff
;
background-image
:
-webkit-gradient
(
linear
,
0%
0%
,
0%
100%
,
color-stop
(
1%
,
#eeeeee
),
color-stop
(
15%
,
#ffffff
));
background-image
:
-webkit-linear-gradient
(
top
,
#eeeeee
1%
,
#ffffff
15%
);
background-image
:
-moz-linear-gradient
(
top
,
#eeeeee
1%
,
#ffffff
15%
);
background-image
:
-o-linear-gradient
(
top
,
#eeeeee
1%
,
#ffffff
15%
);
background-image
:
-ms-linear-gradient
(
top
,
#eeeeee
1%
,
#ffffff
15%
);
background-image
:
linear-gradient
(
top
,
#eeeeee
1%
,
#ffffff
15%
);
}
.select2-locked
{
padding
:
3px
5px
3px
5px
!important
;
}
.select2-container-multi
.select2-choices
{
min-height
:
26px
;
}
.select2-container-multi.select2-container-active
.select2-choices
{
border
:
1px
solid
#5897fb
;
outline
:
none
;
-webkit-box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,
.3
);
-moz-box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,
.3
);
box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,
.3
);
}
.select2-container-multi
.select2-choices
li
{
float
:
left
;
list-style
:
none
;
}
.select2-container-multi
.select2-choices
.select2-search-field
{
margin
:
0
;
padding
:
0
;
white-space
:
nowrap
;
}
.select2-container-multi
.select2-choices
.select2-search-field
input
{
padding
:
5px
;
margin
:
1px
0
;
font-family
:
sans-serif
;
font-size
:
100%
;
color
:
#666
;
outline
:
0
;
border
:
0
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
background
:
transparent
!important
;
}
.select2-container-multi
.select2-choices
.select2-search-field
input
.select2-active
{
background
:
#fff
url('../img/select2-spinner.gif')
no-repeat
100%
!important
;
}
.select2-default
{
color
:
#999
!important
;
}
.select2-container-multi
.select2-choices
.select2-search-choice
{
padding
:
3px
5px
3px
18px
;
margin
:
3px
0
3px
5px
;
position
:
relative
;
line-height
:
13px
;
color
:
#333
;
cursor
:
default
;
border
:
1px
solid
#aaaaaa
;
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;
-webkit-box-shadow
:
0
0
2px
#ffffff
inset
,
0
1px
0
rgba
(
0
,
0
,
0
,
0.05
);
-moz-box-shadow
:
0
0
2px
#ffffff
inset
,
0
1px
0
rgba
(
0
,
0
,
0
,
0.05
);
box-shadow
:
0
0
2px
#ffffff
inset
,
0
1px
0
rgba
(
0
,
0
,
0
,
0.05
);
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding
;
background-clip
:
padding-box
;
-webkit-touch-callout
:
none
;
-webkit-user-select
:
none
;
-khtml-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
user-select
:
none
;
background-color
:
#e4e4e4
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#eeeeee'
,
endColorstr
=
'#f4f4f4'
,
GradientType
=
0
);
background-image
:
-webkit-gradient
(
linear
,
0%
0%
,
0%
100%
,
color-stop
(
20%
,
#f4f4f4
),
color-stop
(
50%
,
#f0f0f0
),
color-stop
(
52%
,
#e8e8e8
),
color-stop
(
100%
,
#eeeeee
));
background-image
:
-webkit-linear-gradient
(
top
,
#f4f4f4
20%
,
#f0f0f0
50%
,
#e8e8e8
52%
,
#eeeeee
100%
);
background-image
:
-moz-linear-gradient
(
top
,
#f4f4f4
20%
,
#f0f0f0
50%
,
#e8e8e8
52%
,
#eeeeee
100%
);
background-image
:
-o-linear-gradient
(
top
,
#f4f4f4
20%
,
#f0f0f0
50%
,
#e8e8e8
52%
,
#eeeeee
100%
);
background-image
:
-ms-linear-gradient
(
top
,
#f4f4f4
20%
,
#f0f0f0
50%
,
#e8e8e8
52%
,
#eeeeee
100%
);
background-image
:
linear-gradient
(
top
,
#f4f4f4
20%
,
#f0f0f0
50%
,
#e8e8e8
52%
,
#eeeeee
100%
);
}
.select2-container-multi
.select2-choices
.select2-search-choice
span
{
cursor
:
default
;
}
.select2-container-multi
.select2-choices
.select2-search-choice-focus
{
background
:
#d4d4d4
;
}
.select2-search-choice-close
{
display
:
block
;
width
:
12px
;
height
:
13px
;
position
:
absolute
;
right
:
3px
;
top
:
4px
;
font-size
:
1px
;
outline
:
none
;
background
:
url('../img/select2.png')
right
top
no-repeat
;
}
.select2-container-multi
.select2-search-choice-close
{
left
:
3px
;
}
.select2-container-multi
.select2-choices
.select2-search-choice
.select2-search-choice-close
:hover
{
background-position
:
right
-11px
;
}
.select2-container-multi
.select2-choices
.select2-search-choice-focus
.select2-search-choice-close
{
background-position
:
right
-11px
;
}
/* disabled styles */
.select2-container-multi.select2-container-disabled
.select2-choices
{
background-color
:
#f4f4f4
;
background-image
:
none
;
border
:
1px
solid
#ddd
;
cursor
:
default
;
}
.select2-container-multi.select2-container-disabled
.select2-choices
.select2-search-choice
{
padding
:
3px
5px
3px
5px
;
border
:
1px
solid
#ddd
;
background-image
:
none
;
background-color
:
#f4f4f4
;
}
.select2-container-multi.select2-container-disabled
.select2-choices
.select2-search-choice
.select2-search-choice-close
{
display
:
none
;
}
/* end multiselect */
.select2-result-selectable
.select2-match
,
.select2-result-unselectable
.select2-match
{
text-decoration
:
underline
;
}
.select2-offscreen
{
border
:
0
;
clip
:
rect
(
0
0
0
0
);
height
:
1px
;
margin
:
-1px
;
overflow
:
hidden
;
padding
:
0
;
position
:
absolute
;
width
:
1px
;
}
/* Retina-ize icons */
@media
only
screen
and
(
-webkit-min-device-pixel-ratio
:
1.5
),
only
screen
and
(
min-resolution
:
144dpi
)
{
.select2-search
input
,
.select2-search-choice-close
,
.select2-container
.select2-choice
abbr
,
.select2-container
.select2-choice
div
b
{
background-image
:
url('../img/select2x2.png')
!important
;
background-repeat
:
no-repeat
!important
;
background-size
:
60px
40px
!important
;
}
.select2-search
input
{
background-position
:
100%
-21px
!important
;
}
}
cat-home/src/main/webapp/jsp/system/aggregation.jsp
→
cat-home/src/main/webapp/jsp/system/aggregation
/aggregation
.jsp
浏览文件 @
7756ada0
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<div>
<div>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span2"
>
<div
class=
"span2"
>
<%@include
file=
"./configTree.jsp"
%>
<%@include
file=
".
.
/configTree.jsp"
%>
</div>
</div>
<div
class=
"span10"
>
<div
class=
"span10"
>
<div>
<div>
...
...
cat-home/src/main/webapp/jsp/system/aggregationUpdate.jsp
→
cat-home/src/main/webapp/jsp/system/aggregation
/aggregation
Update.jsp
浏览文件 @
7756ada0
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<div>
<div>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span2"
>
<div
class=
"span2"
>
<%@include
file=
"./configTree.jsp"
%>
<%@include
file=
".
.
/configTree.jsp"
%>
</div>
</div>
<div
class=
"span10"
>
<div
class=
"span10"
>
</br>
</br>
...
...
cat-home/src/main/webapp/jsp/system/alarm.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmExceptionRules.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
ExceptionRules.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmOpState.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
OpState.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmRecordDetail.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
RecordDetail.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmRecordList.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
RecordList.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmRuleAdd.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
RuleAdd.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmRuleUpdate.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
RuleUpdate.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmServiceRules.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
ServiceRules.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmTemplateAdd.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
TemplateAdd.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmTemplateList.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
TemplateList.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/alarmTemplateUpdate.jsp
→
cat-home/src/main/webapp/jsp/system/alarm
/alarm
TemplateUpdate.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/scheduledReportAdd.jsp
→
cat-home/src/main/webapp/jsp/system/
alarm/
scheduledReportAdd.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/scheduledReportUpdate.jsp
→
cat-home/src/main/webapp/jsp/system/
alarm/
scheduledReportUpdate.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/scheduledReports.jsp
→
cat-home/src/main/webapp/jsp/system/
alarm/
scheduledReports.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/config.jsp
已删除
100644 → 0
浏览文件 @
d3302662
<%@ page
contentType=
"text/html; charset=utf-8"
%>
<jsp:useBean
id=
"ctx"
type=
"com.dianping.cat.system.page.config.Context"
scope=
"request"
/>
<jsp:useBean
id=
"payload"
type=
"com.dianping.cat.system.page.config.Payload"
scope=
"request"
/>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.system.page.config.Model"
scope=
"request"
/>
View of config page under system
\ No newline at end of file
cat-home/src/main/webapp/jsp/system/project.jsp
→
cat-home/src/main/webapp/jsp/system/project
/project
.jsp
浏览文件 @
7756ada0
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<div>
<div>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span2"
>
<div
class=
"span2"
>
<%@include
file=
"./configTree.jsp"
%>
<%@include
file=
".
.
/configTree.jsp"
%>
</div>
</div>
<div
class=
"span10"
>
<div
class=
"span10"
>
</br>
</br>
...
...
cat-home/src/main/webapp/jsp/system/projectUpdate.jsp
→
cat-home/src/main/webapp/jsp/system/project
/project
Update.jsp
浏览文件 @
7756ada0
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<div>
<div>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span2"
>
<div
class=
"span2"
>
<%@include
file=
"./configTree.jsp"
%>
<%@include
file=
".
.
/configTree.jsp"
%>
</div>
</div>
<div
class=
"span10"
>
<div
class=
"span10"
>
</br>
</br>
...
...
cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigAdd.jsp
→
cat-home/src/main/webapp/jsp/system/topology
/topology
GraphEdgeConfigAdd.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigs.jsp
→
cat-home/src/main/webapp/jsp/system/topology
/topology
GraphEdgeConfigs.jsp
浏览文件 @
7756ada0
...
@@ -66,13 +66,13 @@
...
@@ -66,13 +66,13 @@
</script>
</script>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span2"
>
<div
class=
"span2"
>
<%@include
file=
"./configTree.jsp"
%>
<%@include
file=
".
.
/configTree.jsp"
%>
</div>
</div>
<div
class=
"span10"
>
<div
class=
"span10"
>
<!-- Modal -->
<!-- Modal -->
<div
id=
"myModal"
class=
"modal hide fade"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
<div
id=
"myModal"
class=
"modal hide fade"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
</div>
</div>
<h
5
id=
"state"
class=
"text-center text-error"
>
</h5
>
<h
4
id=
"state"
class=
"text-center text-error"
>
</h4
>
<c:if
test=
"
${
w:
size
(
model
.
edgeConfigs
)
==
0
}
"
>
<c:if
test=
"
${
w:
size
(
model
.
edgeConfigs
)
==
0
}
"
>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span10"
><h5
class=
"text-center text-error"
>
拓扑图依赖关系配置信息
</h5></div>
<div
class=
"span10"
><h5
class=
"text-center text-error"
>
拓扑图依赖关系配置信息
</h5></div>
...
...
cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigAdd.jsp
→
cat-home/src/main/webapp/jsp/system/topology
/topology
GraphNodeConfigAdd.jsp
浏览文件 @
7756ada0
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
<jsp:useBean
id=
"ctx"
type=
"com.dianping.cat.system.page.config.Context"
scope=
"request"
/>
<jsp:useBean
id=
"ctx"
type=
"com.dianping.cat.system.page.config.Context"
scope=
"request"
/>
<jsp:useBean
id=
"payload"
type=
"com.dianping.cat.system.page.config.Payload"
scope=
"request"
/>
<jsp:useBean
id=
"payload"
type=
"com.dianping.cat.system.page.config.Payload"
scope=
"request"
/>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.system.page.config.Model"
scope=
"request"
/>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.system.page.config.Model"
scope=
"request"
/>
<form
name=
"topologyGraphNodeConfigAddSumbit"
id=
"form"
method=
"post"
action=
"${model.pageUri}?op=topologyGraphNodeConfigAddSumbit"
>
<form
name=
"topologyGraphNodeConfigAddSumbit"
id=
"form"
method=
"post"
action=
"${model.pageUri}?op=topologyGraphNodeConfigAddSumbit"
>
<h4
class=
"text-center text-error"
id=
"state"
>
</h4>
<h4
class=
"text-center text-error"
id=
"state"
>
</h4>
<h4
class=
"text-center text-error"
>
修改拓扑节点配置信息
</h4>
<h4
class=
"text-center text-error"
>
修改拓扑节点配置信息
</h4>
...
@@ -22,7 +24,11 @@
...
@@ -22,7 +24,11 @@
<input
id=
"id"
name=
"domainConfig.id"
value=
"${payload.domain}"
readonly
required
/>
<input
id=
"id"
name=
"domainConfig.id"
value=
"${payload.domain}"
readonly
required
/>
</c:if>
</c:if>
<c:if
test=
"
${
empty
payload
.
domain
}
"
>
<c:if
test=
"
${
empty
payload
.
domain
}
"
>
<input
id=
"id"
name=
"domainConfig.id"
value=
"${model.domainConfig.id}"
required
/>
<select
style=
"width:200px;"
name=
"domainConfig.id"
id=
"id"
>
<c:forEach
var=
"item"
items=
"
${
model
.
projects
}
"
>
<option
value=
"${item.domain}"
>
${item.domain}
</option>
</c:forEach>
</select>
</c:if>
</c:if>
</td>
</td>
</tr>
</tr>
...
...
cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigs.jsp
→
cat-home/src/main/webapp/jsp/system/topology
/topology
GraphNodeConfigs.jsp
浏览文件 @
7756ada0
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery.validate.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery.validate.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'dependencyConfig.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'dependencyConfig.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'alarm_js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'alarm_js'
]
}
"
target=
"head-js"
/>
<res:useCss
value=
"
${
res
.
css
.
local
[
'select2.css'
]
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'select2.min.js'
]
}
"
target=
"head-js"
/>
<script
type=
"text/javascript"
>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
$
(
'
#topylogyNodeConfigList
'
).
addClass
(
'
active
'
);
$
(
'
#topylogyNodeConfigList
'
).
addClass
(
'
active
'
);
...
@@ -48,6 +50,7 @@
...
@@ -48,6 +50,7 @@
$
(
'
#myModal
'
).
html
(
response
);
$
(
'
#myModal
'
).
html
(
response
);
$
(
'
#myModal
'
).
modal
();
$
(
'
#myModal
'
).
modal
();
nodeValidate
();
nodeValidate
();
$
(
"
#id
"
).
select2
();
}
}
});
});
});
});
...
@@ -68,7 +71,7 @@
...
@@ -68,7 +71,7 @@
</script>
</script>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid"
>
<div
class=
"span2"
>
<div
class=
"span2"
>
<%@include
file=
"./configTree.jsp"
%>
<%@include
file=
".
.
/configTree.jsp"
%>
</div>
</div>
<div
class=
"span10"
>
<div
class=
"span10"
>
<!-- Modal -->
<!-- Modal -->
...
@@ -107,7 +110,7 @@
...
@@ -107,7 +110,7 @@
</c:if>
</c:if>
<td
style=
"text-align:center;vertical-align:middle;"
><a
href=
"?op=topologyGraphNodeConfigAdd&type=${item.key}&domain=ALL"
class=
"btn update btn-primary btn-small"
>
修改
</a></td>
<td
style=
"text-align:center;vertical-align:middle;"
><a
href=
"?op=topologyGraphNodeConfigAdd&type=${item.key}&domain=ALL"
class=
"btn update btn-primary btn-small"
>
修改
</a></td>
</tr>
</tr>
<c:forEach
var=
"domainConfig"
items=
"
${
value
.
domains
}
"
>
<c:forEach
var=
"domainConfig"
items=
"
${
value
.
domain
Config
s
}
"
>
<c:set
var=
"temp"
value=
"
${
domainConfig
.
value
}
"
/>
<c:set
var=
"temp"
value=
"
${
domainConfig
.
value
}
"
/>
<tr><td>
${temp.id}
</td>
<tr><td>
${temp.id}
</td>
<td
style=
"text-align:right"
>
${temp.warningThreshold}
</td>
<td
style=
"text-align:right"
>
${temp.warningThreshold}
</td>
...
...
cat-home/src/main/webapp/jsp/system/topologyGraphOpState.jsp
→
cat-home/src/main/webapp/jsp/system/topology
/topology
GraphOpState.jsp
浏览文件 @
7756ada0
文件已移动
cat-home/src/test/resources/com/dianping/cat/report/page/dependency/topology-graph-config.xml
浏览文件 @
7756ada0
...
@@ -8,5 +8,10 @@
...
@@ -8,5 +8,10 @@
<edge-config
key=
"PigeonCall:UserWeb:UserService"
type=
"PigeonCall"
from=
"UserWeb"
to=
"UserService"
warning-threshold=
'1'
error-threshold=
'2'
warning-response-time=
'50.0'
error-response-time=
'50.0'
></edge-config>
<edge-config
key=
"PigeonCall:UserWeb:UserService"
type=
"PigeonCall"
from=
"UserWeb"
to=
"UserService"
warning-threshold=
'1'
error-threshold=
'2'
warning-response-time=
'50.0'
error-response-time=
'50.0'
></edge-config>
<edge-config
key=
"PigeonCall:UserWeb:UserService"
type=
"PigeonCall"
from=
"UserWeb"
to=
"UserService"
warning-threshold=
'1'
error-threshold=
'2'
warning-response-time=
'50.0'
error-response-time=
'50.0'
></edge-config>
<edge-config
key=
"PigeonCall:UserWeb:UserService"
type=
"PigeonCall"
from=
"UserWeb"
to=
"UserService"
warning-threshold=
'1'
error-threshold=
'2'
warning-response-time=
'50.0'
error-response-time=
'50.0'
></edge-config>
<edge-config
key=
"sql:UserWeb:Dianping"
type=
"sql"
from=
"UserWeb"
to=
"Dianping"
warning-threshold=
'1'
error-threshold=
'2'
warning-response-time=
'50.0'
error-response-time=
'50.0'
></edge-config>
<edge-config
key=
"sql:UserWeb:Dianping"
type=
"sql"
from=
"UserWeb"
to=
"Dianping"
warning-threshold=
'1'
error-threshold=
'2'
warning-response-time=
'50.0'
error-response-time=
'50.0'
></edge-config>
<product-line
id=
"TuanGou"
title=
"TuanGou"
order=
"1"
important=
"true"
>
<domain
id=
"MobileApi"
></domain>
<domain
id=
"MobileApi"
></domain>
</product-line>
<product-line></product-line>
</topology-graph-config>
</topology-graph-config>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录