Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope

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>

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
 				}

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选择条件