Browse Source

!642 UI Page style modification

Merge pull request !642 from 夏易凡/0908master
tags/v1.0.0
mindspore-ci-bot Gitee 5 years ago
parent
commit
60a3d5db16
7 changed files with 22 additions and 21 deletions
  1. +2
    -2
      mindinsight/ui/src/components/debuggerGridTableSimple.vue
  2. +2
    -2
      mindinsight/ui/src/components/gridTableSimple.vue
  3. +3
    -2
      mindinsight/ui/src/components/histogramUnit.vue
  4. +5
    -4
      mindinsight/ui/src/views/train-manage/compare-plate.vue
  5. +3
    -2
      mindinsight/ui/src/views/train-manage/histogram.vue
  6. +5
    -4
      mindinsight/ui/src/views/train-manage/scalar.vue
  7. +2
    -5
      mindinsight/ui/src/views/train-manage/summary-manage.vue

+ 2
- 2
mindinsight/ui/src/components/debuggerGridTableSimple.vue View File

@@ -575,11 +575,11 @@ export default {
line-height: 34px; line-height: 34px;
cursor: pointer; cursor: pointer;
:hover { :hover {
color: #3e98c5;
color: #00a5a7;
} }
} }
.active-color { .active-color {
color: #3e98c5;
color: #00a5a7;
} }
.filter-container { .filter-container {
float: left; float: left;


+ 2
- 2
mindinsight/ui/src/components/gridTableSimple.vue View File

@@ -483,11 +483,11 @@ export default {
line-height: 34px; line-height: 34px;
cursor: pointer; cursor: pointer;
:hover { :hover {
color: #3e98c5;
color: #00a5a7;
} }
} }
.active-color { .active-color {
color: #3e98c5;
color: #00a5a7;
} }
.filter-container { .filter-container {
float: left; float: left;


+ 3
- 2
mindinsight/ui/src/components/histogramUnit.vue View File

@@ -212,6 +212,7 @@ export default {
emphasis: { emphasis: {
iconStyle: { iconStyle: {
textPosition: 'top', textPosition: 'top',
borderColor: '#00A5A7',
}, },
}, },
// toolbox // toolbox
@@ -221,7 +222,7 @@ export default {
show: true, show: true,
title: this.$t('histogram.fullScreen'), title: this.$t('histogram.fullScreen'),
iconStyle: { iconStyle: {
borderColor: this.fullScreen ? '#3E98C5' : '#6D7278',
borderColor: this.fullScreen ? '#00A5A7' : '#6D7278',
}, },
icon: CommonProperty.fullScreenIcon, icon: CommonProperty.fullScreenIcon,
onclick() { onclick() {
@@ -305,7 +306,7 @@ export default {
this.charOption.grid.right = 140; this.charOption.grid.right = 140;
} }
this.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = this.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
'#3E98C5';
'#00A5A7';
} else { } else {
this.charOption.grid.right = 80; this.charOption.grid.right = 80;
this.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = this.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =


+ 5
- 4
mindinsight/ui/src/views/train-manage/compare-plate.vue View File

@@ -859,6 +859,7 @@ export default {
emphasis: { emphasis: {
iconStyle: { iconStyle: {
textPosition: 'top', textPosition: 'top',
borderColor: '#00A5A7',
}, },
}, },
// toolbox // toolbox
@@ -868,7 +869,7 @@ export default {
show: true, show: true,
title: this.$t('scalar.fullScreen'), title: this.$t('scalar.fullScreen'),
iconStyle: { iconStyle: {
borderColor: sampleObject.fullScreen ? '#3E98C5' : '#6D7278',
borderColor: sampleObject.fullScreen ? '#00A5A7' : '#6D7278',
}, },
icon: CommonProperty.fullScreenIcon, icon: CommonProperty.fullScreenIcon,
onclick() { onclick() {
@@ -879,7 +880,7 @@ export default {
show: true, show: true,
title: this.$t('scalar.toggleYaxisScale'), title: this.$t('scalar.toggleYaxisScale'),
iconStyle: { iconStyle: {
borderColor: sampleObject.log ? '#3E98C5' : '#6D7278',
borderColor: sampleObject.log ? '#00A5A7' : '#6D7278',
}, },
icon: icon:
'path://M0 150 c0 -18 7 -20 85 -20 78 0 85 2 85 20 0 18 -7 20 -85 20 -78 0 -85 -2 ' + 'path://M0 150 c0 -18 7 -20 85 -20 78 0 85 2 85 20 0 18 -7 20 -85 20 -78 0 -85 -2 ' +
@@ -964,7 +965,7 @@ export default {
sampleObject.fullScreen = !sampleObject.fullScreen; sampleObject.fullScreen = !sampleObject.fullScreen;
if (sampleObject.fullScreen) { if (sampleObject.fullScreen) {
sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
'#3E98C5';
'#00A5A7';
sampleObject.charData.charOption.grid.right = 80; sampleObject.charData.charOption.grid.right = 80;
} else { } else {
sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
@@ -1636,7 +1637,7 @@ export default {
const log = !sampleObject.log; const log = !sampleObject.log;
if (log) { if (log) {
sampleObject.charData.charOption.toolbox.feature.myTool2.iconStyle.borderColor = sampleObject.charData.charOption.toolbox.feature.myTool2.iconStyle.borderColor =
'#3E98C5';
'#00A5A7';
sampleObject.charData.charOption.yAxis.type = 'log'; sampleObject.charData.charOption.yAxis.type = 'log';
} else { } else {
sampleObject.charData.charOption.yAxis.type = 'value'; sampleObject.charData.charOption.yAxis.type = 'value';


+ 3
- 2
mindinsight/ui/src/views/train-manage/histogram.vue View File

@@ -1172,6 +1172,7 @@ export default {
emphasis: { emphasis: {
iconStyle: { iconStyle: {
textPosition: 'top', textPosition: 'top',
borderColor: '#00A5A7',
}, },
}, },
// toolbox // toolbox
@@ -1181,7 +1182,7 @@ export default {
show: true, show: true,
title: this.$t('histogram.fullScreen'), title: this.$t('histogram.fullScreen'),
iconStyle: { iconStyle: {
borderColor: sampleObject.fullScreen ? '#3E98C5' : '#6D7278',
borderColor: sampleObject.fullScreen ? '#00A5A7' : '#6D7278',
}, },
icon: CommonProperty.fullScreenIcon, icon: CommonProperty.fullScreenIcon,
onclick() { onclick() {
@@ -1360,7 +1361,7 @@ export default {
sampleObject.charOption.grid.right = 140; sampleObject.charOption.grid.right = 140;
} }
sampleObject.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = sampleObject.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
'#3E98C5';
'#00A5A7';
} else { } else {
sampleObject.charOption.grid.right = 80; sampleObject.charOption.grid.right = 80;
sampleObject.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = sampleObject.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =


+ 5
- 4
mindinsight/ui/src/views/train-manage/scalar.vue View File

@@ -1121,6 +1121,7 @@ export default {
iconStyle: { iconStyle: {
textPosition: 'top', textPosition: 'top',
textAlign: 'right', textAlign: 'right',
borderColor: '#00A5A7',
}, },
}, },
// toolbox // toolbox
@@ -1130,7 +1131,7 @@ export default {
show: true, show: true,
title: this.$t('scalar.fullScreen'), title: this.$t('scalar.fullScreen'),
iconStyle: { iconStyle: {
borderColor: sampleObject.fullScreen ? '#3E98C5' : '#6D7278',
borderColor: sampleObject.fullScreen ? '#00A5A7' : '#6D7278',
}, },
icon: CommonProperty.fullScreenIcon, icon: CommonProperty.fullScreenIcon,
onclick() { onclick() {
@@ -1141,7 +1142,7 @@ export default {
show: true, show: true,
title: this.$t('scalar.toggleYaxisScale'), title: this.$t('scalar.toggleYaxisScale'),
iconStyle: { iconStyle: {
borderColor: sampleObject.log ? '#3E98C5' : '#6D7278',
borderColor: sampleObject.log ? '#00A5A7' : '#6D7278',
}, },
icon: icon:
'path://M0 150 c0 -18 7 -20 85 -20 78 0 85 2 85 20 0 18 -7 20 -85 20 -78 0 -85 -2 ' + 'path://M0 150 c0 -18 7 -20 85 -20 78 0 85 2 85 20 0 18 -7 20 -85 20 -78 0 -85 -2 ' +
@@ -1260,7 +1261,7 @@ export default {
sampleObject.fullScreen = !sampleObject.fullScreen; sampleObject.fullScreen = !sampleObject.fullScreen;
if (sampleObject.fullScreen) { if (sampleObject.fullScreen) {
sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
'#3E98C5';
'#00A5A7';
sampleObject.charData.charOption.grid.right = 80; sampleObject.charData.charOption.grid.right = 80;
} else { } else {
sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor = sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
@@ -1810,7 +1811,7 @@ export default {
const tempOriData = sampleObject.charData.oriData; const tempOriData = sampleObject.charData.oriData;
const log = !sampleObject.log; const log = !sampleObject.log;
if (log) { if (log) {
tempOption.toolbox.feature.myTool2.iconStyle.borderColor = '#3E98C5';
tempOption.toolbox.feature.myTool2.iconStyle.borderColor = '#00A5A7';
tempOption.yAxis.type = 'log'; tempOption.yAxis.type = 'log';
} else { } else {
tempOption.yAxis.type = 'value'; tempOption.yAxis.type = 'value';


+ 2
- 5
mindinsight/ui/src/views/train-manage/summary-manage.vue View File

@@ -72,7 +72,7 @@ limitations under the License.
<el-table-column prop="operate" <el-table-column prop="operate"
:label="$t('summaryManage.operation')" :label="$t('summaryManage.operation')"
class-name="operate-container" class-name="operate-container"
width="400">
:width="operateWidth">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="menu-item operate-btn" <span class="menu-item operate-btn"
v-if="scope.row.viewDashboard" v-if="scope.row.viewDashboard"
@@ -217,6 +217,7 @@ export default {
type: 0, type: 0,
}, },
tableDom: null, tableDom: null,
operateWidth: localStorage.getItem('milang') === 'en-us' ? 415 : 300,
}; };
}, },
computed: {}, computed: {},
@@ -542,12 +543,8 @@ export default {
.list-table { .list-table {
height: 100%; height: 100%;
.operate-container { .operate-container {
text-align: right;
padding-right: 32px; padding-right: 32px;
} }
th.operate-container {
text-align: center;
}
} }
} }
.pagination-content { .pagination-content {


Loading…
Cancel
Save