From 71ada91c97085e75a3af5515d81cc6153b174b9c Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Wed, 16 Apr 2025 11:15:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=A0=B7=E5=BC=8F):=20=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=94=B6=E7=BC=A9=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=9B=B4=E5=8A=A0=E7=9A=AE=E8=82=A4=E6=94=B9?=
=?UTF-8?q?=E5=8F=98=E3=80=81=E4=BE=A7=E8=BE=B9=E8=8F=9C=E5=8D=95=E7=AE=AD?=
=?UTF-8?q?=E5=A4=B4=E9=A2=9C=E8=89=B2=E3=80=81=E8=AE=BE=E5=A4=87=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E9=A1=B5=E8=AE=BE=E5=A4=87=E7=A0=81=E5=8F=8A=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/theme.scss | 4 ++++
src/components/Hamburger/index.vue | 6 +++++-
src/layout/components/Sidebar/index.vue | 6 +++++-
src/views/iot/device/index.vue | 15 +++++++++------
src/views/tenant/device/index.vue | 13 +++++++------
5 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss
index c4b18b74..5b3f5514 100644
--- a/src/assets/styles/theme.scss
+++ b/src/assets/styles/theme.scss
@@ -8,6 +8,9 @@
.sidebar-title{
color: $menuGreenLogoColor !important;
}
+ .el-submenu__icon-arrow{
+ color: $menuGreenText !important;
+ }
.sidebar-container{
background-color: $menuGreenBg !important;
@@ -38,6 +41,7 @@
background: $menuGreenActive !important;
color: $menuGreenActiveTxt !important;
}
+
}
.router-link-active>.is-active{
color: $menuGreenActiveTxt !important;
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 54f760c7..04100971 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -8,7 +8,7 @@
width="64"
xmlns="http://www.w3.org/2000/svg"
>
-
+
@@ -20,6 +20,10 @@ export default {
isActive: {
type: Boolean,
default: false
+ },
+ svgColor: {
+ type: String,
+ default: '#000000' // default black color
}
},
methods: {
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7db4ca1b..0a8e0491 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -20,7 +20,7 @@
-
+
@@ -55,6 +55,9 @@ export default {
isCollapse() {
return !this.sidebar.opened;
},
+ svgColor() {
+ return process.env.VUE_APP_THEME_CLASS !=='theme-blue-white'?'#ffffff':'#000000';
+ }
},
methods: {
toggleSideBar() {
@@ -90,3 +93,4 @@ export default {
},
};
+
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 9c7ae4cb..808fd7a4 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -152,27 +152,30 @@
type="index"
width="60px"
>
-
+
+
+
{{ scope.row.deviceName }}
-
+
-
-
+
+
+
diff --git a/src/views/tenant/device/index.vue b/src/views/tenant/device/index.vue
index 8aa35012..f1c8ea65 100644
--- a/src/views/tenant/device/index.vue
+++ b/src/views/tenant/device/index.vue
@@ -91,26 +91,27 @@
type="index"
width="80px"
>
-
+
+
{{ scope.row.deviceName }}
-
-
+
-
+
+
-
+
在线