From a4cd9e04769b0b0545263104e6e91b2b9a20417b Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Sun, 18 Jan 2026 18:11:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=B4=A2=E5=8A=A1=E8=B4=A6=E6=88=B7):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=8C=BA=E5=8F=82=E6=95=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E5=9B=BE=E8=A1=A8=E5=AE=9E=E4=BE=8B=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复从工作台跳转时地区参数可能为数组的情况，并添加标准化处理函数
解决图表组件中实例引用和初始化时机问题，确保正确初始化和销毁
---
 src/components/workspace/GoldGraph.vue              | 18 +++++++++---------
 src/views/moneyManage/financialAccount/cashFlow.vue | 12 +++++++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/workspace/GoldGraph.vue b/src/components/workspace/GoldGraph.vue
index 7b7285e..5e34bef 100644
--- a/src/components/workspace/GoldGraph.vue
+++ b/src/components/workspace/GoldGraph.vue
@@ -84,7 +84,7 @@
 
 <script setup>
 import * as echarts from 'echarts'
-import {onMounted, onUnmounted, ref, watch} from 'vue'
+import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import API from '@/util/http'
 import {ElMessage} from 'element-plus'
 import dayjs from 'dayjs';
@@ -150,9 +150,9 @@ const length = ref(0)
 const chartLoading = ref(true)
 
 const handleResize = () => {
-  if (chartInstance.value) {
+  if (chartInstance) {
     try {
-      chartInstance.value.resize()
+      chartInstance.resize()
       console.log('resize一下')
     } catch (error) {
       console.error('图表resize失败:', error)
@@ -168,13 +168,13 @@ const initChart = () => {
 }
 // 销毁图表
 const destroyChart = () => {
-  if (chartInstance.value) {
+  if (chartInstance) {
     try {
-      chartInstance.value.dispose()
+      chartInstance.dispose()
     } catch (error) {
       console.error('图表销毁失败:', error)
     }
-    chartInstance.value = null
+    chartInstance = null
   }
   window.removeEventListener('resize', handleResize)
 }
@@ -519,6 +519,7 @@ const updateChart = (chartData) => {
   if (!chartInstance) {
     initChart()
   }
+  if (!chartInstance) return
   chartLoading.value = true
   try {
     let series = []
@@ -686,10 +687,9 @@ const handleDatePickerChange = () => {
 onMounted(async () => {
   await getAdminData()
   await getMarkets()
+  await nextTick()
+  initChart()
   getYear()
-  window.addEventListener('resize', () => {
-    chartInstance.resize()
-  })
 })
 onUnmounted(() => {
   destroyChart()
diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index 60692d0..b9e0a5e 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -315,10 +315,16 @@ const throttledsubmitRefund = _.throttle(handleRefund, 5000, {
   trailing: false
 })
 // 递归查找地区ID
+const normalizeMarketLabel = (value) => {
+  return String(value ?? '')
+    .trim()
+    .toLowerCase()
+    .replace(/[\s_-]+/g, '')
+}
 const findValueByLabel = (options, label) => {
+  const normalizedLabel = normalizeMarketLabel(label)
   for (const option of options) {
-    // 简单匹配名称，防止空格等问题，可以trim一下
-    if (option.label === label || option.label?.trim() === label?.trim()) {
+    if (normalizeMarketLabel(option.label) === normalizedLabel) {
       return option.value
     }
     if (option.children && option.children.length) {
@@ -333,7 +339,7 @@ onMounted(async () => {
   await getMarket()
   
   // 处理从工作台跳转过来的地区参数
-  const regionName = route.query.region
+  const regionName = Array.isArray(route.query.region) ? route.query.region[0] : route.query.region
   if (regionName && marketOptions.value.length) {
     const matchedId = findValueByLabel(marketOptions.value, regionName)
     if (matchedId) {