diff --git a/src/api/index.ts b/src/api/index.ts index e2ca08f..9521010 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,6 +10,8 @@ noPermission = 401, // 未授权 error = 500, // 服务器异常 } +// 以下地址发生错误直接跳转至登录页 +const toLoginPath = ['/sys/user/permission', '/sys/user/info'] // 跳转到登录页面 const toLogin = () => { @@ -82,11 +84,18 @@ } } else if (error.response && error.response.data) { - const message: string = error.response.data.message - ElMessage({ - message, - type: 'error', - }) + // 如果是发生错误必须回到登录页的api + const needLogin = toLoginPath.findIndex(path => error.request.responseURL.includes(path)) + if (needLogin > -1) { + toLogin() + } + else { + const message: string = error.response.data.message + ElMessage({ + message, + type: 'error', + }) + } } else if (error.message) { let message = error.message diff --git a/src/api/index.ts b/src/api/index.ts index e2ca08f..9521010 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,6 +10,8 @@ noPermission = 401, // 未授权 error = 500, // 服务器异常 } +// 以下地址发生错误直接跳转至登录页 +const toLoginPath = ['/sys/user/permission', '/sys/user/info'] // 跳转到登录页面 const toLogin = () => { @@ -82,11 +84,18 @@ } } else if (error.response && error.response.data) { - const message: string = error.response.data.message - ElMessage({ - message, - type: 'error', - }) + // 如果是发生错误必须回到登录页的api + const needLogin = toLoginPath.findIndex(path => error.request.responseURL.includes(path)) + if (needLogin > -1) { + toLogin() + } + else { + const message: string = error.response.data.message + ElMessage({ + message, + type: 'error', + }) + } } else if (error.message) { let message = error.message diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 682162d..ef6488e 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'ext' +const prefix = 'sys' // 区域查询 export function getAreaListPage(params: object) { diff --git a/src/api/index.ts b/src/api/index.ts index e2ca08f..9521010 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,6 +10,8 @@ noPermission = 401, // 未授权 error = 500, // 服务器异常 } +// 以下地址发生错误直接跳转至登录页 +const toLoginPath = ['/sys/user/permission', '/sys/user/info'] // 跳转到登录页面 const toLogin = () => { @@ -82,11 +84,18 @@ } } else if (error.response && error.response.data) { - const message: string = error.response.data.message - ElMessage({ - message, - type: 'error', - }) + // 如果是发生错误必须回到登录页的api + const needLogin = toLoginPath.findIndex(path => error.request.responseURL.includes(path)) + if (needLogin > -1) { + toLogin() + } + else { + const message: string = error.response.data.message + ElMessage({ + message, + type: 'error', + }) + } } else if (error.message) { let message = error.message diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 682162d..ef6488e 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'ext' +const prefix = 'sys' // 区域查询 export function getAreaListPage(params: object) { diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 8326149..a0f2126 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -80,13 +80,13 @@
- + 搜索 - + 高级检索 - + 重置
diff --git a/src/api/index.ts b/src/api/index.ts index e2ca08f..9521010 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,6 +10,8 @@ noPermission = 401, // 未授权 error = 500, // 服务器异常 } +// 以下地址发生错误直接跳转至登录页 +const toLoginPath = ['/sys/user/permission', '/sys/user/info'] // 跳转到登录页面 const toLogin = () => { @@ -82,11 +84,18 @@ } } else if (error.response && error.response.data) { - const message: string = error.response.data.message - ElMessage({ - message, - type: 'error', - }) + // 如果是发生错误必须回到登录页的api + const needLogin = toLoginPath.findIndex(path => error.request.responseURL.includes(path)) + if (needLogin > -1) { + toLogin() + } + else { + const message: string = error.response.data.message + ElMessage({ + message, + type: 'error', + }) + } } else if (error.message) { let message = error.message diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 682162d..ef6488e 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'ext' +const prefix = 'sys' // 区域查询 export function getAreaListPage(params: object) { diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 8326149..a0f2126 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -80,13 +80,13 @@
- + 搜索 - + 高级检索 - + 重置
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue index 709e08c..9b654fd 100644 --- a/src/views/system/log/listErrorLog.vue +++ b/src/views/system/log/listErrorLog.vue @@ -21,7 +21,7 @@ }) const columns = [ { text: '用户', value: 'userName', width: '150' }, - { text: '时间', value: 'createTime', width: '150' }, + { text: '时间', value: 'createTime', width: '180' }, { text: '详细信息', value: 'message' }, ] // 显示列 const list = ref([]) // 数据列表 diff --git a/src/api/index.ts b/src/api/index.ts index e2ca08f..9521010 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,6 +10,8 @@ noPermission = 401, // 未授权 error = 500, // 服务器异常 } +// 以下地址发生错误直接跳转至登录页 +const toLoginPath = ['/sys/user/permission', '/sys/user/info'] // 跳转到登录页面 const toLogin = () => { @@ -82,11 +84,18 @@ } } else if (error.response && error.response.data) { - const message: string = error.response.data.message - ElMessage({ - message, - type: 'error', - }) + // 如果是发生错误必须回到登录页的api + const needLogin = toLoginPath.findIndex(path => error.request.responseURL.includes(path)) + if (needLogin > -1) { + toLogin() + } + else { + const message: string = error.response.data.message + ElMessage({ + message, + type: 'error', + }) + } } else if (error.message) { let message = error.message diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 682162d..ef6488e 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'ext' +const prefix = 'sys' // 区域查询 export function getAreaListPage(params: object) { diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index 8326149..a0f2126 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -80,13 +80,13 @@
- + 搜索 - + 高级检索 - + 重置
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue index 709e08c..9b654fd 100644 --- a/src/views/system/log/listErrorLog.vue +++ b/src/views/system/log/listErrorLog.vue @@ -21,7 +21,7 @@ }) const columns = [ { text: '用户', value: 'userName', width: '150' }, - { text: '时间', value: 'createTime', width: '150' }, + { text: '时间', value: 'createTime', width: '180' }, { text: '详细信息', value: 'message' }, ] // 显示列 const list = ref([]) // 数据列表 diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue index 611488a..1ac3b55 100644 --- a/src/views/system/log/listLog.vue +++ b/src/views/system/log/listLog.vue @@ -24,15 +24,17 @@ { text: '日志名称', value: 'logName', - width: 150, + width: 170, }, { text: '用户', value: 'userName', + width: 100, }, { text: '时间', value: 'createTime', + width: 180, }, { text: '详细信息',