From 521e2e677a3739a477dcfe2497e60663d6718276 Mon Sep 17 00:00:00 2001
From: WeiFeng <huangweifeng4@huawei.com>
Date: Fri, 22 May 2020 18:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BA=AF=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mindinsight/ui/src/locales/zh-cn.json         |  3 +-
 .../src/views/train-manage/data-traceback.vue | 29 ++++++++--
 .../views/train-manage/model-traceback.vue    | 57 ++++++++++++-------
 .../ui/src/views/train-manage/profiler.vue    |  4 +-
 .../src/views/train-manage/summary-manage.vue |  2 +-
 5 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json
index 8156500..193dd96 100644
--- a/mindinsight/ui/src/locales/zh-cn.json
+++ b/mindinsight/ui/src/locales/zh-cn.json
@@ -75,7 +75,8 @@
     "metricLabel": "Metric",
     "userDefinedLabel": "User Defined",
     "hyperLabel": "Hyper",
-    "otherLabel": "其他"
+    "otherLabel": "其他",
+    "remarkTips": "提示：终止服务后备注及tag信息将被清除"
   },
   "dataTraceback": {
     "details": "详情",
diff --git a/mindinsight/ui/src/views/train-manage/data-traceback.vue b/mindinsight/ui/src/views/train-manage/data-traceback.vue
index 2840ddb..e80091b 100644
--- a/mindinsight/ui/src/views/train-manage/data-traceback.vue
+++ b/mindinsight/ui/src/views/train-manage/data-traceback.vue
@@ -58,7 +58,7 @@ limitations under the License.
                 <button type="text"
                         @click="deselectAll"
                         class="deselect-all-button"
-                        :class="[selectCheckAll?'checked-color':'button-text',
+                        :class="[!selectCheckAll?'checked-color':'button-text',
                            basearr.length>checkOptions.length ? 'btn-disabled' : '']"
                         :disabled="basearr.length>checkOptions.length">
                   {{ $t('public.deselectAll')}}
@@ -150,9 +150,15 @@ limitations under the License.
             </template>
           </el-table-column>
           <!-- remark column -->
-          <el-table-column :label="$t('public.remark')"
-                           fixed="right"
+          <el-table-column fixed="right"
                            width="220">
+            <template slot="header">
+              <div>
+                <div class="label-text">{{$t('public.remark')}}</div>
+                <br>
+                <div class="remark-tip">{{$t('modelTraceback.remarkTips')}}</div>
+              </div>
+            </template>
             <template slot-scope="scope">
               <!-- The system determines whether to display the pen icon and
               text box based on the values of editShow -->
@@ -660,7 +666,7 @@ export default {
     editRemarks(row) {
       row.editShow = false;
       row.isError = false;
-      this.beforeEditValue = row.network;
+      this.beforeEditValue = row.remark;
     },
 
     /**
@@ -691,7 +697,7 @@ export default {
      */
     cancelRemarksValue(row) {
       row.editShow = true;
-      row.network = this.beforeEditValue;
+      row.remark = this.beforeEditValue;
       row.isError = false;
     },
 
@@ -1768,6 +1774,17 @@ export default {
 };
 </script>
 <style lang="scss">
+.label-text {
+  line-height: 20px !important;
+  vertical-align: bottom;
+}
+.remark-tip {
+  line-height: 14px !important;
+  font-size: 12px;
+  white-space: pre-wrap !important;
+  vertical-align: bottom;
+  color: gray;
+}
 .el-color-dropdown__main-wrapper,
 .el-color-dropdown__value,
 .el-color-alpha-slider {
@@ -1846,7 +1863,7 @@ export default {
     padding: 4px;
     height: 30px;
     width: 30px;
-    border: 1px solid white;
+    border: 1px solid transparent;
   }
   .icon-image-container {
     margin: 16px 10px 18px;
diff --git a/mindinsight/ui/src/views/train-manage/model-traceback.vue b/mindinsight/ui/src/views/train-manage/model-traceback.vue
index d9f4512..ac54f3f 100644
--- a/mindinsight/ui/src/views/train-manage/model-traceback.vue
+++ b/mindinsight/ui/src/views/train-manage/model-traceback.vue
@@ -215,9 +215,15 @@ limitations under the License.
             </template>
           </el-table-column>
           <!-- remark column -->
-          <el-table-column :label="$t('public.remark')"
-                           fixed="right"
+          <el-table-column fixed="right"
                            width="220">
+            <template slot="header">
+              <div>
+                <div class="label-text">{{$t('public.remark')}}</div>
+                <br>
+                <div class="remark-tip">{{$t('modelTraceback.remarkTips')}}</div>
+              </div>
+            </template>
             <template slot-scope="scope">
               <div class="edit-text-container"
                    v-show="scope.row.editShow">{{scope.row.remark}}</div>
@@ -266,7 +272,7 @@ limitations under the License.
                 <div>
                   <div class="icon-image-container">
                     <div class="icon-image"
-                         :class="[item.number==scope.row.tag&&scope.row.showIcon ? 'iconBorder':'']"
+                         :class="[item.number===scope.row.tag&&scope.row.showIcon ? 'iconBorder':'']"
                          v-for="item in imageList"
                          :key="item.number"
                          @click="iconValueChange(scope.row,item.number,$event)">
@@ -491,7 +497,7 @@ export default {
      */
     iconChangeSave(row) {
       row.showIcon = false;
-      if (row.tag == this.iconValue || this.iconValue == 0) {
+      if (row.tag === this.iconValue || this.iconValue === 0) {
         return;
       }
       row.tag = this.iconValue;
@@ -556,7 +562,7 @@ export default {
       allList.forEach((item) => {
         Object.keys(this.table.columnOptions).filter((i) => {
           const labelValue = this.table.columnOptions[i].label;
-          if (labelValue == item) {
+          if (labelValue === item) {
             this.table.columnOptions[i].selected = true;
           }
         });
@@ -591,7 +597,7 @@ export default {
       allList.forEach((item) => {
         Object.keys(this.table.columnOptions).filter((i) => {
           const labelValue = this.table.columnOptions[i].label;
-          if (labelValue == item) {
+          if (labelValue === item) {
             this.table.columnOptions[i].selected = true;
           }
         });
@@ -847,14 +853,14 @@ export default {
       const columnArray = [];
       const hyperArray = [];
       columnList.forEach((item) => {
-        if (item.indexOf('metric/') == 0) {
+        if (item.indexOf('metric/') === 0) {
           metricArray.push(item);
-        } else if (item.indexOf('user_defined/') == 0) {
+        } else if (item.indexOf('user_defined/') === 0) {
           userDefinedArray.push(item);
         } else if (
-          item == 'epoch' ||
-          item == 'batch_size' ||
-          item == 'learning_rate'
+          item === 'epoch' ||
+          item === 'batch_size' ||
+          item === 'learning_rate'
         ) {
           hyperArray.push(item);
         } else {
@@ -1065,12 +1071,12 @@ export default {
                       const tempEchartData = this.setDataOfModel(res.data.object);
                       this.hidenDirChecked.forEach((dir) => {
                         tempEchartData.forEach((item, index) => {
-                          if (item.summary_dir == dir) {
+                          if (item.summary_dir === dir) {
                             tempEchartData.splice(index, 1);
                           }
                         });
                       });
-                      if (tempEchartData.length == 0) {
+                      if (tempEchartData.length === 0) {
                         this.showEchartPic = false;
                       } else {
                         this.showEchartPic = true;
@@ -1111,7 +1117,7 @@ export default {
                     if (this.hidenDirChecked.length) {
                       this.hidenDirChecked.forEach((dir) => {
                         tempList.forEach((item, index) => {
-                          if (item.summary_dir == dir) {
+                          if (item.summary_dir === dir) {
                             tempList.splice(index, 1);
                           }
                         });
@@ -1249,7 +1255,7 @@ export default {
       allList.forEach((item) => {
         Object.keys(this.table.columnOptions).filter((i) => {
           const labelValue = this.table.columnOptions[i].label;
-          if (labelValue == item) {
+          if (labelValue === item) {
             this.table.columnOptions[i].selected = true;
           }
         });
@@ -1278,7 +1284,7 @@ export default {
         const tempEchartData = this.echart.brushData;
         this.hidenDirChecked.forEach((dir) => {
           tempEchartData.forEach((item, index) => {
-            if (item.summary_dir == dir) {
+            if (item.summary_dir === dir) {
               tempEchartData.splice(index, 1);
             }
           });
@@ -1286,7 +1292,7 @@ export default {
         const tableTemp = this.table.data;
         this.hidenDirChecked.forEach((dir) => {
           tableTemp.forEach((item, index) => {
-            if (item.summary_dir == dir) {
+            if (item.summary_dir === dir) {
               tableTemp.splice(index, 1);
             }
           });
@@ -1413,7 +1419,7 @@ export default {
 
         chartAxis.forEach((key) => {
           if (
-            (i[key] || i[key] == 0) &&
+            (i[key] || i[key] === 0) &&
             this.keysOfMixed &&
             this.keysOfMixed.length &&
             this.keysOfMixed.includes(key)
@@ -1562,7 +1568,7 @@ export default {
         const selectedAxisId = params.parallelAxisId;
         if (list.length) {
           list.forEach((item, index) => {
-            if (item == selectedAxisId) {
+            if (item === selectedAxisId) {
               list.splice(index, 1);
             }
           });
@@ -1823,6 +1829,17 @@ export default {
 };
 </script>
 <style lang="scss">
+.label-text {
+  line-height: 20px !important;
+  vertical-align: bottom;
+}
+.remark-tip {
+  line-height: 14px !important;
+  font-size: 12px;
+  white-space: pre-wrap !important;
+  vertical-align: bottom;
+  color: gray;
+}
 .el-color-dropdown__main-wrapper,
 .el-color-dropdown__value,
 .el-color-alpha-slider {
@@ -1904,7 +1921,7 @@ export default {
     padding: 4px;
     height: 30px;
     width: 30px;
-    border: 1px solid white;
+    border: 1px solid transparent;
   }
   .icon-image-container {
     margin: 16px 10px 18px;
diff --git a/mindinsight/ui/src/views/train-manage/profiler.vue b/mindinsight/ui/src/views/train-manage/profiler.vue
index 5ba2f3f..0822049 100644
--- a/mindinsight/ui/src/views/train-manage/profiler.vue
+++ b/mindinsight/ui/src/views/train-manage/profiler.vue
@@ -951,10 +951,10 @@ export default {
   mounted() {
     if (
       this.$route.query &&
-      this.$route.query.profier_dir &&
+      this.$route.query.dir &&
       this.$route.query.id
     ) {
-      this.profile_dir = this.$route.query.profier_dir;
+      this.profile_dir = this.$route.query.dir;
       this.train_id = this.$route.query.id;
       document.title =
         decodeURIComponent(this.train_id) +
diff --git a/mindinsight/ui/src/views/train-manage/summary-manage.vue b/mindinsight/ui/src/views/train-manage/summary-manage.vue
index 2385b1d..1398809 100644
--- a/mindinsight/ui/src/views/train-manage/summary-manage.vue
+++ b/mindinsight/ui/src/views/train-manage/summary-manage.vue
@@ -179,7 +179,7 @@ export default {
      * @param {Object} row select row
      */
     goToProfiler(row) {
-      const profilerDir = encodeURIComponent(row.profier_dir);
+      const profilerDir = encodeURIComponent(row.profiler_dir);
       const trainId = encodeURIComponent(row.train_id);
       this.$router.push({
         path: '/profiler',
-- 
GitLab