Merge branch 'dev_linlong'

@@ -108,40 +108,103 @@
                 {
                 {
                     title: "业务分类",
                     title: "业务分类",
                     width:"200px",
                     width:"200px",
-//                    field: "name"
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
-                        return rowData.name.substring(0,17);
+                        return  "<div style='padding:15px;'>"+rowData.name+"</div>";
                     }
                     }
                 },
                 },
                 {
                 {
                     title: "地址",
                     title: "地址",
                     width: "200px",
                     width: "200px",
-                    field: "url"
+                   // field: "url"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.url.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "当前连接数",
                     title: "当前连接数",
-                    field: "curConnections"
+                //    field: "curConnections"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.curConnections.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "启动时长",
                     title: "启动时长",
-                    field: "upTime"
+                    width:"120px",
+                   // field: "upTime"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.upTime.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "get频率(次/秒)",
                     title: "get频率(次/秒)",
-                    field: 'cmdGet'
+                //    field: 'cmdGet'
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.cmdGet.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "set频率(次/秒)",
                     title: "set频率(次/秒)",
-                    field: "cmdSet"
+                //    field: "cmdSet"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.cmdSet.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "get命中率",
                     title: "get命中率",
                     width: "100px",
                     width: "100px",
-                    field: "hitRate"
+                 //   field: "hitRate"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.hitRate.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "使用内存",
                     title: "使用内存",
-                    field: "useMemory"
+                   // field: "useMemory"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.useMemory.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "最大内存",
                     title: "最大内存",
-                    field: "maxMemory"
+                //    field: "maxMemory"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.maxMemory.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }, {
                 }, {
                     title: "当前数量",
                     title: "当前数量",
-                    field: "curItems"
+                 //   field: "curItems"
+                    formatter: function (value, rowData, rowIndex) {
+                        var array = rowData.curItems.split("\r\n");
+                        var div = "";
+                        for(var i=0;i<array.length;i++)
+                            div = div+ "<div style='height:30px;padding:10px;'>"+array[i]+"</div>";
+                        return div;
+                    }
                 }],
                 }],
             /*            data: data*/
             /*            data: data*/
         });
         });