Merge branch 'dev' of https://gitea.aiotagro.com/liupengcheng/admin-jxn-testing into dev
This commit is contained in:
@@ -148,7 +148,6 @@ 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是关键
|
||||
@@ -161,5 +160,6 @@ router.beforeEach((to, from, next) => {
|
||||
}
|
||||
next('/login')
|
||||
}
|
||||
})
|
||||
}
|
||||
)
|
||||
export default router
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user