Commit 54fce6cbd833c553b5cada2bde2c442d733b1551
1 parent
09a23d48
更新以下内容: 华鑫天成mes领料申请明细双击报错,系统白屏
Showing
2 changed files
with
6 additions
and
5 deletions
src/components/Common/CommonHooks/useCommonBase.js
| @@ -4191,8 +4191,8 @@ const useSetConfigStatus = props => { | @@ -4191,8 +4191,8 @@ const useSetConfigStatus = props => { | ||
| 4191 | sButtonEnabledStr, | 4191 | sButtonEnabledStr, |
| 4192 | [] | 4192 | [] |
| 4193 | ); | 4193 | ); |
| 4194 | - | ||
| 4195 | - sButtonEnabled.forEach(sButtonEnabledItem => { | 4194 | + if(commonUtils.isNotEmptyArr(sButtonEnabled) && Array.isArray(sButtonEnabled)) { |
| 4195 | + sButtonEnabled?.forEach(sButtonEnabledItem => { | ||
| 4196 | const { | 4196 | const { |
| 4197 | showColumn = [], | 4197 | showColumn = [], |
| 4198 | hideColumn = [], | 4198 | hideColumn = [], |
| @@ -4244,6 +4244,7 @@ const useSetConfigStatus = props => { | @@ -4244,6 +4244,7 @@ const useSetConfigStatus = props => { | ||
| 4244 | ]; | 4244 | ]; |
| 4245 | } | 4245 | } |
| 4246 | }); | 4246 | }); |
| 4247 | + } | ||
| 4247 | }); | 4248 | }); |
| 4248 | }); | 4249 | }); |
| 4249 | 4250 |
src/utils/config.js
| @@ -4,9 +4,9 @@ const bHttps = location.protocol === 'https:'; | @@ -4,9 +4,9 @@ const bHttps = location.protocol === 'https:'; | ||
| 4 | export const webSite = { | 4 | export const webSite = { |
| 5 | // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */ | 5 | // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */ |
| 6 | // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace', | 6 | // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace', |
| 7 | - fileAddress: isDev ? '//18573763961.gnway.cc:51599/xlyEntry/' : '//' + location.host + '/xlyEntry/', // 接口地址 | ||
| 8 | - faceAddress: isDev ? '//18573763961.gnway.cc:51599/xlyFace' : '//' + location.host + '/xlyFace', | ||
| 9 | - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//18573763961.gnway.cc:51599/xlyEntry/' : '//' + location.host + '/xlyEntry/', | 7 | + fileAddress: isDev ? '//122.4.194.110:9098/xlyEntry/' : '//' + location.host + '/xlyEntry/', // 接口地址 |
| 8 | + faceAddress: isDev ? '//122.4.194.110:9098/xlyFace' : '//' + location.host + '/xlyFace', | ||
| 9 | + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//122.4.194.110:9098/xlyEntry/' : '//' + location.host + '/xlyEntry/', | ||
| 10 | interfaceAddress: isDev ? '//18573763961.gnway.cc:51599/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址88 | 10 | interfaceAddress: isDev ? '//18573763961.gnway.cc:51599/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址88 |
| 11 | // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/', | 11 | // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/', |
| 12 | // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址 | 12 | // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址 |