Commit 22f69d70 authored by 方建宇's avatar 方建宇

仅跳过登录验证和去掉登录页远程未连接提示

parent 246bf8e0
...@@ -29,50 +29,50 @@ axios.interceptors.request.use((config) => { ...@@ -29,50 +29,50 @@ axios.interceptors.request.use((config) => {
}, (error) => { }, (error) => {
return Promise.reject(error); return Promise.reject(error);
}); });
//远程服务器连接提示
axios.interceptors.response.use((res) => { // axios.interceptors.response.use((res) => {
closeLoading(); // closeLoading();
checkResponse(res); // checkResponse(res);
return Promise.resolve(res); // return Promise.resolve(res);
}, (error) => { // }, (error) => {
closeLoading(); // closeLoading();
alert(error) // alert(error)
let httpMessage = ''; // let httpMessage = '';
if (error.response) { // if (error.response) {
if (error.response.status == '401') { // if (error.response.status == '401') {
if (error.response.data && error.response.data.status == 401) { // if (error.response.data && error.response.data.status == 401) {
if (!localStorage.getItem('user')) { // if (!localStorage.getItem('user')) {
Message.error({ // Message.error({
showClose: true, // showClose: true,
message: '登陆已过期', // message: '登陆已过期',
type: 'error' // type: 'error'
}); // });
} // }
toLogin(); // toLogin();
return; // return;
} // }
//
} // }
if (error.response.status == '404') { // if (error.response.status == '404') {
httpMessage = "未找到请求地址"; // httpMessage = "未找到请求地址";
} // }
else if (error.response.data && error.response.data.message) { // else if (error.response.data && error.response.data.message) {
httpMessage = error.response.data.message; // httpMessage = error.response.data.message;
} // }
} // }
if (error.request) { // if (error.request) {
httpMessage = "未连接到远程服务器!"; // httpMessage = "未连接到远程服务器!";
console.log(httpMessage + error.message); // console.log(httpMessage + error.message);
if(error.config.url!='/api/User/getVierificationCode'){ // if(error.config.url!='/api/User/getVierificationCode'){
toLogin(); // toLogin();
} // }
} // }
else { // else {
httpMessage = '服务器处理异常'; // httpMessage = '服务器处理异常';
} // }
redirect(httpMessage); // redirect(httpMessage);
return Promise.reject(error.response || {}, httpMessage); // return Promise.reject(error.response || {}, httpMessage);
}); // });
function changeIP(IP){ function changeIP(IP){
axios.defaults.baseURL = IP; axios.defaults.baseURL = IP;
...@@ -251,7 +251,13 @@ function toLogin () { ...@@ -251,7 +251,13 @@ function toLogin () {
} }
window.location.href = window.location.origin + '/login' window.location.href = window.location.origin + '/login'
} }
// function toLogin () {
// if (window.location.hash) {
// window.location.href = window.location.origin + '/#/GisHome'
// return
// }
// window.location.href = window.location.origin + '/GisHome'
// }
//动态刷新token //动态刷新token
function replaceToken () { function replaceToken () {
ajax({ ajax({
......
...@@ -282,35 +282,54 @@ getUserInfo(); ...@@ -282,35 +282,54 @@ getUserInfo();
let appContext = getCurrentInstance()!.appContext; let appContext = getCurrentInstance()!.appContext;
let $message = appContext.config.globalProperties.$message; let $message = appContext.config.globalProperties.$message;
// function login() {
//
// if(code.value == ''){
// showMessage.value=true;
// errorMessage.value="请输入验证码";
// return $message.error(errorMessage.value);
// }
// loading.value = true;
// userInfo.verificationCode = code.value;
// code.value='';
// http.post('/api/user/login', userInfo, '正在登录....').then((result) => {
// if (!result.success) {
// loading.value = false;
// getPicture();
// showMessage.value=true;
// errorMessage.value=result.message;
// return $message.error(result.message);
// }
// $message.success('登录成功,正在跳转!');
// store.commit('setUserInfo', result.data);
// // router.push({ path: '/Home'});
// if(isRemember.value){
// saveUserInfo(userInfo);
// }
// window.removeEventListener('keydown',handleKeyEvent)
// router.push({ path: '/GisHome'});
// });
// }
function login() { function login() {
// 模拟登录成功
if(code.value == ''){ const mockResponse = {
showMessage.value=true; success: true,
errorMessage.value="请输入验证码"; data: {
return $message.error(errorMessage.value); userId: 1,
} userName: 'testUser',
loading.value = true; token: 'mockToken'
userInfo.verificationCode = code.value; },
code.value=''; message: '登录成功'
http.post('/api/user/login', userInfo, '正在登录....').then((result) => { };
if (!result.success) {
loading.value = false; $message.success(mockResponse.message);
getPicture(); store.commit('setUserInfo', mockResponse.data);
showMessage.value=true; if (isRemember.value) {
errorMessage.value=result.message;
return $message.error(result.message);
}
$message.success('登录成功,正在跳转!');
store.commit('setUserInfo', result.data);
// router.push({ path: '/Home'});
if(isRemember.value){
saveUserInfo(userInfo); saveUserInfo(userInfo);
} }
window.removeEventListener('keydown',handleKeyEvent) window.removeEventListener('keydown', handleKeyEvent);
router.push({ path: '/GisHome'}); router.push({ path: '/GisHome' });
});
} }
function handleKeyEvent(event){ function handleKeyEvent(event){
if(event.key === 'Enter'){ if(event.key === 'Enter'){
login(); login();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment