diff --git a/plugins/configs/html/glusterfsSetting.html b/plugins/configs/html/glusterfsSetting.html index c85b0531..04e79cab 100644 --- a/plugins/configs/html/glusterfsSetting.html +++ b/plugins/configs/html/glusterfsSetting.html @@ -59,7 +59,7 @@ 存储路径:{{row.path}} - 已用 {{row.formatUsedSize}}  /  共 {{row.formatAllSize}} + 已用 {{row.formatUsedSize}}  /  可用 {{row.formatAllSize}} diff --git a/plugins/developer/ts/dataManagerModel.ts b/plugins/developer/ts/dataManagerModel.ts index b3a3b43a..b133882a 100644 --- a/plugins/developer/ts/dataManagerModel.ts +++ b/plugins/developer/ts/dataManagerModel.ts @@ -118,6 +118,12 @@ module Developer{ function formatTask(items:Array){ 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 } diff --git a/plugins/system/ts/systemList.ts b/plugins/system/ts/systemList.ts index 80f1cf86..e7d29c32 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选择条件