Merge remote-tracking branch 'origin/moly' into liuna

src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp

@@ -563,6 +563,7 @@
                 var strcheckBox = "";
                 for (var i = 0; i < jsonDa.length; i++) {
                     var strInput = "<input type='checkbox' onClick='BusinessCheckClick()' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' class='provinceDetail' title='" + jsonDa[i].businessName + "' value='" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName;
+                    if((i !=0)&&((i+1)%6 ===0)){strInput=strInput+'<br>'}
                     strcheckBox += strInput;
                 }
                 $("#businessActivedListTd").append(strcheckBox);
@@ -614,6 +615,7 @@
                 var strcheckBox = "";
                 for (var i = 0; i < jsonDa.length; i++) {
                     var strInput = "<input type='checkbox' onClick='BusinessCheckClick()' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' class='provinceDetail' title='" + jsonDa[i].businessName + "' value='" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName;
+                    if((i !=0)&&((i+1)%6 ===0)){strInput=strInput+'<br>'}
                     strcheckBox += strInput;
                 }
                 $("#businessActivedListTd").append(strcheckBox);
@@ -658,11 +660,14 @@
             success: function (data) {
 
                 var jsonDa = eval('(' + data + ')');
+                var colLength=0;
                 for (var i = 0; i < jsonDa.length; i++) {
 
                     if ($.inArray(jsonDa[i].kpiId, dimKpiSelected) < 0) {
                         var strInput = "<input type='checkbox' id=dimKpiCheck_" + jsonDa[i].kpiId + " name='dimKpiCheck' class='provinceDetail'   title='"+jsonDa[i].code + "' value='" + jsonDa[i].kpiId + "'/><font>" + jsonDa[i].name + "</font>";
+                        if((colLength !=0)&&((colLength+1)%5 ===0)){strInput=strInput+'<br>'}
                         $("#dimKpiListTd").append(strInput);
+                        colLength=colLength+1;
                     }
 
                 }

src/main/webapp/WEB-INF/views/MonitorOperation/UpdateAnaInfo.jsp

@@ -549,6 +549,7 @@
             success: function (data) {
 
                 var jsonDa = eval('(' + data + ')');
+                var colLength=0;
                 for (var i = 0; i < jsonDa.length; i++) {
 
 
@@ -559,7 +560,9 @@
                         continue;
                     }
                     var strInput = "<input type='checkbox' id=dimKpiCheck_" + jsonDa[i].kpiId + " name='dimKpiCheck' class='provinceDetail' title='"+jsonDa[i].code+ "' value=" + jsonDa[i].kpiId + "'/><font>" + jsonDa[i].name + "</font>";
+                    if((colLength !=0)&&((colLength+1)%5 ===0)){strInput=strInput+'<br>'}
                     $("#dimKpiListTd").append(strInput);
+                    colLength=colLength+1;
                 }
             }
         });
@@ -646,6 +649,7 @@
                 var strcheckBox = "";
                 for (var i = 0; i < jsonDa.length; i++) {
                     var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + "' value=" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName;
+                    if((i !=0)&&((i+1)%6 ===0)){strInput=strInput+'<br>'}
                     strcheckBox += strInput;
                 }
                 $("#businessActivedListTd").append(strcheckBox);
@@ -698,6 +702,7 @@
                 var strcheckBox = "";
                 for (var i = 0; i < jsonDa.length; i++) {
                     var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + "' value=" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName;
+                    if((i !=0)&&((i+1)%6 ===0)){strInput=strInput+'<br>'}
                     strcheckBox += strInput;
                 }
                 $("#businessActivedListTd").append(strcheckBox);