diff --git a/epmet-oper-web/src/js/ajax.js b/epmet-oper-web/src/js/ajax.js index 1982261..837b401 100644 --- a/epmet-oper-web/src/js/ajax.js +++ b/epmet-oper-web/src/js/ajax.js @@ -93,11 +93,11 @@ axios.interceptors.response.use( clearLoginInfo() localStorage.setItem('userType', 'work') let userType = localStorage.getItem("userType"); - if (userType === 'work'){ - router.replace({ name: 'loginWork' }) - }else { + // if (userType === 'work'){ + // router.replace({ name: 'loginWork' }) + // }else { router.replace({ name: 'login' }) - } + // } return Promise.reject(response.data.msg) } diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index a504f73..0f3157a 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -33,14 +33,14 @@ export const pageRoutes = [{ title: '登录' } }, - { - path: '/loginWork', - component: () => import('@/views/pages/loginWork'), - name: 'loginWork', - meta: { - title: '工作端登录' - } - }, + // { + // path: '/loginWork', + // component: () => import('@/views/pages/loginWork'), + // name: 'loginWork', + // meta: { + // title: '工作端登录' + // } + // }, { path: '/indexWork', component: () => import('@/views/pages/indexWork'), @@ -151,9 +151,9 @@ router.beforeEach((to, from, next) => { const userType = localStorage.getItem('userType') - if (userType === 'work') { - const customerId = localStorage.getItem('customerId') - console.log('customerId:', customerId) + // if (userType === 'work') { + // const customerId = localStorage.getItem('customerId') + // console.log('customerId:', customerId) // if(customerId==='1e68188b8f7e9ab15658c164bd5b3676'){ // // if(customerId==='45687aa479955f9d06204d415238f7cc'){ // const menuList=[ @@ -204,37 +204,37 @@ router.beforeEach((to, from, next) => { // // next({ ...to, replace: true }) // next({ ...to, replace: true }) // }else{ - http - .get('/gov/access/menu/nav') - .then(({ - data: res - }) => { - if (res.code !== 0) { - // Vue.prototype.$message.error(res.msg) - return next({ - name: 'loginWork' - }) - } - window.SITE_CONFIG['menuList'] = res.data - fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) - // next({ ...to, replace: true }) - next({ - ...to, - replace: true - }) - }) - .catch(() => { - next({ - name: 'loginWork' - }) - }) + // http + // .get('/gov/access/menu/nav') + // .then(({ + // data: res + // }) => { + // if (res.code !== 0) { + // // Vue.prototype.$message.error(res.msg) + // return next({ + // name: 'loginWork' + // }) + // } + // window.SITE_CONFIG['menuList'] = res.data + // fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) + // // next({ ...to, replace: true }) + // next({ + // ...to, + // replace: true + // }) + // }) + // .catch(() => { + // next({ + // name: 'loginWork' + // }) + // }) // } // localStorage.getItem('customerId') // 1e68188b8f7e9ab15658c164bd5b3676 - } else { + // } else { http .get('/oper/access/menu/nav') .then(({ @@ -259,7 +259,7 @@ router.beforeEach((to, from, next) => { name: 'login' }) }) - } + // } }) /** diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js index 0466541..050f5f6 100644 --- a/epmet-oper-web/src/utils/request.js +++ b/epmet-oper-web/src/utils/request.js @@ -55,11 +55,11 @@ http.interceptors.response.use(response => { clearLoginInfo() localStorage.setItem('userType', 'work') let userType = localStorage.getItem("userType"); - if (userType === 'work'){ - router.replace({ name: 'loginWork' }) - }else { + // if (userType === 'work'){ + // router.replace({ name: 'loginWork' }) + // }else { router.replace({ name: 'login' }) - } + // } return Promise.reject(response.data.msg) } return response diff --git a/epmet-oper-web/src/views/main-navbar-update-password-work.vue b/epmet-oper-web/src/views/main-navbar-update-password-work.vue index c29715b..47994a1 100644 --- a/epmet-oper-web/src/views/main-navbar-update-password-work.vue +++ b/epmet-oper-web/src/views/main-navbar-update-password-work.vue @@ -59,7 +59,7 @@ import { clearLoginInfo } from '@/utils' export default { data() { return { - visible: false, + visible: true, dataForm: { password: '', newPassword: '', @@ -133,7 +133,7 @@ export default { onClose: () => { this.visible = false clearLoginInfo() - this.$router.replace({ name: 'loginWork' }) + // this.$router.replace({ name: 'loginWork' }) } }) }) diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue index 750a8ce..7b6a278 100644 --- a/epmet-oper-web/src/views/main-navbar.vue +++ b/epmet-oper-web/src/views/main-navbar.vue @@ -218,11 +218,11 @@ export default { clearLoginInfo() - if (localStorage.getItem('userType') === 'work') { - this.$router.push({ name: 'loginWork' }) - } else { + // if (localStorage.getItem('userType') === 'work') { + // this.$router.push({ name: 'loginWork' }) + // } else { this.$router.push({ name: 'login' }) - } + // } }).catch(() => { }) }).catch(() => { })