Commit 1b5b3369918f499c319638372c275c740e1c55a5
Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl
Showing
2 changed files
with
2 additions
and
2 deletions
@@ -169,7 +169,7 @@ const open = async (_data: SingleClickEventDataType) => { | @@ -169,7 +169,7 @@ const open = async (_data: SingleClickEventDataType) => { | ||
169 | } | 169 | } |
170 | 170 | ||
171 | const error = () => { | 171 | const error = () => { |
172 | - createMessage.error('下发指令失败') | 172 | + // createMessage.error('下发指令失败') |
173 | return false | 173 | return false |
174 | } | 174 | } |
175 | 175 |
@@ -131,7 +131,7 @@ const transform: AxiosTransform = { | @@ -131,7 +131,7 @@ const transform: AxiosTransform = { | ||
131 | responseInterceptorsCatch: (_axiosInstance: AxiosInstance, error: any) => { | 131 | responseInterceptorsCatch: (_axiosInstance: AxiosInstance, error: any) => { |
132 | const { response, code, message, config } = error || {} | 132 | const { response, code, message, config } = error || {} |
133 | const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none' | 133 | const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none' |
134 | - const msg: string = response?.data?.message ?? '' | 134 | + const msg: string = response?.data?.message || response?.data || '' |
135 | const err: string = error?.toString?.() ?? '' | 135 | const err: string = error?.toString?.() ?? '' |
136 | let errMessage = '' | 136 | let errMessage = '' |
137 | if (axios.isCancel(error)) | 137 | if (axios.isCancel(error)) |