diff --git a/src/components/CustomPages/BI/BI001HomeDetail.js b/src/components/CustomPages/BI/BI001HomeDetail.js index 02419f5..86aca34 100644 --- a/src/components/CustomPages/BI/BI001HomeDetail.js +++ b/src/components/CustomPages/BI/BI001HomeDetail.js @@ -230,7 +230,7 @@ class BI001HomeDetail extends React.Component { let month = []; let company = []; let department = []; - data.Data.rateData.forEach((item) => { + data.Data.rateData.filter(m=>m.teamName !=null).forEach((item) => { month.push(item.MONTHStr); company.push(item.FINISH_RATE); department.push(item.NORMAL_FINISH_RATE); diff --git a/src/components/CustomPages/BI/BI002HomeDetail.js b/src/components/CustomPages/BI/BI002HomeDetail.js index 230e4df..0eff654 100644 --- a/src/components/CustomPages/BI/BI002HomeDetail.js +++ b/src/components/CustomPages/BI/BI002HomeDetail.js @@ -35,7 +35,7 @@ class BI002HomeDetail extends React.Component { // render: (text, record, index) => `${index + 1}` // }, { - title: "车间", + title: "部门", dataIndex: "shopName", render: (value, record, index) => { const obj = { @@ -145,7 +145,7 @@ class BI002HomeDetail extends React.Component { }, }, { - title: "班组", + title: "车间/班组", dataIndex: "teamName", onCell:()=>this.renderSpeedColumn() },