diff --git a/src/components/CustomPages/BI/BI001HomeDetail.js b/src/components/CustomPages/BI/BI001HomeDetail.js index ce182f8..a913609 100644 --- a/src/components/CustomPages/BI/BI001HomeDetail.js +++ b/src/components/CustomPages/BI/BI001HomeDetail.js @@ -249,7 +249,7 @@ class BI001HomeDetail extends React.Component { } }, title: { - text: "班组建设任务完成走势图", + text: "班组活动任务完成走势图", left: "center", top: "5%", }, diff --git a/src/components/CustomPages/BI/BI002HomeDetail.js b/src/components/CustomPages/BI/BI002HomeDetail.js index 0eff654..1cf0234 100644 --- a/src/components/CustomPages/BI/BI002HomeDetail.js +++ b/src/components/CustomPages/BI/BI002HomeDetail.js @@ -235,7 +235,7 @@ class BI002HomeDetail extends React.Component { month.push(item.MONTHStr); company.push(item.FINISH_RATE); department.push(item.NORMAL_FINISH_RATE); - totalCount.push(item.TOTAL_COUNT); + totalCount.push(item.FINISH_COUNT); }); let myChart = echarts.init(document.getElementById("chartWork")); myChart.setOption({ diff --git a/src/components/CustomPages/BI/BI054HomeDetail.js b/src/components/CustomPages/BI/BI054HomeDetail.js index 2de48c8..7ea810a 100644 --- a/src/components/CustomPages/BI/BI054HomeDetail.js +++ b/src/components/CustomPages/BI/BI054HomeDetail.js @@ -102,12 +102,12 @@ class BI054HomeDetail extends React.Component { dataIndex: "NUM", key: (i * 10 + j), render: (value, record, index) => { - RowCount = record.Parent.RowCount - if (index > 0 && result.ListSafeCheckCountDepartment[index - 1].Parent.DepartmentName == record.Parent.DepartmentName) { + RowCount = record.Parent?record.Parent.RowCount:0 + if (index > 0 && result.ListSafeCheckCountDepartment[index - 1].Parent?.DepartmentName == record.Parent?.DepartmentName) { RowCount = 0 } const obj = { - children: record.Parent.DepartmentName, + children: record.Parent?record.Parent.DepartmentName:record.DepartmentName, props: { 'rowSpan': RowCount }, @@ -124,12 +124,12 @@ class BI054HomeDetail extends React.Component { dataIndex: "NUM", key: (i * 10 + j), render: (value, record, index) => { - RowCount = record.Parent.RowCount - if (index > 0 && result.ListSafeCheckCountDepartment[index - 1].Parent.DepartmentName == record.Parent.DepartmentName) { + RowCount = record.Parent?record.Parent.RowCount:0 + if (index > 0 && result.ListSafeCheckCountDepartment[index - 1].Parent?.DepartmentName == record.Parent?.DepartmentName) { RowCount = 0 } const obj = { - children: record.Parent.listCount[j], + children: record.Parent?record.Parent.listCount[j]:record.DepartmentName, props: { 'rowSpan': RowCount }, diff --git a/src/components/MainPage/SafeCheck.js b/src/components/MainPage/SafeCheck.js index 15b9920..9660edb 100644 --- a/src/components/MainPage/SafeCheck.js +++ b/src/components/MainPage/SafeCheck.js @@ -65,7 +65,7 @@ class SafeCheck extends Component { if (dangerTotals) { let myChart = echarts.init(dangerTotals); myChart.setOption({ - color: ["#4285F4", "#72b85b", "#c92a2a", "#ffa94d"], + color: ["#4285F4", "#72b85b", "#c92a2a", "#ffa94d","#9900FF", "#6C6C6C", "#B15BFF", "#003377","#886600", "#FFFF00"], tooltip: { trigger: "axis", diff --git a/src/routes/Home.js b/src/routes/Home.js index b707a2b..9096fa0 100644 --- a/src/routes/Home.js +++ b/src/routes/Home.js @@ -1348,7 +1348,7 @@ class Home extends React.Component { } else if (formCode == 'BI055_HOMEDETAIL') { titleTemp += '月度隐患整改情况(近12月)'; } else if (formCode == 'BI001_HOMEDETAIL') { - titleTemp += '班组建设任务完成详情(近12月)'; + titleTemp += '班组活动任务完成详情(近12月)'; } else if (formCode == 'BI002_HOMEDETAIL') { titleTemp += '工作票完成详情(近12月)'; } else if (formCode == 'BI013_RISKANALYSISMODEL') { @@ -2022,7 +2022,7 @@ class Home extends React.Component {
- 班组建设完成率(当月) + 班组活动完成率(近半年)
{this.state.departmentCompletionData.length > 0 ? (