提交 7df087e4 编写于 作者: P ph

modify error process

上级 8e6ee5c5
......@@ -43,7 +43,6 @@
"lossFunc": "损失函数",
"learningRate": "学习率",
"modelSize": "模型大小",
"50540002": "Json数据解析失败",
"dataProcess": "数据处理"
},
"dataTraceback": {
......@@ -123,8 +122,7 @@
"queryLoading": "正在加载图,请稍候。",
"fullScreen": "全屏",
"tooManyNodes": "节点太多,打开失败",
"inputNodeName": "请输入节点名称",
"50540002": "当前训练作业已不存在,请选择其他训练作业进行查看。"
"inputNodeName": "请输入节点名称"
},
"error": {
"50540000": "系统错误",
......@@ -134,15 +132,20 @@
"50545001": "API 路由资源不存在",
"50545002": "请求API的HTTP方法错误",
"50545005": "训练作业不存在或不在缓存中",
"50545006": "Summary日志路径无效",
"50545007": "Summary数据正在被加载,请等待Summary数据加载结束",
"50545009": "查询的节点不在图中",
"5054500A": "训练作业ID进行URL解码失败",
"5054500C": "计算图不存在,请刷新",
"5054500D": "图片数据不存在,请刷新",
"5054500E": "标量数据不存在,请刷新",
"50542082": "模型名称缺失",
"50542085": "模型名称不合法",
"50542215": "查询参数错误",
"50542216": "Summary log文件未找到",
"50542217": "Summary log路径错误",
"50542216": "Summary日志文件未找到",
"50542217": "Summary日志路径错误",
"50542218": "筛选参数错误"
}
}
......@@ -49,41 +49,21 @@ axios.interceptors.response.use(
const errorData = i18n.messages[i18n.locale].error;
// error returned by backend
if (error.response && error.response.data) {
if (error.response.data.error_code) {
// error code judgment
if (error.response.data.error_code.toString() === '50540002') {
if (router.currentRoute.path === '/train-manage/graph') {
const errorMsg = i18n.messages[i18n.locale].graph;
Vue.prototype.$message.error(errorMsg[error.response.data.error_code]);
} else if (error.config.headers.ignoreError
|| router.currentRoute.path === '/train-manage/training-dashboard') {
return Promise.reject(error);
} else if (router.currentRoute.path === '/model-traceback') {
const errorMsg = i18n.messages[i18n.locale].modelTraceback;
Vue.prototype.$message.error(errorMsg[error.response.data.error_code]);
} else if (errorData[error.response.data.error_code]) {
Vue.prototype.$message.error(errorData[error.response.data.error_code]);
}
} else if (error.response.data.error_code.toString() === '50545006') {
if (error.response && error.response.data && error.response.data.error_code) {
if (error.response.data.error_code.toString() === '50540005' ||
error.response.data.error_code.toString() === '50545006') {
if (error.config.headers.ignoreError ||
router.currentRoute.path === '/train-manage/training-dashboard') {
return Promise.reject(error);
} else if (error.response.data.error_code.toString() === '50542216' &&
router.currentRoute.path === '/train-manage/training-dashboard'
) {
return Promise.reject(error);
} else if (errorData[error.response.data.error_code]) {
Vue.prototype.$message.error(errorData[error.response.data.error_code]);
}
// return error data
} else if ( error.response.data.error_code.toString() === '50542216' &&
router.currentRoute.path === '/train-manage/training-dashboard') {
return Promise.reject(error);
} else {
if (error.response.data.status) {
if (errorData[error.response.data.status]) {
Vue.prototype.$message.error(errorData[error.response.data.status]);
}
return Promise.reject(error);
}
}
if (errorData[error.response.data.error_code]) {
Vue.prototype.$message.error(errorData[error.response.data.error_code]);
}
return Promise.reject(error);
} else {
// error returned by browser
if (error.code === 'ECONNABORTED' && /^timeout/.test(error.message)) {
......@@ -98,7 +78,9 @@ axios.interceptors.response.use(
return false;
} else {
// show network error
Vue.prototype.$message.error(i18n.messages[i18n.locale].public.netWorkError);
Vue.prototype.$message.error(
i18n.messages[i18n.locale].public.netWorkError,
);
return Promise.reject(error);
}
}
......
......@@ -91,11 +91,14 @@ export default {
},
// query single train job list(image/scalar/graph)
getSingleTrainJob(params) {
getSingleTrainJob(params, isIgnoreError) {
return axios({
method: 'get',
url: 'v1/mindinsight/datavisual/single-job',
params: params,
headers: {
ignoreError: isIgnoreError,
},
});
},
......
......@@ -306,7 +306,7 @@ export default {
plugin_name: 'image',
train_id: this.trainingJobId,
};
RequestService.getSingleTrainJob(params)
RequestService.getSingleTrainJob(params, false)
.then((res) => {
if (!res || !res.data || !res.data.train_jobs) {
this.initOver = true;
......@@ -886,7 +886,7 @@ export default {
plugin_name: 'image',
train_id: this.trainingJobId,
};
RequestService.getSingleTrainJob(params)
RequestService.getSingleTrainJob(params, true)
.then((res) => {
if (this.isReloading) {
this.$store.commit('setIsReload', false);
......
......@@ -354,7 +354,7 @@ export default {
plugin_name: 'scalar',
train_id: this.trainingJobId,
};
RequestService.getSingleTrainJob(params)
RequestService.getSingleTrainJob(params, false)
.then((res) => {
// error;
if (
......@@ -1526,7 +1526,7 @@ export default {
plugin_name: 'scalar',
train_id: this.trainingJobId,
};
RequestService.getSingleTrainJob(params)
RequestService.getSingleTrainJob(params, true)
.then((res) => {
if (this.isReloading) {
this.$store.commit('setIsReload', false);
......
......@@ -369,7 +369,7 @@ export default {
plugin_name: 'scalar',
train_id: this.trainingJobId,
};
RequestService.getSingleTrainJob(params)
RequestService.getSingleTrainJob(params, true)
.then((res) => {
if (
!res ||
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册