diff --git a/.DS_Store b/.DS_Store index ada58f6..a790673 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/build/index.html b/build/index.html index 304a40f..1e61506 100644 --- a/build/index.html +++ b/build/index.html @@ -8,7 +8,7 @@ NPCs - + diff --git a/src/components/Chart/index.tsx b/src/components/Chart/index.tsx index 1c8950a..38a74d3 100644 --- a/src/components/Chart/index.tsx +++ b/src/components/Chart/index.tsx @@ -29,12 +29,21 @@ function Chart({ options }) { options.series = []; 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) =>{ let list = []; 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({ name: data,