diff --git a/jero-web/src/assets/watermark.js b/jero-web/src/assets/watermark.js index 4d99465e8..b300eae05 100644 --- a/jero-web/src/assets/watermark.js +++ b/jero-web/src/assets/watermark.js @@ -16,8 +16,9 @@ let setWatermark = (str) => { document.getElementsByClassName('ant-layout-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' } else { - document.getElementsByClassName('detail-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' - + if (document.getElementsByClassName('detail-content') && document.getElementsByClassName('detail-content').length > 0) { + document.getElementsByClassName('detail-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + } } return id } @@ -28,7 +29,9 @@ watermark.set = (str) => { setInterval(() => { let value = JSON.parse(localStorage.getItem('pro__Login_Userinfo')) if (document.getElementById(id) === null) { - id = setWatermark(value.value.username + ' ' + value.value.realname) + if (value) { + id = setWatermark(value.value.username + ' ' + value.value.realname) + } } }, 2000) window.onresize = () => { diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index eccedcb5c..4ff89fb50 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -21,12 +21,12 @@ Navigation: '文档管理', subNavigation: null, selectedKeys: [], - openKeys:[], + openKeys: [] } }, watch: { '$route': function(val) { - if (val.meta.title == '首页') { + if (val.meta.title == '首页' || val.meta.title === ' home page') { this.Navigation = val.meta.title this.subNavigation = null } else { @@ -35,7 +35,8 @@ } }, mounted() { - if (this.$route.meta.title == '首页') { + console.log(this.$route.meta) + if (this.$route.meta.title === '首页' || this.$route.meta.title === ' home page') { this.Navigation = this.$route.meta.title this.subNavigation = null } else { @@ -56,7 +57,7 @@ routes.forEach(item => { this.openKeys.push(item) }) - this.Navigation =this.openKeys[1].meta.title + this.Navigation = this.openKeys[1].meta.title this.subNavigation = this.$route.meta.title } } diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 8f8be28a9..2176ae447 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -121,7 +121,7 @@ import 'moment/locale/zh-cn' import { generateIndexRouter } from '@/utils/util' import store from '../../store' - import router,{resetRouter} from '../../router' + import router, { resetRouter } from '../../router' moment.locale('zh-cn') const EN = 'en-us' @@ -170,6 +170,15 @@ } } this.localeval = localStorage.getItem('language') + if (this.localeval == 'zh-cn') { + this.$i18n.locale = ZH + this.locale = zhCN + moment.locale('zh-cn') + } else if (this.localeval == 'en-us') { + this.locale = enUS + moment.locale('en-us') + this.$i18n.locale = EN + } }, computed: { ...mapState({ @@ -292,7 +301,6 @@ /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/ moment, changeLocale(localeval) { - console.log(localeval) this.isLoading = true switch (localeval) { case 'zh-cn': @@ -303,10 +311,10 @@ break } store.dispatch('GetPermissionList').then(res => { - const menuData = res.result.menu; + const menuData = res.result.menu resetRouter() - let constRoutes = []; - constRoutes = generateIndexRouter(menuData); + let constRoutes = [] + constRoutes = generateIndexRouter(menuData) router.addRoutes(constRoutes) this.$root.Bus.$emit('switchLanguage', localeval) this.isLoading = false diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 10607c75b..d0ac7014b 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -1,15 +1,15 @@ import Vue from 'vue' -import router from './router' +import router, { resetRouter } from './router' import store from './store' import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import notification from 'ant-design-vue/es/notification' -import { ACCESS_TOKEN,INDEX_MAIN_PAGE_PATH } from '@/store/mutation-types' -import { generateIndexRouter } from "@/utils/util" +import { ACCESS_TOKEN, INDEX_MAIN_PAGE_PATH } from '@/store/mutation-types' +import { generateIndexRouter } from '@/utils/util' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/user/login', '/user/register', '/user/register-result','/user/alteration'] // no redirect whitelist +const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // no redirect whitelist router.beforeEach((to, from, next) => { NProgress.start() // start progress bar @@ -22,32 +22,33 @@ router.beforeEach((to, from, next) => { } else { if (store.getters.permissionList.length === 0) { store.dispatch('GetPermissionList').then(res => { - const menuData = res.result.menu; - if (menuData === null || menuData === "" || menuData === undefined) { - return; - } - let constRoutes = []; - constRoutes = generateIndexRouter(menuData); - // 添加主界面路由 - store.dispatch('UpdateAppRouter', { constRoutes }).then(() => { - // 根据roles权限生成可访问的路由表 - // 动态添加可访问路由表 - router.addRoutes(store.getters.addRouters) - const redirect = decodeURIComponent(from.query.redirect || to.path) - if (to.path === redirect) { - // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record - next({ ...to, replace: true }) - } else { - // 跳转到目的路由 - next({ path: redirect }) - } - }) - }) + const menuData = res.result.menu + if (menuData === null || menuData === '' || menuData === undefined) { + return + } + resetRouter() + let constRoutes = [] + constRoutes = generateIndexRouter(menuData) + // 添加主界面路由 + store.dispatch('UpdateAppRouter', { constRoutes }).then(() => { + // 根据roles权限生成可访问的路由表 + // 动态添加可访问路由表 + router.addRoutes(store.getters.addRouters) + const redirect = decodeURIComponent(from.query.redirect || to.path) + if (to.path === redirect) { + // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record + next({ ...to, replace: true }) + } else { + // 跳转到目的路由 + next({ path: redirect }) + } + }) + }) .catch(() => { - /* notification.error({ - message: '系统提示', - description: '请求用户信息失败，请重试！' - })*/ + /* notification.error({ + message: '系统提示', + description: '请求用户信息失败，请重试！' + })*/ store.dispatch('Logout').then(() => { next({ path: '/user/login', query: { redirect: to.fullPath } }) }) diff --git a/jero-web/src/utils/hasPermission.js b/jero-web/src/utils/hasPermission.js index 46747709a..0a27b174a 100644 --- a/jero-web/src/utils/hasPermission.js +++ b/jero-web/src/utils/hasPermission.js @@ -66,7 +66,7 @@ export function filterNodePermission(el, binding, vnode) { * 全局权限控制 */ export function filterGlobalPermission(el, binding, vnode) { - console.log("全局页面权限--Global--"); + // console.log("全局页面权限--Global--"); let permissionList = []; let allPermissionList = [];