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

@@ -24,7 +24,7 @@
                             <span class="input-group-addon">服务类型：</span>
                             <select id="searchApiType" name="searchApiType" class="form-control" placeholder="">
                                 <option value="0">ALL</option>
-                                </select>
+                            </select>
                         </div>
                         <div class="input-group" style="float: left;">
                             <span class="input-group-addon">请求类型：</span>
@@ -128,11 +128,11 @@
     };
 
 
-    var createJavaAppDiv = function (apps, serviceId,toggle) {
+    var createJavaAppDiv = function (apps, serviceId, toggle) {
         var rel = $("<div>");
         $.each(apps, function (idx, val) {
             var span;
-            if(toggle==1)
+            if (toggle == 1)
                 span = $("<span class='btn btn-success btn-xs tag_javaapp' >").attr("id", "span_" + serviceId + "_" + val.moId).html(val.moHostIp);
             else
                 span = $("<span class='btn btn-inverse btn-xs tag_javaapp' >").attr("id", "span_no_" + serviceId + "_" + val.moId).html(val.moHostIp);
@@ -145,6 +145,7 @@
 
     var setStatus = function (statusObj) {
         var id = "span_" + statusObj.serviceId + "_" + statusObj.mObjectId;
+//        console.log(statusObj);
         if (statusObj.status == 0) {
             if ($("#" + id).hasClass('btn-success')) {
                 $("#" + id).removeClass('btn-success');
@@ -166,7 +167,7 @@
             return;
         var reqList = [];
         $.each(table_data.rows, function (idx, val) {
-            if(val.apiToggle==0) //关闭了
+            if (val.apiToggle == 0) //关闭了
                 return;
             var apps = java_app["" + val.serviceType];
             var serviceId = val.serviceId;
@@ -206,7 +207,7 @@
         $.each(table_data.rows, function (idx, val) {
             var apps = java_app["" + val.serviceType];
 
-            var appDiv = createJavaAppDiv(apps, val.serviceId,val.apiToggle);
+            var appDiv = createJavaAppDiv(apps, val.serviceId, val.apiToggle);
             $("#status_" + val.serviceId).html("");
             $("#status_" + val.serviceId).append(appDiv);
 

@@ -411,7 +411,7 @@
             });
             return;
         }
-        if (!validIp($("#updateModal #updatemoHostIp").val())) {
+        if (!validIp($("#updateModal #updatemoHostIp option:selected").val().replace(/\'/g, '\"'))) {
             $("#updateModal #messageAlert").alerts({
                 content: "Ip 填写错误！",
                 type: "danger"
@@ -479,7 +479,7 @@
                     });
                     return;
                 }
-                if (!validIp($("#addModal #addmoHostIp").val())) {
+                if (!validIp($("#addModal #addmoHostIp option:selected").val().replace(/\'/g, '\"'))) {
                     $("#addModal #messageAlert").alerts({
                         content: "Ip 填写错误！",
                         type: "danger"