Authored by jack

Merge branch 'dev_linlong'

@@ -116,14 +116,14 @@ @@ -116,14 +116,14 @@
116 columns: [ 116 columns: [
117 { 117 {
118 title: "业务分类", 118 title: "业务分类",
119 - width:"120px", 119 + width:"110px",
120 formatter: function (value, rowData, rowIndex) { 120 formatter: function (value, rowData, rowIndex) {
121 return "<div style='padding:15px;'>"+rowData.name+"</div>"; 121 return "<div style='padding:15px;'>"+rowData.name+"</div>";
122 } 122 }
123 }, 123 },
124 { 124 {
125 title: "地址", 125 title: "地址",
126 - width: "165px", 126 + width: "190px",
127 // field: "url" 127 // field: "url"
128 formatter: function (value, rowData, rowIndex) { 128 formatter: function (value, rowData, rowIndex) {
129 var array = rowData.url.split("\r\n"); 129 var array = rowData.url.split("\r\n");
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 } 134 }
135 }, { 135 }, {
136 title: "当前连接数", 136 title: "当前连接数",
137 - width:"100px", 137 + width:"80px",
138 // field: "curConnections" 138 // field: "curConnections"
139 formatter: function (value, rowData, rowIndex) { 139 formatter: function (value, rowData, rowIndex) {
140 var array = rowData.curConnections.split("\r\n"); 140 var array = rowData.curConnections.split("\r\n");
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
145 } 145 }
146 }, { 146 }, {
147 title: "启动时长", 147 title: "启动时长",
148 - width:"120px", 148 + width:"110px",
149 // field: "upTime" 149 // field: "upTime"
150 formatter: function (value, rowData, rowIndex) { 150 formatter: function (value, rowData, rowIndex) {
151 var array = rowData.upTime.split("\r\n"); 151 var array = rowData.upTime.split("\r\n");
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 } 156 }
157 }, { 157 }, {
158 title: "get频率(次/秒)", 158 title: "get频率(次/秒)",
159 - width:"80px", 159 + width:"100px",
160 // field: 'cmdGet' 160 // field: 'cmdGet'
161 formatter: function (value, rowData, rowIndex) { 161 formatter: function (value, rowData, rowIndex) {
162 var array = rowData.cmdGet.split("\r\n"); 162 var array = rowData.cmdGet.split("\r\n");
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
167 } 167 }
168 }, { 168 }, {
169 title: "set频率(次/秒)", 169 title: "set频率(次/秒)",
170 - width:"80px", 170 + width:"100px",
171 // field: "cmdSet" 171 // field: "cmdSet"
172 formatter: function (value, rowData, rowIndex) { 172 formatter: function (value, rowData, rowIndex) {
173 var array = rowData.cmdSet.split("\r\n"); 173 var array = rowData.cmdSet.split("\r\n");