diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 685e6098..acba5bf8 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,12 +2,12 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-14 10:01:08 + * @LastEditTime: 2022-07-18 11:34:38 * @Description: 数据资源参数配置 */ -const newLocation = 'qingdao' +//const newLocation = 'qingdao' // const newLocation = 'baotou' -// const newLocation = 'xihaian' +const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} diff --git a/front/src/assets/newHome/newHome-title-bg-xihaian.png b/front/src/assets/newHome/newHome-title-bg-xihaian.png new file mode 100644 index 00000000..cfe3b105 Binary files /dev/null and b/front/src/assets/newHome/newHome-title-bg-xihaian.png differ diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js index b0324521..38f98cdf 100644 --- a/front/src/vab/plugins/permissions.js +++ b/front/src/vab/plugins/permissions.js @@ -2,60 +2,59 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 17:23:11 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-16 10:57:59 + * @LastEditTime: 2022-07-18 11:25:28 * @Description: 告诉大家这是什么 */ /** * @author chuzhixin 1204505056@qq.com * @description 路由守卫,目前两种模式:all模式与intelligence模式 */ - import router from '@/router' - import store from '@/store' - import getPageTitle from '@/utils/pageTitle' - import { getUserInfo } from '@/api/user' - import { - // authentication, - loginInterception, - // recordRoute, - routesWhiteList, - } from '@/config' - import { setAccessToken, getAccessToken } from '@/utils/accessToken' - router.beforeEach(async (to, from, next) => { - // debugger - // const SSOTOKEN = to.query.SSOToken - // if (SSOTOKEN) { - // setAccessToken(SSOTOKEN) - // } +import router from '@/router' +import store from '@/store' +import getPageTitle from '@/utils/pageTitle' +import { getUserInfo } from '@/api/user' +import { + // authentication, + loginInterception, + // recordRoute, + routesWhiteList, +} from '@/config' +import { setAccessToken, getAccessToken } from '@/utils/accessToken' +router.beforeEach(async (to, from, next) => { + // debugger + // const SSOTOKEN = to.query.SSOToken + // if (SSOTOKEN) { + // setAccessToken(SSOTOKEN) + // } - const token = getAccessToken() - console.log('token', token) - let hasToken = token - // debugger - if (!loginInterception) hasToken = true - console.log('hasToken存在巨大问题', hasToken) - if (hasToken) { + const token = getAccessToken() + console.log('token', token) + let hasToken = token + // debugger + if (!loginInterception) hasToken = true + console.log('hasToken存在巨大问题', hasToken) + if (hasToken) { // setAccessToken(hasToken) - await store.dispatch('user/getUserInfo') - // debugger - next() - } else { - let accessRoutes = [] - accessRoutes = await store.dispatch('routes/setRoutes') - accessRoutes.forEach((item) => { - router.addRoute(item) - }) - if (routesWhiteList.indexOf(to.path) !== -1) { - next() - } else { + await store.dispatch('user/getUserInfo') + // debugger + next() + } else { + let accessRoutes = [] + accessRoutes = await store.dispatch('routes/setRoutes') + accessRoutes.forEach((item) => { + router.addRoute(item) + }) + if (routesWhiteList.indexOf(to.path) !== -1) { + next() + } else { // 这里是一个单点登录的入口 - if (to.query.redict) - getUserInfo(to.query.redict) - else { - getUserInfo() - } - } - } - }) - router.afterEach((to) => { - document.title = getPageTitle(to.meta.title) - }) + if (to.query.redict) getUserInfo(to.query.redict) + else { + getUserInfo() + } + } + } +}) +router.afterEach((to) => { + document.title = getPageTitle(to.meta.title) +}) diff --git a/front/src/views/demandCenter/index.vue b/front/src/views/demandCenter/index.vue index 2416925c..8d9a0fe1 100644 --- a/front/src/views/demandCenter/index.vue +++ b/front/src/views/demandCenter/index.vue @@ -17,7 +17,7 @@