diff --git a/src/forge/Server/measurement/componet/dataStack.jsx b/src/forge/Server/measurement/componet/dataStack.jsx index 709964e5..e68a70db 100644 --- a/src/forge/Server/measurement/componet/dataStack.jsx +++ b/src/forge/Server/measurement/componet/dataStack.jsx @@ -12,7 +12,6 @@ function DataStack({ data }){ useEffect(()=>{ if(data){ let drop = Object.keys(data); - console.log("---",drop); setUserDrop(drop); setUserValue(drop[0]); } diff --git a/src/forge/Server/measurement/componet/pie.jsx b/src/forge/Server/measurement/componet/pie.jsx index 86ba1aff..fc333e71 100644 --- a/src/forge/Server/measurement/componet/pie.jsx +++ b/src/forge/Server/measurement/componet/pie.jsx @@ -23,8 +23,18 @@ function Pie({values,title}){ color:['#5871FF',"#FFBE38","#00bf9a"], legend: { orient: 'horizontal', - left: 'center', - top:20 + right: 20, + top:20, + formatter: function (name) { + // 查找对应系列的值 + var data = option.series[0].data; + for (var i = 0; i < data.length; i++) { + if (data[i].name == name) { + return data[i].value === 0 ? name + ' (0)' : name; + } + } + return name; + } }, series: [ { diff --git a/src/forge/Server/measurement/componet/stack.jsx b/src/forge/Server/measurement/componet/stack.jsx index 67a65054..fd9edcf0 100644 --- a/src/forge/Server/measurement/componet/stack.jsx +++ b/src/forge/Server/measurement/componet/stack.jsx @@ -1,15 +1,18 @@ import React, { useEffect, useState } from 'react'; import * as echarts from 'echarts'; import { detailByName } from '../config'; +import Pie from './pie'; import { Select } from 'antd'; -function Stack({name,data , type}){ +function Stack({name,data , type , pieData}){ const [ obj , setObj ] = useState({}); const [ list , setList ] = useState(data); const [ userDrop , setUserDrop ] = useState([]); const [ userValue , setUserValue ] = useState([]); + const [pieEchartData,setPieEchartData] = useState([]); + useEffect(()=>{ if(name){ let obj = detailByName[name.replace(/\s/g, '')]; @@ -89,24 +92,48 @@ function Stack({name,data , type}){ }; myEcharts.setOption(option); } + + useEffect(()=>{ + if(pieData){ + let newData = new Array; + for (var i in pieData) { + var json = {}; + if (pieData[i] != "") { + json.name = i; + json.value = pieData[i]; + newData.push(json); + } + } + setPieEchartData(newData) + } + },[pieData]) + return(