-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
- {{userInfo.userName}}
-
-
-
-
- {{$t('navbar.dashboard')}}
-
-
- {{$t('navbar.userinfo')}}
-
- {{$t('navbar.switchDept')}}
-
- {{$t('navbar.logOut')}}
-
-
-
-
-
-
+
{{tag.label}}
+
diff --git a/src/styles/media.scss b/src/styles/media.scss
index d5cfad9..6bc3745 100644
--- a/src/styles/media.scss
+++ b/src/styles/media.scss
@@ -43,10 +43,11 @@
}
.avue-header {
- padding-left: 240px;
+ padding-left: 278px;
+ padding-right: 38px;
width: 100%;
- background-color: #fff;
box-sizing: border-box;
+
}
.avue-main {
@@ -69,7 +70,7 @@
}
.avue-view {
- padding: 0 10px !important;
+ padding: 0 38px !important;
width: 100%;
box-sizing: border-box;
}
@@ -180,3 +181,10 @@
}
}
}
+.el-card.is-always-shadow{
+ box-shadow: 0 0 0 0 rgb(255, 255, 255) !important;
+ padding: 0!important;
+}
+// .el-card__body {
+// padding: 0!important;
+// }
\ No newline at end of file
diff --git a/src/styles/top.scss b/src/styles/top.scss
index a3f9b81..0f8baad 100644
--- a/src/styles/top.scss
+++ b/src/styles/top.scss
@@ -1,108 +1,95 @@
-$height:64px;
+$height: 64px;
.avue-top {
- padding: 0 20px;
- position: relative;
- box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
- color: rgba(0, 0, 0, .65);
- font-size: 28px;
- height: $height;
- line-height: $height;
- box-sizing: border-box;
- white-space: nowrap;
- .el-menu-item{
- i,span{
- font-size: 13px;
- }
- }
- .el-menu--horizontal>.el-menu-item {
- height: $height;
- line-height: $height;
- }
+ height: 92px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
}
.avue-breadcrumb {
- height: 100%;
- i{
- font-size: 30px !important;
- }
- &--active {
- transform:rotate(90deg);
- }
+ height: 100%;
+ i {
+ font-size: 30px !important;
+ }
+ &--active {
+ transform: rotate(90deg);
+ }
}
.top-menu {
- box-sizing: border-box;
- .el-menu-item {
- padding: 0 10px;
- border:none !important;
- }
+ box-sizing: border-box;
+ .el-menu-item {
+ padding: 0 10px;
+ border: none !important;
+ }
}
.top-search {
- line-height: $height;
- position: absolute !important;
- left: 20px;
- top:0;
- width: 400px !important;
- .el-input__inner {
- font-size: 13px;
- border: none;
- background-color: transparent;
- }
+ line-height: $height;
+ position: absolute !important;
+ left: 20px;
+ top: 0;
+ width: 400px !important;
+ .el-input__inner {
+ font-size: 13px;
+ border: none;
+ background-color: transparent;
+ }
}
.top-bar__img {
- margin: 0 8px 0 5px;
- padding: 2px;
- width: 30px;
- height: 30px;
- border-radius: 100%;
- box-sizing: border-box;
- border: 1px solid #eee;
- vertical-align: middle;
+ margin: 0 8px 0 5px;
+ padding: 2px;
+ width: 30px;
+ height: 30px;
+ border-radius: 100%;
+ box-sizing: border-box;
+ border: 1px solid #eee;
+ vertical-align: middle;
}
.top-bar__left,
.top-bar__right {
- height: $height;
- position: absolute;
- top: 0;
- i{
- line-height: $height;
- }
+ height: $height;
+ position: absolute;
+ top: 0;
+ i {
+ line-height: $height;
+ }
}
.top-bar__left {
- left: 20px;
+ left: 20px;
}
.top-bar__right {
- right: 20px;
- display: flex;
- align-items: center;
+ right: 20px;
+ display: flex;
+ align-items: center;
}
.top-bar__item {
- position: relative;
- display: inline-block;
- height: $height;
- margin:0 10px;
- font-size: 16px;
- &--show {
- display: inline-block !important;
- }
- .el-badge__content.is-fixed{
- top:12px;
- right: 5px;
- }
+ position: relative;
+ display: inline-block;
+ height: $height;
+ margin: 0 10px;
+ font-size: 16px;
+ &--show {
+ display: inline-block !important;
+ }
+ .el-badge__content.is-fixed {
+ top: 12px;
+ right: 5px;
+ }
}
.top-bar__title {
- height: 100%;
- padding:0 40px;
- box-sizing: border-box;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- font-size: inherit;
- font-weight: 400;
+ height: 100%;
+ padding: 0 40px;
+ box-sizing: border-box;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: inherit;
+ font-weight: 400;
}
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 8d70338..9cfd751 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -62,7 +62,7 @@
query: {},
loading: true,
selectionList: [],
- parentId: 0,
+ parentId: null,
page: {
pageSize: 10,
currentPage: 1,