From 87064c14ef90fe0466948226fdfbc52c8dd33a70 Mon Sep 17 00:00:00 2001
From: fengxuefeng <fengxuefeng2@huawei.com>
Date: Thu, 13 Aug 2020 14:49:16 +0800
Subject: [PATCH] No data display optimization

---
 mindinsight/ui/src/locales/en-us.json                        | 4 +---
 mindinsight/ui/src/locales/zh-cn.json                        | 2 +-
 mindinsight/ui/src/main.js                                   | 4 ++--
 mindinsight/ui/src/views/train-manage/data-process.vue       | 3 ++-
 mindinsight/ui/src/views/train-manage/operator.vue           | 3 ++-
 .../ui/src/views/train-manage/profiling-dashboard.vue        | 4 ++--
 mindinsight/ui/src/views/train-manage/profiling.vue          | 5 ++++-
 mindinsight/ui/src/views/train-manage/step-trace.vue         | 3 ++-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/mindinsight/ui/src/locales/en-us.json b/mindinsight/ui/src/locales/en-us.json
index 13c5df4e..e912222f 100644
--- a/mindinsight/ui/src/locales/en-us.json
+++ b/mindinsight/ui/src/locales/en-us.json
@@ -49,9 +49,7 @@
     "dataTraceback": "Dataset Lineage",
     "comparePlate": "Comparison Dashboard",
     "disableProfilerTip": "Failed to view profiling because no profiler log is available.",
-    "hardwareVisual": "Hardware Resources",
-    "paramDetails": "Parameter Details",
-    "trainingParamDetails": "Training Parameter Details(Directory)"
+    "hardwareVisual": "Hardware Resources"
   },
   "modelTraceback": {
     "summaryPath": "Summary Path",
diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json
index 9da74ee3..a11ba2e9 100644
--- a/mindinsight/ui/src/locales/zh-cn.json
+++ b/mindinsight/ui/src/locales/zh-cn.json
@@ -1,6 +1,6 @@
 {
   "public": {
-    "netWorkError": "网络或后台错误，请检查。",
+    "netWorkError": "网络或后端服务错误，请检查。",
     "browserWarning": "您当前的浏览器可能导致部分功能失效或不可使用，建议使用Chrome 65版本以上的浏览器。",
     "timeout": "超时，请重新请求。",
     "noData": "暂无数据",
diff --git a/mindinsight/ui/src/main.js b/mindinsight/ui/src/main.js
index d63a48d0..121b8c2c 100644
--- a/mindinsight/ui/src/main.js
+++ b/mindinsight/ui/src/main.js
@@ -23,8 +23,8 @@ import './assets/css/element.css';
 import './assets/css/reset.scss';
 import i18n from './i18n';
 import $ from 'jquery';
-import locale from '../node_modules/element-ui/lib/locale/lang/en';
-import localezh from '../node_modules/element-ui/lib/locale/lang/zh-CN';
+import locale from 'element-ui/lib/locale/lang/en';
+import localezh from 'element-ui/lib/locale/lang/zh-CN';
 
 if (
   localStorage.getItem('milang') &&
diff --git a/mindinsight/ui/src/views/train-manage/data-process.vue b/mindinsight/ui/src/views/train-manage/data-process.vue
index eda2d88f..223bb8c6 100644
--- a/mindinsight/ui/src/views/train-manage/data-process.vue
+++ b/mindinsight/ui/src/views/train-manage/data-process.vue
@@ -417,7 +417,8 @@ export default {
           } else {
             this.queryAverageRate();
           }
-        } else {
+        }
+        if (newValue.initOver) {
           this.connectQueueChart.initOver = true;
           this.dataQueueChart.initOver = true;
           this.deviceQueueOpChart.initOver = true;
diff --git a/mindinsight/ui/src/views/train-manage/operator.vue b/mindinsight/ui/src/views/train-manage/operator.vue
index d2c8145f..307d51f7 100644
--- a/mindinsight/ui/src/views/train-manage/operator.vue
+++ b/mindinsight/ui/src/views/train-manage/operator.vue
@@ -337,7 +337,8 @@ export default {
           this.currentCard = newValue.curCardNum;
           this.initOver = false;
           this.cardChange();
-        } else {
+        }
+        if (newValue.initOver) {
           this.initOver = true;
         }
       },
diff --git a/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue b/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue
index dafd4830..3912500a 100644
--- a/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue
+++ b/mindinsight/ui/src/views/train-manage/profiling-dashboard.vue
@@ -477,7 +477,7 @@ export default {
     // Monitor current card information
     '$parent.curDashboardInfo': {
       handler(newValue, oldValue) {
-        if (newValue.curCardNum === '') {
+        if (newValue.initOver) {
           this.pieChart.noData = true;
           this.svg.noData = true;
           this.svg.initOver = true;
@@ -485,7 +485,7 @@ export default {
           this.timelineInfo.initOver = true;
           this.processSummary.initOver = true;
         }
-        if (newValue.query.dir && newValue.query.id && newValue.query.path) {
+        if (newValue.query.dir && newValue.query.id && newValue.query.path && newValue.curCardNum) {
           this.summaryPath = newValue.query.dir;
           this.trainingJobId = newValue.query.id;
           this.relativePath = newValue.query.path;
diff --git a/mindinsight/ui/src/views/train-manage/profiling.vue b/mindinsight/ui/src/views/train-manage/profiling.vue
index 62deb39c..d593bafd 100644
--- a/mindinsight/ui/src/views/train-manage/profiling.vue
+++ b/mindinsight/ui/src/views/train-manage/profiling.vue
@@ -77,6 +77,7 @@ export default {
         // Current Select card info
         curCardNum: '',
         query: {},
+        initOver: false,
       },
     };
   },
@@ -137,7 +138,9 @@ export default {
               this.curDashboardInfo.curCardNum = '';
             }
           })
-          .catch(() => {});
+          .catch(() => {
+            this.curDashboardInfo.initOver = true;
+          });
     },
     /**
      * Get profile helper data
diff --git a/mindinsight/ui/src/views/train-manage/step-trace.vue b/mindinsight/ui/src/views/train-manage/step-trace.vue
index 66f55beb..f4d2624e 100644
--- a/mindinsight/ui/src/views/train-manage/step-trace.vue
+++ b/mindinsight/ui/src/views/train-manage/step-trace.vue
@@ -246,7 +246,8 @@ export default {
             val.initOver = false;
           });
           this.init();
-        } else {
+        }
+        if (newValue.initOver) {
           this.svg.initOver = true;
           this.tabsArr.forEach((val) => {
             val.initOver = true;