diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index bfa69c947..6306badcc 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -17,32 +17,35 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - - - - -
- + + + + +
+ +
+
{{$t('cancel')}} {{$t('submit')}} diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue index d3322a834..16dbf30d8 100644 --- a/jero-web/src/components/addForm/index.vue +++ b/jero-web/src/components/addForm/index.vue @@ -173,7 +173,7 @@
- +
* @@ -182,11 +182,11 @@
diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index 8c3ba7aeb..eccedcb5c 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -25,9 +25,9 @@ } }, watch: { - '$route': function(to,form) { - if (to.meta.title == '首页') { - this.Navigation = to.meta.title + '$route': function(val) { + if (val.meta.title == '首页') { + this.Navigation = val.meta.title this.subNavigation = null } else { this.updateMenu() diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index e68d1e684..f6942588b 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -119,6 +119,7 @@ import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN' import enUS from 'ant-design-vue/es/locale/en_US' import 'moment/locale/zh-cn' + import { generateIndexRouter } from '@/utils/util' import store from '../../store' import router from '../../router' @@ -301,15 +302,6 @@ localStorage.setItem('language', 'en-us') break } - router.beforeEach((to,from,next)=>{ - console.log(to) - console.log(from) - return - if(to.meta.title){ - document.title=to.meta.title - } - next() - }) store.dispatch('GetPermissionList').then(res => { this.$root.Bus.$emit('switchLanguage', localeval) this.isLoading = false