From afd1712fda9a6f3403c9fff11e908a2affc970cc Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 22 Nov 2016 10:39:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?volume=E7=9A=84brick=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E7=94=A8=EF=BC=8C=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?sqlserver=20->=20sql=20Server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/configs/html/glusterfsSetting.html | 2 +-
 plugins/system/ts/systemList.ts            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/configs/html/glusterfsSetting.html b/plugins/configs/html/glusterfsSetting.html
index c85b053..04e79ca 100644
--- a/plugins/configs/html/glusterfsSetting.html
+++ b/plugins/configs/html/glusterfsSetting.html
@@ -59,7 +59,7 @@
                             <span class="sj_table_td02">存储路径:{{row.path}}</span>
                         </td>
                         <td>
-                            <span class="">已用&nbsp;{{row.formatUsedSize}}&nbsp;&nbsp;/&nbsp;&nbsp;共&nbsp;{{row.formatAllSize}}</span>
+                            <span class="">已用&nbsp;{{row.formatUsedSize}}&nbsp;&nbsp;/&nbsp;&nbsp;可用&nbsp;{{row.formatAllSize}}</span>
                         </td>
                         <td></td>
                     </tr>
diff --git a/plugins/system/ts/systemList.ts b/plugins/system/ts/systemList.ts
index f97a383..00e255a 100644
--- a/plugins/system/ts/systemList.ts
+++ b/plugins/system/ts/systemList.ts
@@ -220,9 +220,9 @@ module System{
 		function booleanChoose(){
 			return [{id: '是', title: '是'}, {id: '否', title: '否'}];
 		}
-		// 数据库类型选择条件：oracle/sqlServer
+		// 数据库类型选择条件：oracle/sql Server
 		function databaseType(){
-			return [{id: 'oracle', title: 'ORACLE'}, {id: 'sqlServer', title: 'SQLSERVER'}];
+			return [{id: 'oracle', title: 'ORACLE'}, {id: 'sql Server', title: 'SQL SERVER'}];
 		}
 
 		//level选择条件

From ba9b1616c7673aeb4f983f672103548c430916dc Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 22 Nov 2016 14:27:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E4=B8=AD=E6=89=B9=E6=AC=A1=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E6=9C=89?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/developer/ts/dataManagerModel.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/developer/ts/dataManagerModel.ts b/plugins/developer/ts/dataManagerModel.ts
index b3a3b43..b133882 100644
--- a/plugins/developer/ts/dataManagerModel.ts
+++ b/plugins/developer/ts/dataManagerModel.ts
@@ -118,6 +118,12 @@ module Developer{
 	function formatTask(items:Array<any>){
 		var result = [];
 		angular.forEach(items, (item) => {
+			var tmp_batch="";
+			if(item.submittedBatch.indexOf("批次")==-1){
+				tmp_batch="批次"+item.submittedBatch;
+			}else{
+				tmp_batch=item.submittedBatch;
+			}
 			result.push({
 				id: item.id,
 				_key: item.regionalismCode + "-" + item.systemCode + "-" + item.dataVersion,
@@ -129,7 +135,7 @@ module Developer{
 				to: item.dstPath,
 				labels:{
 					dataType: item.dataType,
-					batch: "批次"+item.submittedBatch,					
+					batch: tmp_batch,					
 					dataVersion: "版本"+item.dataVersion,
 					dataYear: item.year
 				}