Index: ssts-web/src/main/webapp/systemmanage/system/systemInfo.js =================================================================== diff -u -r29367 -r29420 --- ssts-web/src/main/webapp/systemmanage/system/systemInfo.js (.../systemInfo.js) (revision 29367) +++ ssts-web/src/main/webapp/systemmanage/system/systemInfo.js (.../systemInfo.js) (revision 29420) @@ -30,9 +30,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "软件版本", - id : "version", - name : "version", + fieldLabel : "版本号", + id : "globalVersion", + name : "globalVersion", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -44,9 +44,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "最大内存", - id : "maxMemory", - name : "maxMemory", + fieldLabel : "svn版本号", + id : "svnRevision", + name : "svnRevision", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -58,9 +58,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "已分配", - id : "allocatedMemory", - name : "allocatedMemory", + fieldLabel : "构建时间", + id : "buildDateTime", + name : "buildDateTime", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -72,9 +72,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "可用", - id : "freeMemory", - name : "freeMemory", + fieldLabel : "内部版本", + id : "version", + name : "version", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -86,9 +86,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "总可用", - id : "totalFreeMemory", - name : "totalFreeMemory", + fieldLabel : "最大内存", + id : "maxMemory", + name : "maxMemory", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -100,9 +100,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "驱动", - id : "dbConnection.driverClass", - name : "dbConnection.driverClass", + fieldLabel : "已分配", + id : "allocatedMemory", + name : "allocatedMemory", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -114,9 +114,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "连接", - id : "dbConnection.jdbcUrl", - name : "dbConnection.jdbcUrl", + fieldLabel : "可用", + id : "freeMemory", + name : "freeMemory", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -128,9 +128,9 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "用户", - id : "dbConnection.user", - name : "dbConnection.user", + fieldLabel : "总可用", + id : "totalFreeMemory", + name : "totalFreeMemory", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' @@ -156,37 +156,37 @@ labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "版本号", - id : "globalVersion", - name : "globalVersion", + fieldLabel : "用户", + id : "dbConnection.user", + name : "dbConnection.user", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : .5, layout : 'form', labelWidth : 80, labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "svn版本号", - id : "svnRevision", - name : "svnRevision", + fieldLabel : "连接URL", + id : "dbConnection.jdbcUrl", + name : "dbConnection.jdbcUrl", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : .5, layout : 'form', labelWidth : 80, labelAlign:"right", items:[{ xtype : 'textfield', - fieldLabel : "构建时间", - id : "buildDateTime", - name : "buildDateTime", + fieldLabel : "驱动", + id : "dbConnection.driverClass", + name : "dbConnection.driverClass", readOnly : true, cls:'fieldReadOnlyNoRemove', anchor : '100%'