mirror of
https://gitee.com/orangeform/orange-admin.git
synced 2026-01-18 02:56:30 +08:00
commit:同步2.2版本
This commit is contained in:
@@ -1,23 +1,15 @@
|
||||
import { FlowOperationController } from '@/api/flowController.js';
|
||||
|
||||
// 催办消息下拉个数
|
||||
const MESSAGE_SHOW_COUNT = 10;
|
||||
// 催办消息轮询间隔
|
||||
const MESSAGE_TIMER_INTERVAL = 10000;
|
||||
const MESSAGE_TIMER_INTERVAL = 1000 * 60 * 5;
|
||||
|
||||
// 获得消息列表数据
|
||||
function loadMessage (context, owner) {
|
||||
let params = {
|
||||
pageParam: {
|
||||
pageSize: MESSAGE_SHOW_COUNT,
|
||||
pageNum: 1
|
||||
}
|
||||
}
|
||||
FlowOperationController.listRemindingTask(owner, params, null, {
|
||||
FlowOperationController.getMessageCount(owner, {}, null, {
|
||||
showMask: false,
|
||||
showError: false
|
||||
}).then(res => {
|
||||
context.commit('setMessageList', res.data);
|
||||
context.commit('setMessageCount', res.data);
|
||||
}).catch(e => {
|
||||
console.error(e);
|
||||
});
|
||||
|
||||
@@ -83,7 +83,7 @@ export default {
|
||||
getCurrentColumnId: (state) => {
|
||||
return state.currentColumnId;
|
||||
},
|
||||
getMessageList: (state) => {
|
||||
return state.messageList;
|
||||
getMessageCount: (state) => {
|
||||
return state.messageCount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -158,10 +158,14 @@ export default {
|
||||
if (setObjectToSessionStorage('currentColumnId', columnId)) state.currentColumnId = columnId;
|
||||
if (setObjectToSessionStorage('currentMenuId', null)) state.currentMenuId = null;
|
||||
},
|
||||
setHeadImage: (state, imageHeaderUrl) => {
|
||||
if (state.userInfo) state.userInfo.headImageUrl = imageHeaderUrl;
|
||||
},
|
||||
setMessageTimer: (state, timerHandler) => {
|
||||
state.messageTimer = timerHandler;
|
||||
},
|
||||
setMessageList: (state, messageList) => {
|
||||
state.messageList = messageList;
|
||||
setMessageCount: (state, messageCount) => {
|
||||
if (messageCount) messageCount.totalCount = messageCount.copyMessageCount + messageCount.remindingMessageCount;
|
||||
state.messageCount = messageCount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,5 +28,5 @@ export default {
|
||||
currentColumnId: getObjectFromSessionStorage('currentColumnId', undefined),
|
||||
// 消息列表
|
||||
messageTimeer: null,
|
||||
messageList: []
|
||||
messageCount: []
|
||||
}
|
||||
|
||||
@@ -27,6 +27,22 @@ function initUserInfo (userInfo) {
|
||||
userInfo.permCodeSet = new Set(userInfo.permCodeList);
|
||||
}
|
||||
|
||||
if (userInfo != null && userInfo.headImageUrl != null && userInfo.headImageUrl !== '') {
|
||||
try {
|
||||
userInfo.headImageUrl = JSON.parse(userInfo.headImageUrl);
|
||||
if (Array.isArray(userInfo.headImageUrl)) {
|
||||
userInfo.headImageUrl = userInfo.headImageUrl[0];
|
||||
} else {
|
||||
userInfo.headImageUrl = null;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('解析头像数据失败!', e);
|
||||
userInfo.headImageUrl = null;
|
||||
}
|
||||
} else {
|
||||
if (userInfo) userInfo.headImageUrl = null;
|
||||
}
|
||||
|
||||
return userInfo;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user