Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit be2a25f

Browse files
fix: log action error
1 parent 438f665 commit be2a25f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎src/api/request.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,18 @@ instance.interceptors.response.use(response => {
8989
*@param{String} url [请求地址]
9090
*@param{Object} params 请求参数
9191
*/
92-
export function Get(url, params) {
92+
export function Get(url, params={},responseType='json') {
9393
return new Promise((resolve, reject) => {
9494
instance.get(url, {
95-
params: params
95+
params: params,
96+
responseType: responseType
9697
}).then((res) => {
97-
resolve(res.data);
98+
// 如果是 blob 类型,直接返回响应,而不是 res.data
99+
resolve(responseType === 'blob' ? res : res.data);
98100
}).catch((error) => {
99-
reject(error.data);
100-
})
101-
})
101+
reject(error);
102+
});
103+
});
102104
}
103105

104106
/*
@@ -185,4 +187,8 @@ export function BackendUrl() {
185187
export function GetStaticSource(url, param) {
186188
const token = localStorage.getItem("token")
187189
return instance.defaults.baseURL + url + param + "?token=" + token;
190+
}
191+
192+
export function GetStaticSourceWithoutToken(url, param) {
193+
return instance.defaults.baseURL + url + param;
188194
}

‎src/views/admin/DocLog.vue‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ export default {
4949
{
5050
title: '用户',
5151
key: 'user',
52-
width: 200
52+
width: 120
5353
},
5454
{
5555
title: '动作',
5656
key: 'action',
57-
width: 180
57+
width: 120
5858
},
5959
{
6060
title: '文档名称',
@@ -69,12 +69,6 @@ export default {
6969
}
7070
],
7171
data: [],
72-
73-
actionMap: {
74-
DELETE: '删除',
75-
GET: '查询'
76-
},
77-
7872
height: 600,
7973
currentPage: this.$route.query.page || 1,
8074
totalItems: 5,
@@ -110,7 +104,7 @@ export default {
110104
obj['id'] = resultElement['id']
111105
obj['time'] = parseTime(new Date(resultElement['createDate']), '{y}年{m}月{d}日 {h}:{i}:{s}');// resultElement['createTime']
112106
obj['user'] = resultElement['userName']
113-
obj['action'] = this.actionMap[resultElement['action']] || "未知动作"
107+
obj['action'] = resultElement['action'] || "未知动作"
114108
obj['name'] = resultElement['docName']
115109
this.data.push(obj)
116110
obj = {}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /