fix: 修复仪表盘不随主题颜色变化问题;修复SAML2-link标签颜色;修复select-down显示颜色

This commit is contained in:
“huailei000” 2022-07-06 17:38:31 +08:00 committed by 老广
parent 000c8da6ae
commit 3de65f9a5b
4 changed files with 28 additions and 6 deletions

View File

@ -419,3 +419,7 @@ td .el-button.el-button--mini {
background-color: #ddd; background-color: #ddd;
} }
.el-input-group__prepend div.el-select .el-input__inner,
.el-input-group__prepend div.el-select .el-input__inner:hover {
color: #303133;
}

View File

@ -145,7 +145,7 @@ export default {
line-height: 18px; line-height: 18px;
} }
.el-form ::v-deep .help-block a { .el-form ::v-deep .help-block a {
color: #1c84c6; color: var(--color-primary);
} }
.form-buttons { .form-buttons {
padding-top: 10px; padding-top: 10px;

View File

@ -32,7 +32,6 @@
import 'echarts/lib/chart/pie' import 'echarts/lib/chart/pie'
import 'echarts/lib/component/tooltip' import 'echarts/lib/component/tooltip'
import 'echarts/lib/component/title' import 'echarts/lib/component/title'
import vars from '@/styles/variables.scss'
export default { export default {
name: 'LoginActivePin', name: 'LoginActivePin',
@ -57,7 +56,16 @@ export default {
} }
}, },
computed: { computed: {
themeColor() {
const documentStyle = document.documentElement.style
return {
primary: documentStyle.getPropertyValue('--color-primary'),
info: documentStyle.getPropertyValue('--color-info'),
success: documentStyle.getPropertyValue('--color-success')
}
},
userOption() { userOption() {
const { primary, info, success } = this.themeColor
return { return {
legend: { legend: {
show: false show: false
@ -65,7 +73,7 @@ export default {
title: { title: {
subtext: this.$t('dashboard.User') subtext: this.$t('dashboard.User')
}, },
color: [vars['color-primary'], vars['color-info'], vars['color-success']], color: [primary, info, success],
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' formatter: '{a} <br/>{b}: {c} ({d}%)'
@ -100,6 +108,7 @@ export default {
} }
}, },
AssetOption() { AssetOption() {
const { primary, info, success } = this.themeColor
return { return {
legend: { legend: {
show: false show: false
@ -107,7 +116,7 @@ export default {
title: { title: {
subtext: this.$t('dashboard.Asset') subtext: this.$t('dashboard.Asset')
}, },
color: [vars['color-primary'], vars['color-info'], vars['color-success']], color: [primary, info, success],
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' formatter: '{a} <br/>{b}: {c} ({d}%)'

View File

@ -8,7 +8,7 @@
<script> <script>
import 'echarts/lib/chart/line' import 'echarts/lib/chart/line'
import 'echarts/lib/component/legend' import 'echarts/lib/component/legend'
import vars from '@/styles/variables.scss'
export default { export default {
name: 'LoginMetric', name: 'LoginMetric',
props: { props: {
@ -29,7 +29,16 @@ export default {
} }
}, },
computed: { computed: {
themeColor() {
const documentStyle = document.documentElement.style
return {
primary: documentStyle.getPropertyValue('--color-primary'),
info: documentStyle.getPropertyValue('--color-info'),
success: documentStyle.getPropertyValue('--color-success')
}
},
options() { options() {
const { primary, info, success } = this.themeColor
return { return {
title: { title: {
show: false show: false
@ -56,7 +65,7 @@ export default {
bottom: '3%', bottom: '3%',
containLabel: true containLabel: true
}, },
color: [vars['color-primary'], vars['color-info'], vars['color-success']], color: [primary, info, success],
xAxis: [ xAxis: [
{ {
type: 'category', type: 'category',