This commit is contained in:
parent
b2d76333ce
commit
8a4a0099fb
|
|
@ -377,7 +377,7 @@ export default {
|
||||||
};
|
};
|
||||||
this.row2Style={
|
this.row2Style={
|
||||||
height:'60%',
|
height:'60%',
|
||||||
width:['70%','30%', '0%'],
|
width:['80%','20%', '0%'],
|
||||||
}
|
}
|
||||||
}else if(Aid == 'A3'){
|
}else if(Aid == 'A3'){
|
||||||
this.row1Style={
|
this.row1Style={
|
||||||
|
|
@ -416,6 +416,9 @@ export default {
|
||||||
|
|
||||||
if(data.reportSettings.length>0){
|
if(data.reportSettings.length>0){
|
||||||
data.reportSettings.forEach(item=>{
|
data.reportSettings.forEach(item=>{
|
||||||
|
if(item.columns.length>0){
|
||||||
|
item.columns.sort((a,b) => a.sort - b.sort)
|
||||||
|
}
|
||||||
if(item.setting.rowNumber==1 && item.setting.columnNumber==1){
|
if(item.setting.rowNumber==1 && item.setting.columnNumber==1){
|
||||||
this.row1col1report.push(item)
|
this.row1col1report.push(item)
|
||||||
}
|
}
|
||||||
|
|
@ -434,9 +437,7 @@ export default {
|
||||||
if(item.setting.rowNumber==2 && item.setting.columnNumber==3){
|
if(item.setting.rowNumber==2 && item.setting.columnNumber==3){
|
||||||
this.row2col3report.push(item)
|
this.row2col3report.push(item)
|
||||||
}
|
}
|
||||||
// if(item.setting.reportType != 'rank'){
|
|
||||||
// this.totalData.push(item)
|
|
||||||
// }
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue