diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json index f3490244..d1c07f77 100644 --- a/mindinsight/ui/src/locales/zh-cn.json +++ b/mindinsight/ui/src/locales/zh-cn.json @@ -132,7 +132,7 @@ "50545001": "API 路由资源不存在", "50545002": "请求API的HTTP方法错误", - "50545005": "训练作业不存在或不在缓存中", + "50545005": "训练作业不存在", "50545006": "Summary日志路径无效", "50545007": "Summary数据正在被加载,请等待Summary数据加载结束", "50545009": "查询的节点不在图中", diff --git a/mindinsight/ui/src/views/train-manage/graph.vue b/mindinsight/ui/src/views/train-manage/graph.vue index 64f3c950..5356ab00 100644 --- a/mindinsight/ui/src/views/train-manage/graph.vue +++ b/mindinsight/ui/src/views/train-manage/graph.vue @@ -845,7 +845,7 @@ export default { this.initOver = true; this.fileSearchBox.value = tags.length ? tags[0] : ''; this.queryGraphData(); - } else if(!hasFileSearchValue) { + } else if (!hasFileSearchValue) { this.fileSearchBox.value = ''; } }) diff --git a/mindinsight/ui/src/views/train-manage/image.vue b/mindinsight/ui/src/views/train-manage/image.vue index 7b3e7eb8..1b6725f5 100644 --- a/mindinsight/ui/src/views/train-manage/image.vue +++ b/mindinsight/ui/src/views/train-manage/image.vue @@ -257,7 +257,7 @@ export default { if (this.isTimeReload) { this.autoUpdateSamples(); } - this.updateAllData(); + this.updateAllData(false); } }, /** @@ -274,7 +274,10 @@ export default { this.stopUpdateSamples(); } }, - timeReloadValue(newVal) { + /** + *The refresh time is changed + */ + timeReloadValue() { this.autoUpdateSamples(); }, }, @@ -295,6 +298,10 @@ export default { mounted() { this.getCharMainContentwidth(); this.getTagAndRunList(); + // Automatic refresh + if (this.isTimeReload) { + this.autoUpdateSamples(); + } }, methods: { @@ -371,11 +378,6 @@ export default { // Obtains data on the current page this.getCurPageDataArr(); - - // Automatic refresh - if (this.isTimeReload) { - this.autoUpdateSamples(); - } }, this.requestErrorCallback) .catch((e) => { this.$message.error(this.$t('public.dataError')); @@ -445,8 +447,13 @@ export default { ]; } this.$forceUpdate(); - }) - .catch((e) => {}); + }, (e) => { + sampleItem.totalStepNum = 0; + sampleItem.sliderValue = 0; + sampleItem.curStep = ''; + sampleItem.curImgUrl = ''; + sampleItem.curTime = ''; + }).catch((e) => {}); }); }, /** @@ -880,13 +887,14 @@ export default { }, /** * Update all data. + * @param {Boolean} ignoreError whether ignore error tip */ - updateAllData() { + updateAllData(ignoreError) { const params = { plugin_name: 'image', train_id: this.trainingJobId, }; - RequestService.getSingleTrainJob(params, true) + RequestService.getSingleTrainJob(params, ignoreError) .then((res) => { if (this.isReloading) { this.$store.commit('setIsReload', false); @@ -927,7 +935,7 @@ export default { } this.autoUpdateTimer = setInterval(() => { this.$store.commit('clearToken'); - this.updateAllData(); + this.updateAllData(true); }, this.timeReloadValue * 1000); }, /** diff --git a/mindinsight/ui/src/views/train-manage/scalar-compare.vue b/mindinsight/ui/src/views/train-manage/scalar-compare.vue index e9b1bc8e..7a9d33dd 100644 --- a/mindinsight/ui/src/views/train-manage/scalar-compare.vue +++ b/mindinsight/ui/src/views/train-manage/scalar-compare.vue @@ -564,7 +564,11 @@ export default { ajaxArr.push(this.addAjax(params, yIndex)); }); - Promise.all(ajaxArr) + Promise.all(ajaxArr.map(function(promiseItem) { + return promiseItem.catch(function(err) { + return err; + }); + })) .then((res) => { if (!res) { return; diff --git a/mindinsight/ui/src/views/train-manage/scalar.vue b/mindinsight/ui/src/views/train-manage/scalar.vue index 833c2b54..7978874b 100644 --- a/mindinsight/ui/src/views/train-manage/scalar.vue +++ b/mindinsight/ui/src/views/train-manage/scalar.vue @@ -268,7 +268,7 @@ export default { if (this.isTimeReload) { this.autoUpdateSamples(); } - this.updateAllData(); + this.updateAllData(false); } }, /** @@ -285,15 +285,8 @@ export default { } }, - timeReloadValue(newVal) { - if (this.autoUpdateTimer) { - clearInterval(this.autoUpdateTimer); - this.autoUpdateTimer = null; - } - this.autoUpdateTimer = setInterval(() => { - this.$store.commit('clearToken'); - this.updateAllData(); - }, newVal * 1000); + timeReloadValue() { + this.autoUpdateSamples(); }, }, destroyed() { @@ -343,6 +336,11 @@ export default { this.getScalarsList(); this.firstNum = 1; + + // auto refresh + if (this.isTimeReload) { + this.autoUpdateSamples(); + } }); }, methods: { @@ -436,11 +434,6 @@ export default { // Refresh the chart data on the current page this.freshCurPageData(); } - - // auto refresh - if (this.isTimeReload) { - this.autoUpdateSamples(); - } }, this.requestErrorCallback) .catch((e) => { this.$message.error(this.$t('public.dataError')); @@ -506,22 +499,28 @@ export default { promiseArr.push(this.addPromise(params)); - Promise.all(promiseArr) + Promise.all(promiseArr.map(function(promiseItem) { + return promiseItem.catch(function(err) { + return err; + }); + })) .then((res) => { // error if (!res || !res.length) { return; } - if (sampleObject.charObj) { - sampleObject.charObj.showLoading(); - } let scalarIndex = 0; let hasInvalidData = false; for (let i = 0; i < res.length; i++) { if (!res[i] || !res[i].data) { + sampleObject.charObj.clear(); return; } + if (sampleObject.charObj) { + sampleObject.charObj.showLoading(); + } + const resData = res[i].data; const tempObject = { @@ -1519,14 +1518,15 @@ export default { /** * Updating Sliding Block Data + * @param {Boolean} ignoreError whether ignore error tip */ - updateAllData() { + updateAllData(ignoreError) { const params = { plugin_name: 'scalar', train_id: this.trainingJobId, }; - RequestService.getSingleTrainJob(params, true) + RequestService.getSingleTrainJob(params, ignoreError) .then((res) => { if (this.isReloading) { this.$store.commit('setIsReload', false); @@ -1600,7 +1600,7 @@ export default { } this.autoUpdateTimer = setInterval(() => { this.$store.commit('clearToken'); - this.updateAllData(); + this.updateAllData(true); }, this.timeReloadValue * 1000); },