diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx index 529251faa..802c456d1 100644 --- a/src/military/achievement/achivChart/index.jsx +++ b/src/military/achievement/achivChart/index.jsx @@ -21,9 +21,9 @@ function AchivChart() { // 基于准备好的dom,初始化echarts实例 const myChart = echarts.init(document.getElementById('chartBox')); // 计算总成果数量 - const keysToExclude = ['viewCount', 'acCount']; - const total = Object.keys(achivData).filter(key => !keysToExclude.includes(key)).reduce((acc, key) => acc + achivData[key], 0); - console.log('@@@总成果数量:',total); + // const keysToExclude = ['viewCount', 'acCount']; + // const total = Object.keys(achivData).filter(key => !keysToExclude.includes(key)).reduce((acc, key) => acc + achivData[key], 0); + // console.log('@@@总成果数量:',total); // 指定图表的配置项和数据 const option = { @@ -70,20 +70,18 @@ function AchivChart() { borderRadius: 0 }, data: [ - { value: achivData.osProjectCount, name: '开源项目 ' + (achivData.osProjectCount / total * 100).toFixed(0) + '%' }, - { value: achivData.ckTaskCount, name: '创客任务 ' + (achivData.ckTaskCount / total * 100).toFixed(0) + '%' }, - { value: achivData.osContestCount, name: '开放竞赛 ' + (achivData.osContestCount / total * 100).toFixed(0) + '%' }, - { value: achivData.scienceAchievementCount, name: '科研成果 ' + (achivData.scienceAchievementCount / total * 100).toFixed(0) + '%' }, - { value: achivData.ckTaskCount, name: '装备成果 ' + (achivData.ckTaskCount / total * 100).toFixed(0) + '%' }, - { value: achivData.anotherCount, name: '其他成果 ' + (achivData.anotherCount / total * 100).toFixed(0) + '%' } + { value: achivData.osProjectCount, name: '开源项目 ' + achivData.osProjectCount + '%' }, + { value: achivData.ckTaskCount, name: '创客任务 ' + achivData.ckTaskCount + '%' }, + { value: achivData.osContestCount, name: '开放竞赛 ' + achivData.osContestCount + '%' }, + { value: achivData.scienceAchievementCount, name: '科研成果 ' + achivData.scienceAchievementCount + '%' }, + { value: achivData.equipAchievement, name: '装备成果 ' + achivData.equipAchievement + '%' }, + { value: achivData.anotherCount, name: '其他成果 ' + achivData.anotherCount + '%' } ], label: { show: true, position: 'inside', color: 'white', - formatter: function (params) { - return Math.round(params.percent) + '%'; - }, + formatter: '{c}%', // 显示数据名称和百分比 textStyle: { fontSize: 20 }