diff --git a/vue/src/asset/style/element-ui.scss b/vue/src/asset/style/element-ui.scss
index ce94831..e0783d5 100644
--- a/vue/src/asset/style/element-ui.scss
+++ b/vue/src/asset/style/element-ui.scss
@@ -94,7 +94,6 @@
}
.el-menu {
- height: 100%;
width: 100%;
border: none !important;
overflow: hidden;
diff --git a/vue/src/asset/style/variables.scss b/vue/src/asset/style/variables.scss
index 36b29f7..83c026c 100644
--- a/vue/src/asset/style/variables.scss
+++ b/vue/src/asset/style/variables.scss
@@ -47,6 +47,11 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
}
}
+//亮色边框的颜色,使用的element-ui原定义
+$border-color-light: #dcdfe6;
+//暗色边框的颜色
+$border-color-dark: #101117;
+
//菜单中icon的大小
$menu-icon-size: 14px;
//菜单中icon和文字的距离
@@ -100,5 +105,5 @@ $dialog-top: 100px;
warning: $--color-warning;
pageViewMargin: $page-view-margin;
dialogTop: $dialog-top;
- menuPadding:$menu-padding;
+ menuPadding: $menu-padding;
}
diff --git a/vue/src/component/TreeSelect/index.vue b/vue/src/component/TreeSelect/index.vue
index 8abe29a..e29a944 100644
--- a/vue/src/component/TreeSelect/index.vue
+++ b/vue/src/component/TreeSelect/index.vue
@@ -199,6 +199,8 @@ export default {
diff --git a/vue/src/layout/component/Navbar/component/Hamburger.vue b/vue/src/layout/component/Navbar/component/Hamburger.vue
deleted file mode 100644
index fc879ba..0000000
--- a/vue/src/layout/component/Navbar/component/Hamburger.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
diff --git a/vue/src/layout/component/Navbar/index.vue b/vue/src/layout/component/Navbar/index.vue
index 91f50cd..924c0ed 100644
--- a/vue/src/layout/component/Navbar/index.vue
+++ b/vue/src/layout/component/Navbar/index.vue
@@ -1,22 +1,21 @@