From ece232d302f26250db8cf82405a2d74056637894 Mon Sep 17 00:00:00 2001
From: chenglb <chenglb@yisa.com>
Date: Fri, 26 Jan 2024 14:29:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=80ajax=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/ajax.js                                    | 4 ++--
 src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/ajax.js b/src/config/ajax.js
index b99d380..204bac0 100644
--- a/src/config/ajax.js
+++ b/src/config/ajax.js
@@ -114,7 +114,7 @@ function ajax(ajaxData = {}) {
             if(JSON.parse(err.config.data)?.guard){
               window.queryRecord[err.config.url].ing = false
             }
-            if(location.hash.replace(/\?.*/, '') != JSON.parse(err.config.data)?.pageHash){
+            if(location.hash.replace(/\?.*/, '').replace('#/',"").replace('/', '_') != JSON.parse(err.config.data)?.pageHash){
               console.log('接口异常,但页面已销毁')
               reject(new Error(1))
               return
@@ -126,7 +126,7 @@ function ajax(ajaxData = {}) {
               window.queryRecord[err.config.url].ing = false
             }    
           }
-          if(location.hash.replace(/\?.*/, '') != err.config.params.pageHash){
+          if(location.hash.replace(/\?.*/, '').replace('#/',"").replace('/', '_') != err.config.params.pageHash){
             console.log('接口异常,但页面已销毁')
             reject(new Error(1))
             return
diff --git a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx
index efa81e9..ac01176 100644
--- a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx
@@ -798,7 +798,7 @@ function PersonInfo() {
                                     yisaLabel="资产名称"
                                     yisaData={assetEditOptions}
                                     mode="multiple"
-                                    defaultValue={currentPersonInfo.good_ids ? currentPersonInfo.good_ids.split(',') : []}
+                                    defaultValue={currentPersonInfo.good_ids ? currentPersonInfo.good_ids.split(',') : []} // 如果下拉框的数据是数字, 就无法匹配了
                                     placeholder=""
                                     hasUnlimited={false}
                                     showClose={true}