From 835235e3f989703c0417438e77643ce20b8394ac Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Tue, 22 Mar 2022 21:44:36 +0800 Subject: [PATCH 1/2] Modified the background of the bright color interface curve --- .../src/components/MyEMS/common/LineChart.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/myems-web/src/components/MyEMS/common/LineChart.js b/myems-web/src/components/MyEMS/common/LineChart.js index d4e8d53f..d4024b1a 100644 --- a/myems-web/src/components/MyEMS/common/LineChart.js +++ b/myems-web/src/components/MyEMS/common/LineChart.js @@ -30,7 +30,7 @@ const LineChart = ({ { borderWidth: 2, data: data[option], - borderColor: rgbaColor(isDark ? themeColors.primary : '#fff', 0.8), + borderColor: rgbaColor(isDark ? themeColors.primary : '#000', 0.8), backgroundColor: gradientFill } ] @@ -53,12 +53,12 @@ const LineChart = ({ xAxes: [ { ticks: { - fontColor: rgbaColor('#fff', 0.7), + fontColor: rgbaColor('#789', 0.8), fontStyle: 600 }, gridLines: { - color: rgbaColor('#fff', 0.1), - zeroLineColor: rgbaColor('#fff', 0.1), + color: rgbaColor('#000', 0.1), + zeroLineColor: rgbaColor('#000', 0.1), lineWidth: 1 } } @@ -67,7 +67,7 @@ const LineChart = ({ { display: true, gridLines: { - color: rgbaColor('#fff', 0.1) + color: rgbaColor('#000', 0.1) } } ] @@ -77,10 +77,10 @@ const LineChart = ({ return ( - + -

{reportingTitle}

+

{reportingTitle}

{baseTitle}

@@ -100,7 +100,7 @@ const LineChart = ({ ))} - } + }
@@ -109,3 +109,4 @@ const LineChart = ({ }; export default LineChart; + From 972a3265dd664a30c87034e8585d3d9f15578097 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 23 Mar 2022 09:30:39 +0800 Subject: [PATCH 2/2] Modified the background of the bright color interface curve2 --- myems-web/src/assets/scss/dark/_override.scss | 4 ++++ myems-web/src/components/MyEMS/common/LineChart.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/myems-web/src/assets/scss/dark/_override.scss b/myems-web/src/assets/scss/dark/_override.scss index 14a65fc2..43e77144 100644 --- a/myems-web/src/assets/scss/dark/_override.scss +++ b/myems-web/src/assets/scss/dark/_override.scss @@ -271,6 +271,10 @@ $theme-falcon-btn-colors: ( color: #fff !important; } +.text-lightSlateGray { + color: #789 !important; +} + a.text-white { color: #fff !important; diff --git a/myems-web/src/components/MyEMS/common/LineChart.js b/myems-web/src/components/MyEMS/common/LineChart.js index d4024b1a..ac58501c 100644 --- a/myems-web/src/components/MyEMS/common/LineChart.js +++ b/myems-web/src/components/MyEMS/common/LineChart.js @@ -80,7 +80,7 @@ const LineChart = ({ -

{reportingTitle}

+

{reportingTitle}

{baseTitle}