diff --git a/src/router/index.js b/src/router/index.js index 3259471..eac333b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -148,16 +148,18 @@ const router = new VueRouter({ }) // 前置路由守卫 router.beforeEach((to, from, next) => { - // to到哪里取 from 从哪里来 next 放行 - const token = local.get('token_sd') - if (to.meta.title) { // 修改总标题 - document.title = '肉牛溯源系统' + '-' + to.meta.title // routes数组中--meta是关键 - } - if (token) { // ok - next() - } else { // no - if (to.path === '/login') { - next() + // to到哪里取 from 从哪里来 next 放行 + const token = local.get('token_sd') + if (to.meta.title) { // 修改总标题 + document.title = '基芯农育种' + '-' + to.meta.title // routes数组中--meta是关键 + } + if (token) { // ok + next() + } else { // no + if (to.path === '/login') { + next() + } + next('/login') } next('/login') } diff --git a/src/views/layout/left-menu.vue b/src/views/layout/left-menu.vue index 604204f..0b55816 100644 --- a/src/views/layout/left-menu.vue +++ b/src/views/layout/left-menu.vue @@ -88,7 +88,7 @@ export default { return { activeIndex: '/', isCollapse: false, - system_name: '肉牛溯源系统', + system_name: '基芯农育种', logo: '', index: 0, menuList: [], // 菜单权限列表 diff --git a/src/views/quick-Search/quick-Search.vue b/src/views/quick-Search/quick-Search.vue index df47ba2..6512d5c 100644 --- a/src/views/quick-Search/quick-Search.vue +++ b/src/views/quick-Search/quick-Search.vue @@ -135,7 +135,7 @@ export default { return { loading: false, showtable: false, - dialogVisible: false, + dialogVisible: true, searchForm: { a: '', b: '', @@ -214,7 +214,9 @@ export default { detailClick() { this.$router.push('/phylogeneticAnalysis/evolutionaryTree') }, - report() {}, + report() { + this.dialogVisible = true + }, // 搜索 searchClick() { this.loading = true