Browse Source

登录跳转问题

qin_27
herenshan112 2 weeks ago
parent
commit
9e2f7344c9
  1. 4
      src/components/DesignForm/app/index.vue
  2. 2
      src/components/DesignForm/tableListPage/index.vue
  3. 4
      src/store/modules/orgMember.ts
  4. 19
      src/utils/request.ts
  5. 17
      src/utils/requestfile.ts

4
src/components/DesignForm/app/index.vue

@ -2287,9 +2287,9 @@ const isObject = (obj: any) => {
<el-button <el-button
@click="printHtmlPage(props.formId,props.appKey,props.versionid, props.formKey,scope.row)" @click="printHtmlPage(props.formId,props.appKey,props.versionid, props.formKey,scope.row)"
type="primary" type="primary"
size="small" size="small"1
class="fa fa-print" class="fa fa-print"
@click="printPage(scope.row)"
/> />
</el-tooltip> </el-tooltip>

2
src/components/DesignForm/tableListPage/index.vue

@ -2033,7 +2033,7 @@ const isObject = (obj: any) => {
type="primary" type="primary"
size="small" size="small"
class="fa fa-print" class="fa fa-print"
@click="printPage(scope.row)"
/> />
</el-tooltip> </el-tooltip>

4
src/store/modules/orgMember.ts

@ -27,6 +27,9 @@ export const useOrgMemberStore = defineStore('orgMember', () => {
} }
function handleChildren(childs:any[]){ function handleChildren(childs:any[]){
if(childs.length> 0){
childs.forEach(item => { childs.forEach(item => {
listMap.value[item.id] = item.name; listMap.value[item.id] = item.name;
if(item.child){ if(item.child){
@ -34,6 +37,7 @@ export const useOrgMemberStore = defineStore('orgMember', () => {
} }
}); });
} }
}
init() init()
return { listMap,dataTree } return { listMap,dataTree }
}) })

19
src/utils/request.ts

@ -1,7 +1,11 @@
import axios, { InternalAxiosRequestConfig, AxiosResponse } from 'axios'; import axios, { InternalAxiosRequestConfig, AxiosResponse } from 'axios';
import { useUserStoreHook } from '@/store/modules/user'; import { useUserStoreHook } from '@/store/modules/user';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import router from '@/router';
import { useRouter } from 'vue-router'
const routerPinia = useRouter()
// 创建 axios 实例 // 创建 axios 实例
const service = axios.create({ const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API, baseURL: import.meta.env.VITE_APP_BASE_API,
@ -38,12 +42,13 @@ service.interceptors.response.use(
return response.data; return response.data;
} }
if (code === 7 || code === 300 || code === 301 || code === 302){ if (code === 7 || code === 300 || code === 301 || code === 302){
ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示", { ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示5", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
localStorage.clear(); localStorage.clear();
window.location.href = "/"; // window.location.href = "/login";
routerPinia.push({path:"/login"})
}); });
return response.data; return response.data;
} }
@ -60,20 +65,22 @@ service.interceptors.response.use(
const { code, msg } = error.response.data; const { code, msg } = error.response.data;
// token 过期,重新登录 // token 过期,重新登录
if (code === 'A0230') { if (code === 'A0230') {
ElMessageBox.confirm('当前页面已失效,请重新登录', '提示', { ElMessageBox.confirm('当前页面已失效,请重新登录', '提示6', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
localStorage.clear(); localStorage.clear();
window.location.href = '/'; // window.location.href = '/login';
router.push({path:"/login"})
}); });
}else if(code === 7 || code === 300 || code === 301 || code === 302){ }else if(code === 7 || code === 300 || code === 301 || code === 302){
ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示", { ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示7", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
localStorage.clear(); localStorage.clear();
window.location.href = "/"; // window.location.href = "/login";
routerPinia.push({path:"/login"})
}); });
}else if (code === 10001 || code === 10002 || code === 10003) { }else if (code === 10001 || code === 10002 || code === 10003) {
return Promise.reject(error.message); return Promise.reject(error.message);

17
src/utils/requestfile.ts

@ -1,7 +1,8 @@
import axios, { InternalAxiosRequestConfig, AxiosResponse } from 'axios'; import axios, { InternalAxiosRequestConfig, AxiosResponse } from 'axios';
import { useUserStoreHook } from '@/store/modules/user'; import { useUserStoreHook } from '@/store/modules/user';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import { useRouter } from 'vue-router'
const routerPinia = useRouter()
// 创建 axios 实例 // 创建 axios 实例
const service = axios.create({ const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API, baseURL: import.meta.env.VITE_APP_BASE_API,
@ -36,12 +37,13 @@ service.interceptors.response.use(
return response.data; return response.data;
} }
if (code === 7 || code === 300 || code === 301 || code === 302){ if (code === 7 || code === 300 || code === 301 || code === 302){
ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示", { ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示3", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
localStorage.clear(); localStorage.clear();
window.location.href = "/"; // window.location.href = "/login";
routerPinia.push({path:"/login"})
}); });
return response.data; return response.data;
} }
@ -58,20 +60,21 @@ service.interceptors.response.use(
const { code, msg } = error.response.data; const { code, msg } = error.response.data;
// token 过期,重新登录 // token 过期,重新登录
if (code === 'A0230') { if (code === 'A0230') {
ElMessageBox.confirm('当前页面已失效,请重新登录', '提示', { ElMessageBox.confirm('当前页面已失效,请重新登录', '提示1', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
localStorage.clear(); localStorage.clear();
window.location.href = '/'; window.location.href = '/login';
}); });
}else if(code === 7 || code === 300 || code === 301 || code === 302){ }else if(code === 7 || code === 300 || code === 301 || code === 302){
ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示", { ElMessageBox.confirm("身份令牌已失效!请重新登录!", "提示2", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
localStorage.clear(); localStorage.clear();
window.location.href = "/"; // window.location.href = "/login";
routerPinia.push({path:"/login"})
}); });
}else if (code === 10001 || code === 10002 || code === 10003) { }else if (code === 10001 || code === 10002 || code === 10003) {
return Promise.reject(error.message); return Promise.reject(error.message);

Loading…
Cancel
Save