From 3de65f9a5b5a46f770ba03a59c399a608659fcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 6 Jul 2022 17:38:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E4=B8=8D=E9=9A=8F=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?SAML2-link=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dselect-down=E6=98=BE=E7=A4=BA=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/theme/element-extra.css                    |  4 ++++
 src/components/DataForm/index.vue                 |  2 +-
 .../DatesLoginSummary/LoginActivePin.vue          | 15 ++++++++++++---
 .../dashboard/DatesLoginSummary/LoginMetric.vue   | 13 +++++++++++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/theme/element-extra.css b/public/theme/element-extra.css
index a1b1b4769..e3a6bdc72 100644
--- a/public/theme/element-extra.css
+++ b/public/theme/element-extra.css
@@ -419,3 +419,7 @@ td .el-button.el-button--mini {
   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;
+}
diff --git a/src/components/DataForm/index.vue b/src/components/DataForm/index.vue
index 0c211defc..6190395c6 100644
--- a/src/components/DataForm/index.vue
+++ b/src/components/DataForm/index.vue
@@ -145,7 +145,7 @@ export default {
     line-height: 18px;
   }
   .el-form ::v-deep .help-block a {
-    color: #1c84c6;
+    color: var(--color-primary);
   }
   .form-buttons {
     padding-top: 10px;
diff --git a/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue b/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue
index 9c9093fd4..8d3418192 100644
--- a/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue
+++ b/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue
@@ -32,7 +32,6 @@
 import 'echarts/lib/chart/pie'
 import 'echarts/lib/component/tooltip'
 import 'echarts/lib/component/title'
-import vars from '@/styles/variables.scss'
 
 export default {
   name: 'LoginActivePin',
@@ -57,7 +56,16 @@ export default {
     }
   },
   computed: {
+    themeColor() {
+      const documentStyle = document.documentElement.style
+      return {
+        primary: documentStyle.getPropertyValue('--color-primary'),
+        info: documentStyle.getPropertyValue('--color-info'),
+        success: documentStyle.getPropertyValue('--color-success')
+      }
+    },
     userOption() {
+      const { primary, info, success } = this.themeColor
       return {
         legend: {
           show: false
@@ -65,7 +73,7 @@ export default {
         title: {
           subtext: this.$t('dashboard.User')
         },
-        color: [vars['color-primary'], vars['color-info'], vars['color-success']],
+        color: [primary, info, success],
         tooltip: {
           trigger: 'item',
           formatter: '{a} <br/>{b}: {c} ({d}%)'
@@ -100,6 +108,7 @@ export default {
       }
     },
     AssetOption() {
+      const { primary, info, success } = this.themeColor
       return {
         legend: {
           show: false
@@ -107,7 +116,7 @@ export default {
         title: {
           subtext: this.$t('dashboard.Asset')
         },
-        color: [vars['color-primary'], vars['color-info'], vars['color-success']],
+        color: [primary, info, success],
         tooltip: {
           trigger: 'item',
           formatter: '{a} <br/>{b}: {c} ({d}%)'
diff --git a/src/views/dashboard/DatesLoginSummary/LoginMetric.vue b/src/views/dashboard/DatesLoginSummary/LoginMetric.vue
index de234d961..4f710545d 100644
--- a/src/views/dashboard/DatesLoginSummary/LoginMetric.vue
+++ b/src/views/dashboard/DatesLoginSummary/LoginMetric.vue
@@ -8,7 +8,7 @@
 <script>
 import 'echarts/lib/chart/line'
 import 'echarts/lib/component/legend'
-import vars from '@/styles/variables.scss'
+
 export default {
   name: 'LoginMetric',
   props: {
@@ -29,7 +29,16 @@ export default {
     }
   },
   computed: {
+    themeColor() {
+      const documentStyle = document.documentElement.style
+      return {
+        primary: documentStyle.getPropertyValue('--color-primary'),
+        info: documentStyle.getPropertyValue('--color-info'),
+        success: documentStyle.getPropertyValue('--color-success')
+      }
+    },
     options() {
+      const { primary, info, success } = this.themeColor
       return {
         title: {
           show: false
@@ -56,7 +65,7 @@ export default {
           bottom: '3%',
           containLabel: true
         },
-        color: [vars['color-primary'], vars['color-info'], vars['color-success']],
+        color: [primary, info, success],
         xAxis: [
           {
             type: 'category',