FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_test' into dev_20230829_change

Browse Source 
# Conflicts:
#	src/components/hzwlComponents/ReceiptDescription.vue
#	src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
This commit is contained in:
wxyclub
2023-11-28 15:34:45 +08:00
parent 423b5198ea 5d3b76140b
commit f49c92a941
312 changed files with 8247 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+16 -9
View File
@@ -67,13 +67,6 @@ import { Loading } from 'element-ui';
// 路由拦截
router.beforeEach(function (to, from, next) {
// const currentURL = window.location.href
// if (currentURL.indexOf('#/') > 0) {
// const index = currentURL.indexOf('#/')
// const startUrl = currentURL.slice(0, index)
// const endUrl = currentURL.slice(index + 2)
// window.location.href = startUrl + endUrl
// }
closeLoading()
if (isMobile()){
var loading = Loading.service({
@@ -93,8 +86,6 @@ router.beforeEach(function (to, from, next) {
if(fromName === undefined || fromName === null){
window.sessionStorage.clear()
}
console.log(to)
console.log(from)
let toName = to.name
if (toName === 'CheckPage' || toName === 'loginStandDetails' || toName === 'error'
|| toName === 'LoginVerifyPhone') {
@@ -110,6 +101,7 @@ router.beforeEach(function (to, from, next) {
let token = store.state.token
let path = to.path;
let userName = ""
/*
if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName=") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined))){
if((path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined)){
userName = to.query.userName
@@ -118,10 +110,13 @@ router.beforeEach(function (to, from, next) {
}
window.sessionStorage.clear()
}else {
*/
if(fromName === 'Home2'){
localStorage.removeItem("external")
}
/*
}
*/
let requireAuth = to.meta.requireAuth;
let taskId = to.query.taskIds;
let prcId = to.query.prcId;
@@ -319,25 +314,33 @@ router.beforeEach(function (to, from, next) {
if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
extractedVerify(token)
}else {
/*
if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))){
extractedLocalStorage("standardSearch/All",userName)
localStorage.setItem('external', "external")
next('/LoginVerifyNoEncryption')
closeLoading()
}else {
*/
if (toName === 'LoginVerifyNoEncryption') {
next()
closeLoading()
}else {
/*
if(path === '/standardSearch/All'){
extractedLocalStorage('standardSearch/All','');
}else {
*/
extractedLocalStorage('home2','');
/*
}
*/
// ssoLoginUrlDev 默认sso 地址
window.location.href = ssoLoginUrlDev
}
/*
}
*/
}
}
}else if(webLoginType != null && webLoginType === 'dev'){
@@ -491,15 +494,19 @@ router.beforeEach(function (to, from, next) {
closeLoading()
}
}else {
/*
if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))) {
extractedLocalStorage("standardSearch/All",userName)
localStorage.setItem('external', "external")
next('/LoginVerifyNoEncryption')
closeLoading()
}else {
*/
next()
closeLoading()
/*
}
*/
}
}
})