From 6e6717d23cc1e306b47d1c2338b7342c07530dc2 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 3 Jan 2024 13:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/dictData.ts                       | 4 ++--
 src/views/Event-boot/Region/distribution.vue | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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 = () => {