From 01b0fa0b7e1808d1355e2583a5b0d63694e1b8a5 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 13 Sep 2024 14:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=BA=E6=88=BF=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.ts | 62 +-------------------------------- src/router/index.ts | 43 +++++++++++++++++++++-- src/views/setIdentification.vue | 2 +- 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/src/main.ts b/src/main.ts index ea2a4f34..d10e7f3d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -13,7 +13,7 @@ import VueLazyload from "vue-lazyload"; import i18n from './lang/index' import { getBrowserInfo, murmur } from './tool/util' import "../node_modules/@flaticon/flaticon-uicons/css/all/all.css" -import { Https } from "@/tool/https"; +// import { Https } from "@/tool/https"; import 'swiper/css'; import 'swiper/css/pagination'; @@ -24,66 +24,6 @@ const app = createApp(App); flexible() import { getCookie, setCookie } from "@/tool/cookie"; -router.beforeEach((to, from, next) => { - if((to.name == "login" && !from.name) || (to.name == 'SquareWorks' && !from.name) || (to.name == 'works' && !from.name)){ - isMurmur() - } - next(); - }); -async function isMurmur() { - let murmurStr: any = localStorage.getItem('murmurStr') - let id: any = localStorage.getItem('id') - // let isSxis = false - let data = { - browserIdentifiers: murmurStr, - id:id?id:window.location.search.substring(1) - } - // await Https.axiosPost(Https.httpUrls.existNoLoginRequired, data) - // .then((rv) => { - // isSxis = rv - // }) - // .catch((res) => { - // }); - if(data.id){ - Https.axiosPost(Https.httpUrls.noLoginRequired, data) - .then((rv) => { - let isTest = rv.systemUser == 3 ? true : false - let isBeginner = rv.isBeginner == 1 ? true : false - setCookie("isMurmur", true); - setCookie("token", rv.token); - setCookie("isTest", isTest); - setCookie("isBeginner", isBeginner); - setCookie("isBeginnerNum", 0);//从第一步开始，机器人开始的话就是从第二部开始 - setCookie("userInfo", JSON.stringify(rv)); - sessionStorage.setItem('isTimeOne', JSON.stringify(false));//是否需要公告 提示 弹窗 - let randomNum: any = Math.floor(Math.random() * 9000000000000000) + 1000000000000000; - sessionStorage.setItem('sessionId', randomNum); - router.push("/home"); - if(window.location.search.substring(1)){ - localStorage.setItem('id',window.location.search.substring(1)) - } - }) - .catch((res) => { - }); - } - -} - -// app.directive('cliAdmin', { -// mounted(el, binding) { -// el.style.cursor = 'pointer' -// }, -// updated (el,binding) { -// // let value = binding.value -// // if(value.state){ -// // el.firstElementChild.classList.add(`cliAdmin_${value.type}`) -// // setTimeout(()=>{ -// // el.firstElementChild.classList.remove(`cliAdmin_${value.type}`) -// // },500) -// // } -// } -// }); - let loadingParam = { loading: require('./assets/images/homePage/loading.gif'), attempt: 1 diff --git a/src/router/index.ts b/src/router/index.ts index 98b32347..2e4258f0 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,6 +1,7 @@ import { createRouter, createWebHistory, RouteRecordRaw, createWebHashHistory } from 'vue-router' import { defineAsyncComponent } from 'vue' import store from "@/store" +import { Https } from "@/tool/https"; import { getCookie, setCookie } from "@/tool/cookie"; const _import = (path: string) => () => import(`../views/${path}.vue`); const _import_component = (path : string) => () => import(`../component/${path}`); @@ -231,7 +232,38 @@ if (vuex_setSystemUser == 0 || vuex_setSystemUser == 1) { sessionStorage.removeItem("vuex_setSystemUser"); } -router.beforeEach((to, from, next) => { +let setMurmur = (id:any)=> { + let murmurStr: any = localStorage.getItem('murmurStr') + // let isSxis = false + let data = { + browserIdentifiers: murmurStr, + id:id + } + if(data.id){ + Https.axiosPost(Https.httpUrls.noLoginRequired, data) + .then((rv) => { + let isTest = rv.systemUser == 3 ? true : false + let isBeginner = rv.isBeginner == 1 ? true : false + setCookie("isMurmur", true); + setCookie("token", rv.token); + setCookie("isTest", isTest); + setCookie("isBeginner", isBeginner); + setCookie("isBeginnerNum", 0);//从第一步开始，机器人开始的话就是从第二部开始 + setCookie("userInfo", JSON.stringify(rv)); + sessionStorage.setItem('isTimeOne', JSON.stringify(false));//是否需要公告 提示 弹窗 + let randomNum: any = Math.floor(Math.random() * 9000000000000000) + 1000000000000000; + sessionStorage.setItem('sessionId', randomNum); + router.push("/home"); + + }) + .catch((res) => { + // router.push('/Square') + }); + } + +} + +router.beforeEach((to:any, from, next) => { let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 // 系统维护 @@ -248,6 +280,12 @@ router.beforeEach((to, from, next) => { // return // 检查路由是否存在 // 机房用户 + let herfData = window.location.search.substring(1) + if(herfData.split('=')[0] == 'noLogin' && to.name != 'homePage'){ + setMurmur(herfData.split('=')[1]) + return + } + let userInfo = JSON.parse(getCookie("userInfo") as any); let murmurStr: any = localStorage.getItem('murmurStr') let getIsMurmur: any = getCookie("isMurmur") @@ -260,7 +298,7 @@ router.beforeEach((to, from, next) => { let systemUser = state.UserHabit.systemUser const routeExists = router.getRoutes().some(({ name }) =>{ if(name){ - return name === to.name + return (name === to.name || to.path == '/') }else{ return false } @@ -311,4 +349,5 @@ router.beforeEach((to, from, next) => { }); + export default router diff --git a/src/views/setIdentification.vue b/src/views/setIdentification.vue index 2c47c36b..f7c0e6d5 100644 --- a/src/views/setIdentification.vue +++ b/src/views/setIdentification.vue @@ -90,7 +90,7 @@ export default defineComponent({ downloadLink.href = URL.createObjectURL(blob); downloadLink.download = "AiDA.html"; downloadLink.click(); - localStorage.setItem('id',this.setId) + // localStorage.setItem('id',this.setId) message.success('Created successfully'); }) .catch((res) => {