|
@@ -765,11 +765,11 @@ export default {
|
|
|
if(viewType === 'chart') {
|
|
if(viewType === 'chart') {
|
|
|
if(chartType === 'bar' || chartType === 'line') {
|
|
if(chartType === 'bar' || chartType === 'line') {
|
|
|
columns = [{
|
|
columns = [{
|
|
|
- name: oxAxis.column.label,
|
|
|
|
|
|
|
+ name: `${oxAxis.column.label}${oxAxis.granularity.value ? `(${oxAxis.granularity.label})` : ''}`,
|
|
|
width: 150,
|
|
width: 150,
|
|
|
type: 'String'
|
|
type: 'String'
|
|
|
}, {
|
|
}, {
|
|
|
- name: oyAxis.column.label,
|
|
|
|
|
|
|
+ name: `${oyAxis.column.label}${oyAxis.gauge.value ? `(${oyAxis.gauge.label})` : ''}`,
|
|
|
width: 100,
|
|
width: 100,
|
|
|
type: 'Number'
|
|
type: 'Number'
|
|
|
}];
|
|
}];
|
|
@@ -791,11 +791,11 @@ export default {
|
|
|
})
|
|
})
|
|
|
}else if(chartType === 'pie') {
|
|
}else if(chartType === 'pie') {
|
|
|
columns = [{
|
|
columns = [{
|
|
|
- name: oxAxis.column.label,
|
|
|
|
|
|
|
+ name: `${oxAxis.column.label}${oxAxis.granularity.value ? `(${oxAxis.granularity.label})` : ''}`,
|
|
|
width: 150,
|
|
width: 150,
|
|
|
type: 'String'
|
|
type: 'String'
|
|
|
}, {
|
|
}, {
|
|
|
- name: oyAxis.column.label,
|
|
|
|
|
|
|
+ name: `${oyAxis.column.label}${oyAxis.gauge.value ? `(${oyAxis.gauge.label})` : ''}`,
|
|
|
width: 100,
|
|
width: 100,
|
|
|
type: 'Number'
|
|
type: 'Number'
|
|
|
}];
|
|
}];
|
|
@@ -806,7 +806,7 @@ export default {
|
|
|
width: 80,
|
|
width: 80,
|
|
|
type: 'Number'
|
|
type: 'Number'
|
|
|
}, {
|
|
}, {
|
|
|
- name: oyAxis.column.label,
|
|
|
|
|
|
|
+ name: `${oyAxis.column.label}${oyAxis.gauge.value ? `(${oyAxis.gauge.label})` : ''}`,
|
|
|
width: 80,
|
|
width: 80,
|
|
|
type: 'Number'
|
|
type: 'Number'
|
|
|
}];
|
|
}];
|
|
@@ -887,7 +887,7 @@ export default {
|
|
|
width: 100,
|
|
width: 100,
|
|
|
type: 'String'
|
|
type: 'String'
|
|
|
}, {
|
|
}, {
|
|
|
- name: yAxis.column.label,
|
|
|
|
|
|
|
+ name: `${yAxis.column.label}${yAxis.gauge.value ? `(${yAxis.gauge.label})` : ''}`,
|
|
|
width: 100,
|
|
width: 100,
|
|
|
type: 'Number'
|
|
type: 'Number'
|
|
|
}].concat(otherColumn.map(c => ({
|
|
}].concat(otherColumn.map(c => ({
|
|
@@ -914,7 +914,6 @@ export default {
|
|
|
rows
|
|
rows
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- console.log(sheets)
|
|
|
|
|
let e = new Exportor({ sheets }, `${name}.xls`);
|
|
let e = new Exportor({ sheets }, `${name}.xls`);
|
|
|
e.export();
|
|
e.export();
|
|
|
}catch(e) {
|
|
}catch(e) {
|