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

@@ -119,6 +119,10 @@
 
 
 <script type="text/javascript">
 <script type="text/javascript">
     $(function () {
     $(function () {
+        refreshTable();
+    });
+
+    function refreshTable() {
         $("#tRedisTable").table({
         $("#tRedisTable").table({
             url: contextPath + "redisMonitor/allTwemproxy",
             url: contextPath + "redisMonitor/allTwemproxy",
             striped: true,
             striped: true,
@@ -130,15 +134,15 @@
             columns: [
             columns: [
                 {
                 {
                     title: "业务分类",
                     title: "业务分类",
-          //          field: "name"
+                    //          field: "name"
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
                         return "<div style=' padding:10px;'>"+rowData.name+"</div>";
                         return "<div style=' padding:10px;'>"+rowData.name+"</div>";
                     }
                     }
                 },
                 },
-                 {
+                {
                     title: "地址",
                     title: "地址",
-                 //   field: "url"
-                     width:"200px",
+                    //   field: "url"
+                    width:"200px",
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
                         var array = rowData.url.split("\r\n");
                         var array = rowData.url.split("\r\n");
                         var div = "";
                         var div = "";
@@ -149,7 +153,7 @@
                 }, {
                 }, {
                     title: "当前连接数",
                     title: "当前连接数",
                     width: "100px",
                     width: "100px",
-                  //  field: "connections"
+                    //  field: "connections"
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
                         var array = rowData.connections.split("\r\n");
                         var array = rowData.connections.split("\r\n");
                         var div = "";
                         var div = "";
@@ -160,7 +164,7 @@
                 }, {
                 }, {
                     title: "启动时长",
                     title: "启动时长",
                     width: "100px",
                     width: "100px",
-                 //   field: "taskCtime"
+                    //   field: "taskCtime"
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
                         var array = rowData.taskCtime.split("\r\n");
                         var array = rowData.taskCtime.split("\r\n");
                         var div = "";
                         var div = "";
@@ -182,7 +186,7 @@
                 }, {
                 }, {
                     title: "网络归属",
                     title: "网络归属",
                     width: "120px",
                     width: "120px",
-              //      field: "network"
+                    //      field: "network"
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
                         var array = rowData.network.split("\r\n");
                         var array = rowData.network.split("\r\n");
                         var div = "";
                         var div = "";
@@ -193,7 +197,7 @@
                 }, {
                 }, {
                     title: "状态",
                     title: "状态",
                     width: "100px",
                     width: "100px",
-                 //   field: "state"
+                    //   field: "state"
                     formatter: function (value, rowData, rowIndex) {
                     formatter: function (value, rowData, rowIndex) {
                         var array = rowData.state.split("\r\n");
                         var array = rowData.state.split("\r\n");
                         var div = "";
                         var div = "";
@@ -229,9 +233,8 @@
                 }],
                 }],
             /*            data: data*/
             /*            data: data*/
         });
         });
-
-    });
-
+        setTimeout('refreshTable()',60000);
+    }
 
 
     function showRedisInfo(rowData) {
     function showRedisInfo(rowData) {
         var vId = rowData.volumeId;
         var vId = rowData.volumeId;