diff --git a/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue b/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue index cc6bca47..4d32e238 100644 --- a/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue +++ b/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: "管理系统", + title: "广东省水工程建设管理系统", // title: '安全知识图谱管理平台', // logo: logoImg, logo: "", diff --git a/jwtech-admin-page/src/router/index.js b/jwtech-admin-page/src/router/index.js index c9106e4f..9988be4d 100644 --- a/jwtech-admin-page/src/router/index.js +++ b/jwtech-admin-page/src/router/index.js @@ -159,12 +159,13 @@ router.beforeEach((to, from, next) => { console.log("单点登录设置token", to.query.token); //判断当前路由是否需要进行权限控制 if (to.query.token) { setToken(to.query.token); - if (to.query.page) { + if (to.query.page === 'null') { + next() + } else if (to.query.page) { next(to.query.page) } else { next() } - } } else if(from.path === '/login'&&to.path !== '/legalLinkProject') { // console.log(54546486,isLegal()); diff --git a/jwtech-admin-page/src/settings.js b/jwtech-admin-page/src/settings.js index d06907e9..5e777e46 100644 --- a/jwtech-admin-page/src/settings.js +++ b/jwtech-admin-page/src/settings.js @@ -1,5 +1,5 @@ module.exports = { - title: '管理系统后台', + title: '广东省水工程建设管理系统后台', /** * 是否系统布局配置 diff --git a/jwtech-admin-page/src/views/loginbg.vue b/jwtech-admin-page/src/views/loginbg.vue index fd95ee3d..95065818 100644 --- a/jwtech-admin-page/src/views/loginbg.vue +++ b/jwtech-admin-page/src/views/loginbg.vue @@ -3,7 +3,7 @@
- 管理系统 + 广东省水工程建设管理系统
diff --git a/jwtech-admin-page/vue.config.js b/jwtech-admin-page/vue.config.js index 3d5d7623..5d617746 100644 --- a/jwtech-admin-page/vue.config.js +++ b/jwtech-admin-page/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '管理系统' // 标题 +const name = defaultSettings.title || '广东省水工程建设管理系统' // 标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口