fix:修改comparison字体大小

This commit is contained in:
zyh
2023-03-22 18:23:42 +08:00
parent a1b14d04bc
commit 65a030af79
4 changed files with 3 additions and 23 deletions

View File

@@ -11,7 +11,7 @@
background:item.mapping ? item.mapping.color.bac : (statData.length===1 ? '' : colorList[index]), background:item.mapping ? item.mapping.color.bac : (statData.length===1 ? '' : colorList[index]),
height:item.height+'px', height:item.height+'px',
width:item.width + 'px', width:item.width + 'px',
fontSize: item.fontSize, fontSize: item.fontSize + 'px',
}" }"
> >
<div style="maxWidth:100%;z-index: 10;"> <div style="maxWidth:100%;z-index: 10;">
@@ -54,7 +54,7 @@
<!-- comparison --> <!-- comparison -->
<template v-if="comparisonShow(item)"> <template v-if="comparisonShow(item)">
<div :class="{'comparison-text-center':chartInfo.param.text==='none'}" class="comparison-text" :style="{fontSize: parseInt(item.fontSize)/3>12?parseInt(item.fontSize)/3+'px':'12px'}"> <div :class="{'comparison-text-center':chartInfo.param.text==='none'}" class="comparison-text" :style="{fontSize:item.fontSize>=36?'16px':'12px'}">
<span v-if="chartInfo.param.comparison==='hour'">{{$t('dashboard.hourComparison')}}</span> <span v-if="chartInfo.param.comparison==='hour'">{{$t('dashboard.hourComparison')}}</span>
<span v-if="chartInfo.param.comparison==='day'">{{$t('dashboard.dayComparison')}}</span> <span v-if="chartInfo.param.comparison==='day'">{{$t('dashboard.dayComparison')}}</span>
<span v-if="chartInfo.param.comparison==='week'">{{$t('dashboard.weekComparison')}}</span> <span v-if="chartInfo.param.comparison==='week'">{{$t('dashboard.weekComparison')}}</span>
@@ -356,7 +356,7 @@ export default {
} }
item.scale = scale < 1 ? 1 : parseFloat(scale) item.scale = scale < 1 ? 1 : parseFloat(scale)
fontSize = fontSize > 12 ? fontSize : this.minFontSzie fontSize = fontSize > 12 ? fontSize : this.minFontSzie
item.fontSize = fontSize + 'px' item.fontSize = fontSize
}) })
this.isInit = false this.isInit = false
}, },

View File

@@ -33,7 +33,6 @@
@afterImport="getTableData" @afterImport="getTableData"
:link="obj" :link="obj"
:showLock="from === fromRoute.asset" :showLock="from === fromRoute.asset"
:exportBoxShow="true"
@export="exportType" @export="exportType"
@panelLockChange="panelLockChange" @panelLockChange="panelLockChange"
> >
@@ -70,7 +69,6 @@
export-url="/visual/dashboard/export" export-url="/visual/dashboard/export"
import-url="/visual/dashboard/import" import-url="/visual/dashboard/import"
@afterImport="getTableData" @afterImport="getTableData"
:exportBoxShow="true"
@export="exportType" @export="exportType"
@panelLockChange="panelLockChange" @panelLockChange="panelLockChange"
> >

View File

@@ -273,9 +273,6 @@ export default {
default: '' default: ''
}, },
deleteObjs: Array, deleteObjs: Array,
exportBoxShow: {
type: Boolean, default: false
},
type: String type: String
}, },
computed: { computed: {
@@ -721,18 +718,6 @@ export default {
this.importBox.title = this.$t('overall.importExcel') this.importBox.title = this.$t('overall.importExcel')
} else if (type == 2) { // export } else if (type == 2) { // export
this.importBox.title = this.$t('overall.exportExcel') this.importBox.title = this.$t('overall.exportExcel')
// if (this.exportBoxShow) {
// this.formatArr = [
// { name: 'XLSX', value: 1 },
// { name: 'CSV', value: 2 },
// { name: 'JSON', value: 3 },
// { name: 'PDF', value: 4 },
// { name: 'Html', value: 5 }]
// } else {
// this.formatArr = [{ name: 'XLSX', value: 1 },
// { name: 'CSV', value: 2 },
// { name: 'JSON', value: 3 }]
// }
} }
}, },
getTimeString () { getTimeString () {

View File

@@ -70,7 +70,6 @@
export-file-name="chart" export-file-name="chart"
export-url="/visual/dashboard/export" export-url="/visual/dashboard/export"
import-url="/visual/dashboard/import" import-url="/visual/dashboard/import"
:exportBoxShow="true"
@export="exportType" @export="exportType"
@afterImport="afterImport" @afterImport="afterImport"
> >
@@ -325,8 +324,6 @@ export default {
batchDeleteObjs: [], batchDeleteObjs: [],
nowTimeType: {}, nowTimeType: {},
showTopLine: false, showTopLine: false,
// 导出html 以及 pdf的弹窗
exportBoxShow: false,
// 查看模式 // 查看模式
mode: '', mode: '',
variables: [], variables: [],