Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
d2aba7d384
|
@ -238,12 +238,13 @@ export default {
|
||||||
this.$emit("dataChange", res, this.tableData);
|
this.$emit("dataChange", res, this.tableData);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (error.response && error.response.data) {
|
if (error && error.response && error.response.data) {
|
||||||
this.emptyText = error.response.data.err_msg;
|
this.emptyText = error.response.data.err_msg;
|
||||||
} else {
|
} else if(error) {
|
||||||
this.emptyText = error.statusText || "数据格式错误";
|
this.emptyText = error.statusText || "数据格式错误";
|
||||||
|
}else {
|
||||||
|
this.emptyText = "数据格式错误";
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue