From aa20fcbf3e30333a759514cc90d047cdebd7b979 Mon Sep 17 00:00:00 2001 From: fengxuefeng Date: Mon, 27 Jul 2020 19:36:48 +0800 Subject: [PATCH] ui display no data modification --- mindinsight/ui/src/main.js | 3 +++ .../views/train-manage/hardware-visual.vue | 5 +++- .../train-manage/profiling-dashboard.vue | 24 ++++++++++++++----- .../ui/src/views/train-manage/step-trace.vue | 5 +++- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/mindinsight/ui/src/main.js b/mindinsight/ui/src/main.js index 19b8205..2640b1b 100644 --- a/mindinsight/ui/src/main.js +++ b/mindinsight/ui/src/main.js @@ -40,6 +40,9 @@ router.beforeEach((to, from, next) => { store.commit('setIsReload', false); next(); }); +router.onError((error) => { + Vue.prototype.$message.error(i18n.messages[i18n.locale].public.netWorkError); +}); // forbidden showing production tip Vue.config.productionTip = false; diff --git a/mindinsight/ui/src/views/train-manage/hardware-visual.vue b/mindinsight/ui/src/views/train-manage/hardware-visual.vue index 7f14218..8387d26 100644 --- a/mindinsight/ui/src/views/train-manage/hardware-visual.vue +++ b/mindinsight/ui/src/views/train-manage/hardware-visual.vue @@ -295,7 +295,7 @@ limitations under the License.
+ v-if="chipTableData.length === 0 && cpuList.length===0 && initOver">
@@ -330,6 +330,7 @@ export default { autoUpdateTimer: null, // Automatic refresh timer isReloading: false, // Manually refresh legendSelected: {}, + initOver: false, }; }, computed: { @@ -417,6 +418,7 @@ export default { init() { RequestService.getMetricsData().then( (res) => { + this.initOver = true; if (this.isReloading) { this.$store.commit('setIsReload', false); this.isReloading = false; @@ -473,6 +475,7 @@ export default { (err) => { this.chipTableData = []; this.cpuList = []; + this.initOver = true; if (this.isReloading) { this.$store.commit('setIsReload', false); this.isReloading = false; diff --git a/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue b/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue index be40f39..c4c491b 100644 --- a/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue +++ b/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue @@ -90,7 +90,7 @@ limitations under the License.
+ v-if="svg.noData && svg.initOver">
@@ -236,7 +236,7 @@ limitations under the License.
+ v-if="processSummary.noData && processSummary.initOver">
@@ -257,7 +257,7 @@ limitations under the License.
+ v-if="pieChart.noData && pieChart.data.length === 0 && pieChart.initOver">
@@ -337,7 +337,7 @@ limitations under the License.
+ v-if="timelineInfo.noData && timelineInfo.initOver">
@@ -392,6 +392,7 @@ export default { stream_parallel: ['#01a5a7', '#cceded'], }, noData: false, + initOver: false, }, trainingJobId: this.$route.query.id, summaryPath: this.$route.query.dir, @@ -403,6 +404,7 @@ export default { noData: false, topN: [], colorList: ['#6C92FA', '#6CBFFF', '#4EDED2', '#7ADFA0', '#A6DD82'], + initOver: false, }, timeLine: { data: null, @@ -414,6 +416,7 @@ export default { opNum: 0, opTimes: 0, noData: true, + initOver: false, }, processSummary: { noData: true, @@ -429,6 +432,7 @@ export default { full: 0, total: 0, }, + initOver: false, }, }; }, @@ -481,6 +485,7 @@ export default { device_id: this.currentCard, }; RequestService.queryProcessSummary(params).then((resp) => { + this.processSummary.initOver = true; if (resp && resp.data) { const data = JSON.parse(JSON.stringify(resp.data)); this.processSummary.count = Object.keys(data).length; @@ -505,6 +510,7 @@ export default { } } else { this.dealProcess(null); + this.processSummary.initOver = true; } }); }, @@ -580,6 +586,7 @@ export default { }; RequestService.getProfilerOpData(params) .then((res) => { + this.pieChart.initOver = true; if (res && res.data) { if (res.data.object) { this.pieChart.data = []; @@ -621,6 +628,7 @@ export default { }) .catch(() => { this.pieChart.noData = true; + this.pieChart.initOver = true; }); }, queryTrainingTrace() { @@ -631,6 +639,7 @@ export default { }; RequestService.queryTrainingTrace(params).then( (res) => { + this.svg.initOver = true; if ( res.data && res.data.training_trace_graph && @@ -669,6 +678,7 @@ export default { document.querySelector('#trace').style.height = '0px'; this.svg.noData = true; this.svg.data = []; + this.svg.initOver = true; this.removeTrace(); }, ); @@ -991,13 +1001,15 @@ export default { return new Uint8Array(arr); }, queryTimeline() { + this.timeLine.waiting = true; const params = { dir: this.relativePath, device_id: this.currentCard, }; RequestService.queryTimlineInfo(params) .then((res) => { - if (res && res.data) { + this.timelineInfo.initOver = true; + if (res && res.data && res.data.length) { this.timelineInfo.noData = false; this.timelineInfo.totalTime = res.data.total_time.toFixed(4); this.timelineInfo.streamNum = res.data.num_of_streams; @@ -1009,8 +1021,8 @@ export default { }) .catch(() => { this.timelineInfo.noData = true; + this.timelineInfo.initOver = true; }); - this.timeLine.waiting = true; RequestService.queryTimeline(params) .then((res) => { if (res && res.data && res.data.length) { diff --git a/mindinsight/ui/src/views/train-manage/step-trace.vue b/mindinsight/ui/src/views/train-manage/step-trace.vue index 986d508..ba2b97c 100644 --- a/mindinsight/ui/src/views/train-manage/step-trace.vue +++ b/mindinsight/ui/src/views/train-manage/step-trace.vue @@ -88,7 +88,7 @@ limitations under the License.
+ v-if="svg.data.length === 0 && svg.initOver">
@@ -178,6 +178,7 @@ export default { stream_parallel: ['#01a5a7', '#cceded'], }, noData: false, + initOver: false, }, deviceId: 0, radio: this.$t('profiling.lterationGap'), @@ -424,6 +425,7 @@ export default { }; RequestService.queryTrainingTrace(params).then( (res) => { + this.svg.initOver = true; if ( res.data && res.data.training_trace_graph && @@ -461,6 +463,7 @@ export default { this.bp_end = '--'; this.svg.data = []; this.svg.noData = true; + this.svg.initOver = true; this.removeTrace(); }, ); -- GitLab