|
@@ -29,12 +29,21 @@ function Chart({ options }) {
|
|
|
options.series = [];
|
|
options.series = [];
|
|
|
|
|
|
|
|
options.xData.map((data,index) =>{
|
|
options.xData.map((data,index) =>{
|
|
|
- options.pieData.push({'name':data,'value':options.data[options.legend[0]][index].split("%").join("")})
|
|
|
|
|
|
|
+ if(options.data[options.legend[0]][index] &&options.data[options.legend[0]][index].indexOf("%") !== -1){
|
|
|
|
|
+ options.pieData.push({'name':data,'value':options.data[options.legend[0]][index].split("%").join("")})
|
|
|
|
|
+ }else{
|
|
|
|
|
+ options.pieData.push({'name':data,'value':options.data[options.legend[0]][index]})
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
options.legend.map((data,index) =>{
|
|
options.legend.map((data,index) =>{
|
|
|
let list = [];
|
|
let list = [];
|
|
|
options.data[data].map(data1 =>{
|
|
options.data[data].map(data1 =>{
|
|
|
- list.push(data1.split("%").join(""))
|
|
|
|
|
|
|
+ console.log(data1.indexOf('%'))
|
|
|
|
|
+ if(data1.indexOf('%') !== -1){
|
|
|
|
|
+ list.push(data1.split("%").join(""))
|
|
|
|
|
+ }else{
|
|
|
|
|
+ list.push(data1)
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
options.series.push({
|
|
options.series.push({
|
|
|
name: data,
|
|
name: data,
|