diff --git a/src/components/table/report/builtinReportTable.vue b/src/components/table/report/builtinReportTable.vue index a37c6433..6d9bba29 100644 --- a/src/components/table/report/builtinReportTable.vue +++ b/src/components/table/report/builtinReportTable.vue @@ -38,7 +38,7 @@ - {{scope.row.reportTemp.name}} + {{$_.get(scope.row.reportTemp, 'name')}} {{getJobStatus(scope.row)}} diff --git a/src/views/charts/charts/ChartRelationShip.vue b/src/views/charts/charts/ChartRelationShip.vue index 60cfd9cc..1e9404f4 100644 --- a/src/views/charts/charts/ChartRelationShip.vue +++ b/src/views/charts/charts/ChartRelationShip.vue @@ -232,13 +232,13 @@ export default { this.chartOption.series[0].links = links this.myChart.setOption(this.chartOption) function handleData (data, links, item) { - if (!data.some(d => d.name === item.name)) { + if (item && !data.some(d => d.name === item.name)) { data.push({ name: item.name, ...handleStyle(item) }) } - if (!loadsh.isEmpty(item.from) && !loadsh.isEmpty(item.to)) { + if (item && !loadsh.isEmpty(item.from) && !loadsh.isEmpty(item.to)) { links.push({ target: item.to, source: item.from }) } - if (!loadsh.isEmpty(item.leaf)) { + if (item && !loadsh.isEmpty(item.leaf)) { item.leaf.forEach(i => { handleData(data, links, i) })