diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index c1ed423..a5a69d8 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -11,13 +11,16 @@
@@ -28,6 +31,7 @@
+
+
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index 33e0083..ef4de0c 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -6,9 +6,11 @@
class="avue-tags__contentmenu"
:style="{left:contentmenuX+'px',top:contentmenuY+'px'}">
{{$t('tagsView.closeOthers')}}
+ @click="closeOthersTags">{{$t('tagsView.closeOthers')}}
+
{{$t('tagsView.closeAll')}}
+ @click="closeAllTags">{{$t('tagsView.closeAll')}}
+
@@ -32,6 +34,7 @@
+ {{$t('tagsView.search')}}
{{$t('tagsView.closeOthers')}}
{{$t('tagsView.closeAll')}}
@@ -41,125 +44,127 @@
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 4067ad1..e6614eb 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -81,87 +81,93 @@
{{$t('navbar.userinfo')}}
+
+ {{$t('navbar.setting')}}
+
{{$t('navbar.logOut')}}
+ divided>{{$t('navbar.logOut')}}
+
\ No newline at end of file
+
diff --git a/src/styles/media.scss b/src/styles/media.scss
index 5d8f365..cfb1135 100644
--- a/src/styles/media.scss
+++ b/src/styles/media.scss
@@ -5,166 +5,177 @@
.avue-layout
.login-logo,
.avue-main {
- transition: all .3s;
+ transition: all .3s;
}
+
.avue-contail {
- width: 100%;
- height: 100%;
- background: #f0f2f5;
- background-size: 100%;
- background-repeat: no-repeat;
+ width: 100%;
+ height: 100%;
+ background: #f0f2f5;
+ background-size: 100%;
+ background-repeat: no-repeat;
}
.avue-left {
- position: fixed;
- left: 0;
- top: 0;
- width: 240px;
- height: 100%;
- z-index: 1025;
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 240px;
+ height: 100%;
+ z-index: 1025;
}
.avue--collapse {
- .avue-left,
- .avue-logo {
- width: 60px;
- }
- .avue-header {
- padding-left: 60px;
- }
- .avue-main {
- width: calc(100% - 60px);
- left: 60px;
- }
+ .avue-left,
+ .avue-logo {
+ width: 60px;
+ }
+
+ .avue-header {
+ padding-left: 60px;
+ }
+
+ .avue-main {
+ width: calc(100% - 60px);
+ left: 60px;
+ }
}
.avue-header {
- padding-left: 240px;
- width: 100%;
- background-color: #fff;
- box-sizing: border-box;
+ padding-left: 240px;
+ width: 100%;
+ background-color: #fff;
+ box-sizing: border-box;
}
.avue-main {
- position: absolute;
- left: 240px;
- padding: 0;
- padding-bottom: 20px;
- width: calc(100% - 240px);
- height: calc(100% - 64px);
- box-sizing: border-box;
- overflow: hidden;
- background: #f0f2f5;
- z-index:1026;
- &--fullscreen{
- width: 100%;
- left:0;
- }
+ position: absolute;
+ left: 240px;
+ padding: 0;
+ padding-bottom: 20px;
+ width: calc(100% - 240px);
+ height: calc(100% - 64px);
+ box-sizing: border-box;
+ overflow: hidden;
+ background: #f0f2f5;
+ z-index: 1026;
+
+ &--fullscreen {
+ width: 100%;
+ left: 0;
+ }
}
.avue-view {
- width: 100%;
- box-sizing: border-box;
+ padding: 10px !important;
+ width: 100%;
+ box-sizing: border-box;
}
.avue-footer {
- margin: 0 auto;
- padding: 0 22px;
- width: 1300px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .logo {
- margin-left: -50px;
- }
- .copyright {
- color: #666;
- line-height: 1.5;
- font-size: 12px;
- }
+ margin: 0 auto;
+ padding: 0 22px;
+ width: 1300px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .logo {
+ margin-left: -50px;
+ }
+
+ .copyright {
+ color: #666;
+ line-height: 1.5;
+ font-size: 12px;
+ }
}
.avue-shade {
- position: fixed;
- display: none;
- width: 100%;
- height: 100%;
- left: 0;
- right: 0;
- top: 0;
- bottom: 0;
- background-color: rgba(0, 0, 0, .3);
- z-index: 1024;
- &--show {
- display: block;
- }
+ position: fixed;
+ display: none;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ background-color: rgba(0, 0, 0, .3);
+ z-index: 1024;
+
+ &--show {
+ display: block;
+ }
}
@media screen and (max-width: 992px) {
- $width: 240px;
- // ele的自适应
- .el-dialog,
- .el-message-box {
- width: 98% !important;
- }
- //登录页面
- .login-left {
- display: none !important;
- }
- .login-logo {
- padding-top: 30px !important;
- margin-left: -30px;
- }
- .login-weaper{
- margin: 0 auto;
- width: 96% !important;
- }
- .login-border {
- border-radius: 5px;
- padding: 40px;
- margin: 0 auto;
- float: none !important;
- width: 100% !important;
- }
- .login-main {
- width: 100% !important;
- }
- //主框架
- .avue-tags {
- display: none;
- }
+ $width: 240px;
+ // ele的自适应
+ .el-dialog,
+ .el-message-box {
+ width: 98% !important;
+ }
+ //登录页面
+ .login-left {
+ display: none !important;
+ }
+ .login-logo {
+ padding-top: 30px !important;
+ margin-left: -30px;
+ }
+ .login-weaper {
+ margin: 0 auto;
+ width: 96% !important;
+ }
+ .login-border {
+ border-radius: 5px;
+ padding: 40px;
+ margin: 0 auto;
+ float: none !important;
+ width: 100% !important;
+ }
+ .login-main {
+ width: 100% !important;
+ }
+ //主框架
+ .avue-tags {
+ display: none;
+ }
+ .avue-left,
+ .avue-logo {
+ left: -$width;
+ }
+ .avue-main {
+ left: 0;
+ width: 100%;
+ }
+ .avue-header {
+ margin-bottom: 15px;
+ padding-left: 15px;
+ }
+ .top-bar__item {
+ display: none;
+ }
+ .avue--collapse {
.avue-left,
.avue-logo {
- left: -$width;
+ width: $width;
+ left: 0;
}
+
.avue-main {
- left: 0;
- width: 100%;
+ left: $width;
+ width: 100%;
}
+
.avue-header {
- margin-bottom: 15px;
- padding-left: 15px;
+ padding: 0;
+ transform: translate3d(230px, 0, 0);
}
- .top-bar__item {
- display: none;
- }
- .avue--collapse {
- .avue-left,
- .avue-logo {
- width: $width;
- left: 0;
- }
- .avue-main {
- left: $width;
- width: 100%;
- }
- .avue-header {
- padding: 0;
- transform: translate3d(230px, 0, 0);
- }
- .avue-shade {
- display: block;
- }
+
+ .avue-shade {
+ display: block;
}
-}
\ No newline at end of file
+ }
+}
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index 167046b..b245c40 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index 332805e..00277e1 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index a63b210..ffb8e33 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -14,6 +14,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index d4f94dd..a38c39f 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
@@ -174,6 +175,9 @@
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
onLoad(page, params = {}) {
this.loading = true;
followList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 83da12b..67c18b8 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -12,6 +12,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index ab90a54..dc778f5 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -12,6 +12,7 @@
@search-reset="searchReset"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
@@ -134,6 +135,9 @@
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
onLoad(page, params = {}) {
this.loading = true;
getApiList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index 43b2b8a..babcac5 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -12,6 +12,7 @@
@search-reset="searchReset"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
@@ -140,6 +141,9 @@
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
onLoad(page, params = {}) {
this.loading = true;
getErrorList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index b710933..f944673 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -12,6 +12,7 @@
@search-reset="searchReset"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
@@ -132,6 +133,9 @@
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
onLoad(page, params = {}) {
this.loading = true;
getUsualList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index 9b268c3..e2554ef 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index ced73e2..54709ba 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 03f8689..d89a0a1 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index d9306e0..9f16530 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 280d7b8..c346dc2 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index a86417d..604eaab 100644
--- a/src/views/system/param.vue
+++ b/src/views/system/param.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index bb3e559..93f2c9b 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -15,6 +15,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index dcd6ecb..5845651 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 765fc95..6ccaffc 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index f037bb2..c7d739e 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/tool/datasource.vue b/src/views/tool/datasource.vue
index 8a926bd..11a2012 100644
--- a/src/views/tool/datasource.vue
+++ b/src/views/tool/datasource.vue
@@ -16,6 +16,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
{
diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue
index 61a12ab..94c16e3 100644
--- a/src/views/work/claim.vue
+++ b/src/views/work/claim.vue
@@ -11,6 +11,7 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">