diff --git a/frontend/src/App.vue b/frontend/src/App.vue index e678b4bac..8ec42fd5c 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -47,7 +47,7 @@ export default { +prefix-classes('visual-dl-page-') .container - padding-right 250px + padding-right 300px position relative background $-left-background-color .left @@ -60,7 +60,7 @@ export default { box-sizing border-box .right overflow scroll - width 250px + width 300px min-height 300px position absolute right 0 diff --git a/frontend/src/histogram/ui/ChartPage.vue b/frontend/src/histogram/ui/ChartPage.vue index 7a8560773..d5a5e5217 100644 --- a/frontend/src/histogram/ui/ChartPage.vue +++ b/frontend/src/histogram/ui/ChartPage.vue @@ -4,8 +4,8 @@
{{config.running ? 'Running' : 'Stopped'}} @@ -60,10 +60,8 @@ export default { @import '../../style/variables'; +prefix-classes('visual-dl-histogram-') .config-com - width 90% - margin 20px auto + padding 20px .run-toggle - width 100% margin-top 20px .label diff --git a/frontend/src/images/ui/ChartPage.vue b/frontend/src/images/ui/ChartPage.vue index 0784389c7..3116b82ff 100644 --- a/frontend/src/images/ui/ChartPage.vue +++ b/frontend/src/images/ui/ChartPage.vue @@ -3,8 +3,8 @@ {{config.running ? 'Running' : 'Stopped'}} @@ -52,10 +53,8 @@ export default { @import '../../style/variables'; +prefix-classes('visual-dl-image-') .config-com - width 90% - margin 20px auto + padding 20px .run-toggle - width 100% margin-top 20px .label diff --git a/frontend/src/scalars/Scalars.vue b/frontend/src/scalars/Scalars.vue index b44941bcd..bfa18c684 100644 --- a/frontend/src/scalars/Scalars.vue +++ b/frontend/src/scalars/Scalars.vue @@ -2,7 +2,7 @@
{ - let val = config[key]; - if (transformArr.indexOf(key) > -1) { - filteredConfig[key] = isArray(val) && val[0] === 'yes'; - } - else { - filteredConfig[key] = val; - } - }); - return filteredConfig; - }, }, created() { getPluginScalarsTags().then(({errno, data}) => { diff --git a/frontend/src/scalars/ui/Chart.vue b/frontend/src/scalars/ui/Chart.vue index 7833e86b9..f8e2fa524 100644 --- a/frontend/src/scalars/ui/Chart.vue +++ b/frontend/src/scalars/ui/Chart.vue @@ -3,18 +3,20 @@
- + settings_overscan - file_download @@ -70,7 +72,7 @@ export default { } ], // choose run type for download file - downloadType: '', + downloadType: {}, isExpand: false, originData: [] }; @@ -123,7 +125,7 @@ export default { if (this.runsItems.length === 0) { return; } - this.downloadType = this.runsItems[0].value; + this.downloadType = this.runsItems[0]; }, // Create a Scalar Chart, initialize it with default settings, then load datas @@ -581,19 +583,14 @@ export default { background: #fff; padding: 10px; .visual-dl-chart-actions - height 50px - margin-left 10% - .sm-form-item + vertical-align: middle + .chart-expand + float left + .download-selector float left width 100px - margin-top 0px - display block - .sm-button + margin-top -10px + .download-button float left - display block - height 20px - line-height 20px - margin-top 10px - padding 0 10px diff --git a/frontend/src/scalars/ui/ChartPage.vue b/frontend/src/scalars/ui/ChartPage.vue index 278788d20..af30bb6fe 100644 --- a/frontend/src/scalars/ui/ChartPage.vue +++ b/frontend/src/scalars/ui/ChartPage.vue @@ -3,9 +3,9 @@
-
- +
+ {{config.smoothing}}
@@ -18,31 +24,32 @@ - + + {{config.running ? 'Running' : 'Stopped'}} @@ -100,10 +107,13 @@ export default { +prefix-classes('visual-dl-page-') .config-com - width 90% - margin 20px auto + padding 20px + .slider-block + display flex + align-items center + .smoothing-slider + display inline .run-toggle - width 100% margin-top 20px