ops / monitor-ui · Commits

Go to a project

Authored by simba
Commit 49d5e8e50d1cb67755396974b98e890d033ad6f9 2 parents 3e5c09ac 75dd13be

Merge branch 'master' of http://git.yoho.cn/ops/monitor-ui

Inline Side-by-side
Showing 4 changed files with 3 additions and 5 deletions
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender"> 24 <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
25 <file>${catalina.home}/logs/warn.log</file> 25 <file>${catalina.home}/logs/warn.log</file>
26 <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> 26 <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
27 - <level>ERROR</level> 27 + <level>WARN</level>
28 </filter> 28 </filter>
29 <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 29 <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
30 <!-- daily rollover --> 30 <!-- daily rollover -->
@@ -37,8 +37,6 @@ @@ -37,8 +37,6 @@
37 <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/> 37 <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/>
38 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/> 38 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/>
39 <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/> 39 <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/>
40 - <link rel="stylesheet" href="<%=basePath %>css/morris.css"/>  
41 -  
42 <script src="<%=basePath %>js/jquery-1.12.0.min.js" charset="UTF-8" type="text/javascript"></script> 40 <script src="<%=basePath %>js/jquery-1.12.0.min.js" charset="UTF-8" type="text/javascript"></script>
43 <script src="<%=basePath %>/js/bootstrap.min.js"></script> 41 <script src="<%=basePath %>/js/bootstrap.min.js"></script>
44 <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/moment-with-locales.js" charset="UTF-8" 42 <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/moment-with-locales.js" charset="UTF-8"
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 btn.removeClass("btn-success"); 126 btn.removeClass("btn-success");
127 btn.addClass("btn-danger"); 127 btn.addClass("btn-danger");
128 } else { 128 } else {
129 - $(btn.children("span")[0]).html(); 129 + $(btn.children("span")[0]).html("");
130 btn.removeClass("btn-danger"); 130 btn.removeClass("btn-danger");
131 btn.addClass("btn-success"); 131 btn.addClass("btn-success");
132 } 132 }
@@ -479,7 +479,7 @@ @@ -479,7 +479,7 @@
479 $("#javaInfoForm #apiUrl").val(""); 479 $("#javaInfoForm #apiUrl").val("");
480 $("#javaInfoForm #apiData").val(""); 480 $("#javaInfoForm #apiData").val("");
481 $("#javaInfoForm #apiToggle").prop("checked", true) 481 $("#javaInfoForm #apiToggle").prop("checked", true)
482 - $("#javaInfoForm #apiWarnTrigger").val(0); 482 + $("#javaInfoForm #apiWarnTrigger").val(3);
483 $("#javaInfoForm #apiReqMethod").val(0); 483 $("#javaInfoForm #apiReqMethod").val(0);
484 $("#javaInfoForm #serviceType").val(1); 484 $("#javaInfoForm #serviceType").val(1);
485 } else { 485 } else {