diff --git a/src/App.vue b/src/App.vue
index 75e9cfd..ee50ef7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,13 +25,6 @@
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
}
- html,
- body {
- height: 100%;
- }
- body{
- background: #f6f8f9;
- }
.el-pager li:focus {
border: none;
}
@@ -41,8 +34,4 @@
.svg-icon:focus {
border: none;
}
- * {
- margin: 0;
- padding: 0;
- }
diff --git a/src/layout/Header/index.vue b/src/layout/Header/index.vue
index 1f18d2a..05c6771 100644
--- a/src/layout/Header/index.vue
+++ b/src/layout/Header/index.vue
@@ -128,8 +128,9 @@
cursor: pointer;
}
.header {
- height: 60px;
+ height: 50px;
width: 100%;
+ border-bottom: 1px solid #eee;
display: flex;
align-items: center;
padding: 0 10px;
diff --git a/src/layout/Main/index.vue b/src/layout/Main/index.vue
index 2afae56..5521876 100644
--- a/src/layout/Main/index.vue
+++ b/src/layout/Main/index.vue
@@ -1,5 +1,5 @@
-
diff --git a/src/router/index.ts b/src/router/index.ts
index 56b8d64..50f922a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -108,9 +108,7 @@ export const asyncRoutes = [
dataScreenRouter,
chartsRouter,
tableRouter,
-
chatRouter,
- // componentsRouter,
othersRouter,
nestedRouter,
excelRouter,
@@ -120,7 +118,6 @@ export const asyncRoutes = [
clipboardTable,
systemRouter,
permissionRouter,
-
{
path: '/:pathMatch(.*)',
redirect: '/error/404'
diff --git a/src/styles/common.scss b/src/styles/common.scss
index dd90a11..528dcdb 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -1,3 +1,18 @@
+html,
+body {
+ height: 100%;
+ width: 100%;
+ overflow: visible;
+ overflow-x: hidden;
+ margin: 0;
+ padding: 0;
+}
+
+
+body{
+ background: #f6f8f9;
+}
+
/* 常用 flex */
.flex-center {
@@ -15,9 +30,30 @@
align-items: center;
}
-
+/* 移动端的时候由于屏幕变小隐藏头部导航栏 */
@media screen and ( max-width: 540px ) {
.app-breadcrumb{
display: none!important;
}
}
+
+
+/** 设置滚动条 **/
+::-webkit-scrollbar {
+ width: 7px;
+ height: 8px;
+}
+
+
+::-webkit-scrollbar-track {
+ background-color: rgb(0 0 0 / 5%);
+}
+
+::-webkit-scrollbar-thumb {
+ // background: rgba(0, 0, 0, 0.6);
+ background-color: rgb(144 147 153 / 30%);
+ // background-color: rgba(144, 147, 153, 0.3);
+ border-radius: 2px;
+ box-shadow: inset 0 0 6px rgb(0 0 0 / 20%);
+}
+
diff --git a/src/views/charts/migration.vue b/src/views/charts/migration.vue
index c8050d2..20d9c36 100644
--- a/src/views/charts/migration.vue
+++ b/src/views/charts/migration.vue
@@ -11,12 +11,12 @@