diff --git a/src/App.vue b/src/App.vue index f86104cae..b6aa9b9ea 100644 --- a/src/App.vue +++ b/src/App.vue @@ -216,7 +216,8 @@ export default { && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' - && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { + && this.$route.name !== 'AdvancedSearchExternal' && this.$route.name !== 'LoginVerifyNoEncryption' + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage') { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/process.js b/src/api/process.js index 3f8b1187b..c1dbff26f 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -561,6 +561,14 @@ export function loginIdm (data) { }) } +export function checkPageNoEncryption (data) { + return axios({ + url: '/api/checkPageNoEncryption', + method: 'get', + params: data + }) +} + // 流程委托接口 export function changeAssigneeNew (data) { return axios({ diff --git a/src/main.js b/src/main.js index 9c1f2aa36..38623a0d4 100644 --- a/src/main.js +++ b/src/main.js @@ -68,8 +68,20 @@ router.beforeEach(function (to, from, next) { if (toName === 'CheckPage') { next() } + + let fromName = from.name let token = store.state.token let path = to.path; + let userName = "" + if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName=") !== -1){ + userName = path.split("&")[1].split("=")[1] + window.sessionStorage.clear() + }else { + if(fromName === 'Home2'){ + localStorage.removeItem("external") + } + userName = to.query.userName + } let requireAuth = to.meta.requireAuth; let taskId = to.query.taskIds; let prcId = to.query.prcId; @@ -109,6 +121,7 @@ router.beforeEach(function (to, from, next) { } function extractedLocalStorage(url,param,param4) { + localStorage.removeItem("external") localStorage.removeItem("routerUrl") localStorage.setItem('routerUrl', url) localStorage.removeItem("routerParam") @@ -175,13 +188,23 @@ router.beforeEach(function (to, from, next) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); + if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1){ + extractedLocalStorage("standardSearch/All",userName) + localStorage.setItem('external', "external") + next('/LoginVerifyNoEncryption') }else { - extractedLocalStorage('home2',''); + if (toName === 'LoginVerifyNoEncryption') { + next() + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev } } }else if(webLoginType != null && webLoginType === 'dev'){ @@ -364,7 +387,13 @@ router.beforeEach(function (to, from, next) { next() } }else { - next() + if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1) { + extractedLocalStorage("standardSearch/All",userName) + localStorage.setItem('external', "external") + next('/LoginVerifyNoEncryption') + }else { + next() + } } } }) diff --git a/src/pages/loginVerifyNoEncryption/index.vue b/src/pages/loginVerifyNoEncryption/index.vue new file mode 100644 index 000000000..98db12ca3 --- /dev/null +++ b/src/pages/loginVerifyNoEncryption/index.vue @@ -0,0 +1,111 @@ + + + + + + diff --git a/src/pages/searchCenter/pages/advancedSearchExternal.vue b/src/pages/searchCenter/pages/advancedSearchExternal.vue new file mode 100644 index 000000000..e78dac512 --- /dev/null +++ b/src/pages/searchCenter/pages/advancedSearchExternal.vue @@ -0,0 +1,3145 @@ + + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index b76771f70..47ce8f26a 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -19,10 +19,14 @@
- + +
高级检索
 - + +
高级检索
+ +
首页
 @@ -339,6 +343,7 @@ }, data () { return { + externalStatus:'', itermsConditionsTitle1: '', itermsConditionsTitle2: '', itermsConditionsFlag: false, @@ -2663,6 +2668,10 @@ } }, mounted () { + let external = localStorage.getItem("external"); + if(external !== undefined && external !== null){ + this.externalStatus = external + } let globalInputSearch = this.$route.params.searchValue if (globalInputSearch !== 'allvalue') { this.keywords = globalInputSearch diff --git a/src/router/index.js b/src/router/index.js index 0976349ab..66da2af04 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,6 +60,12 @@ const routes = [ component: () => import('@/pages/loginVerify') }, + { + path: '/loginVerifyNoEncryption', + name: 'LoginVerifyNoEncryption', + component: () => + import('@/pages/loginVerifyNoEncryption') + }, // 跳转刷新页面 { path: '/redirect', @@ -4065,6 +4071,16 @@ const routes = [ title: '高级检索', menuId: 'K9BAYUPZBC' } + },{ + path: '/advancedSearchExternal/:selectKey?/:searchValue?', + name: 'AdvancedSearchExternal', + component: () => + import('@/pages/searchCenter/pages/advancedSearchExternal'), + meta: { + requireAuth: true, + title: '高级检索', + menuId: 'K9BAYUPZBC' + } }, // { // path: '/advancedSearch',