diff --git a/src/stores/dictData.ts b/src/stores/dictData.ts index 838257a..2a8a93a 100644 --- a/src/stores/dictData.ts +++ b/src/stores/dictData.ts @@ -11,11 +11,11 @@ export const useDictData = defineStore( area: [] // 其他接口获取的字典,比如区域 }) - const getBasicData = (code: string, arr?: string) => { + const getBasicData = (code: string, arr?: string[]) => { let list = [] list = state.basic.filter(item => item.code === code)[0]?.children || [] if (arr) { - list = list.filter(item => item.code !== arr) + list = list.filter(item => !arr.includes(item.code)) } return list } diff --git a/src/views/Event-boot/Region/distribution.vue b/src/views/Event-boot/Region/distribution.vue index 4fd1576..f82f470 100644 --- a/src/views/Event-boot/Region/distribution.vue +++ b/src/views/Event-boot/Region/distribution.vue @@ -72,7 +72,8 @@ defineOptions({ }) const EchartMap = ref() const dictData = useDictData() -const options = dictData.getBasicData('Statistical_Type', 'Report_Type') +const options = dictData.getBasicData('Statistical_Type', ['Report_Type']) +console.log('🚀 ~ file: distribution.vue:76 ~ options:', options) const echartMapList = ref({}) const echartList = ref({}) const titleA = ref('') @@ -85,7 +86,7 @@ const formInline = reactive({ monitorFlag: 2, powerFlag: 2, serverName: 'event-boot', - statisticalType: dictData.getBasicData('Statistical_Type', 'Report_Type')[0] + statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0] }) const onSubmit = () => {