From bcffe753d06d28d71f702a158d5c46bd3353eea5 Mon Sep 17 00:00:00 2001
From: wei_ning_wang <wangweining2@huawei.com>
Date: Thu, 2 Apr 2020 10:05:33 +0800
Subject: [PATCH] =?UTF-8?q?scalar=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/train-manage/scalar-compare.vue |  6 ++++-
 .../ui/src/views/train-manage/scalar.vue      | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/mindinsight/ui/src/views/train-manage/scalar-compare.vue b/mindinsight/ui/src/views/train-manage/scalar-compare.vue
index e9b1bc8..7a9d33d 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 1a63f32..7978874 100644
--- a/mindinsight/ui/src/views/train-manage/scalar.vue
+++ b/mindinsight/ui/src/views/train-manage/scalar.vue
@@ -336,6 +336,11 @@ export default {
       this.getScalarsList();
 
       this.firstNum = 1;
+
+      // auto refresh
+      if (this.isTimeReload) {
+        this.autoUpdateSamples();
+      }
     });
   },
   methods: {
@@ -429,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'));
@@ -499,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 = {
-- 
GitLab