p01469285
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
wu ming 2016-11-25 10:23:58 +08:00
parent c8ae9e8c59 ba9b1616c7
commit 58469239ca
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/configs/html/glusterfsSetting.html
View File

@ -59,7 +59,7 @@
<span class="sj_table_td02">存储路径:{{row.path}}</span> <span class="sj_table_td02">存储路径:{{row.path}}</span>
</td> </td>
<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></td> <td></td>
</tr> </tr>

8
plugins/developer/ts/dataManagerModel.ts
View File

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

4
plugins/system/ts/systemList.ts
View File

@ -220,9 +220,9 @@ module System{
function booleanChoose(){ function booleanChoose(){
return [{id: '是', title: '是'}, {id: '否', title: '否'}]; return [{id: '是', title: '是'}, {id: '否', title: '否'}];
} }
// 数据库类型选择条件：oracle/sqlServer // 数据库类型选择条件：oracle/sql Server
function databaseType(){ function databaseType(){
return [{id: 'oracle', title: 'ORACLE'}, {id: 'sqlServer', title: 'SQLSERVER'}]; return [{id: 'oracle', title: 'ORACLE'}, {id: 'sql Server', title: 'SQL SERVER'}];
} }
//level选择条件 //level选择条件