diff --git a/backend/pom.xml b/backend/pom.xml index 229218d302..7539ed412b 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -414,6 +414,12 @@ true + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + maven-clean-plugin diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java index f38f9272a0..07eccc92c1 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java @@ -52,11 +52,11 @@ public class ExtAuthServiceImpl implements ExtAuthService { } if (!CollectionUtils.isEmpty(authMap.get("role"))) { - authURD.setUserIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); + authURD.setRoleIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); } if (!CollectionUtils.isEmpty(authMap.get("dept"))) { - authURD.setUserIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); + authURD.setDeptIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); } return authURD; } diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index aec2f2a89d..e01892261c 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -508,11 +508,7 @@ export const BASE_RADAR = { }, indicator: [] }, - series: [{ - type: 'radar', - // areaStyle: {normal: {}}, - data: [] - }] + series: [] } export const BASE_GAUGE = { diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js index 113984ee5e..07e3f81a83 100644 --- a/frontend/src/views/chart/chart/radar/radar.js +++ b/frontend/src/views/chart/chart/radar/radar.js @@ -36,8 +36,19 @@ export function baseRadarOption(chart_option, chart) { y.label = customAttr.label } chart_option.legend.data.push(y.name) + + const d = { + name: y.name, + type: 'radar', + data: [ + { + value: y.data, + name: y.name + } + ] + } y.value = JSON.parse(JSON.stringify(y.data)) - chart_option.series[0].data.push(y) + chart_option.series.push(d) maxValues.push(Math.max.apply(null, y.value)) }