Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

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

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}