Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web
This commit is contained in:
commit
c0c4d471d4
@ -90,7 +90,7 @@ class SK004Import extends React.Component {
|
|||||||
var isOk = true
|
var isOk = true
|
||||||
if (info.file.status === 'done') {
|
if (info.file.status === 'done') {
|
||||||
if (info.file.response.IsSuccessful) {
|
if (info.file.response.IsSuccessful) {
|
||||||
Msg = "【" + info.file.name + '】' + info.file.response.Data.Data
|
Msg = "【" + info.file.name + '】' + "导入成功!"//info.file.response.Data.Data
|
||||||
// message.info(`${info.file.name} 导入并保存成功`);
|
// message.info(`${info.file.name} 导入并保存成功`);
|
||||||
} else {
|
} else {
|
||||||
//失败
|
//失败
|
||||||
|
|||||||
@ -63,10 +63,20 @@ function hideLoading() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const __initMenusLocal__ = storage("lacal").getItem("menus").val || [];
|
||||||
|
let __initFlatMenusLocal__ = storage("lacal").getItem("flatMenus").val || [];
|
||||||
|
if (__initMenusLocal__ && __initMenusLocal__.length) {
|
||||||
|
const __tmp__ = [];
|
||||||
|
recurseMenu(__initMenusLocal__, undefined, __tmp__);
|
||||||
|
if (!(__initFlatMenusLocal__ && __initFlatMenusLocal__.length)) {
|
||||||
|
__initFlatMenusLocal__ = __tmp__;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
namespace: "login",
|
namespace: "login",
|
||||||
state: {
|
state: {
|
||||||
loginInfo: { Menus: storage("lacal").getItem("menus").val || [] },
|
loginInfo: { Menus: __initMenusLocal__ },
|
||||||
OrgId: storage("lacal").getItem("webOrgId").val || "",
|
OrgId: storage("lacal").getItem("webOrgId").val || "",
|
||||||
baseConfig: storage("lacal").getItem("baseConfig").val || {},
|
baseConfig: storage("lacal").getItem("baseConfig").val || {},
|
||||||
userId: (storage("lacal").getItem("webUserInfo").val || {}).ID || "",
|
userId: (storage("lacal").getItem("webUserInfo").val || {}).ID || "",
|
||||||
@ -74,7 +84,7 @@ export default {
|
|||||||
Tenant: storage("lacal").getItem("Tenant").val,
|
Tenant: storage("lacal").getItem("Tenant").val,
|
||||||
Notifications: [],
|
Notifications: [],
|
||||||
screenLocked: false, // 是否锁屏
|
screenLocked: false, // 是否锁屏
|
||||||
flatMenus: storage("lacal").getItem("flatMenus").val || [],
|
flatMenus: __initFlatMenusLocal__ || [],
|
||||||
currActivatedTab: null, // 用于面包屑导航,同步于 model app
|
currActivatedTab: null, // 用于面包屑导航,同步于 model app
|
||||||
currActivatedMenu: null, // 当前选中的菜单项,同步于 model app
|
currActivatedMenu: null, // 当前选中的菜单项,同步于 model app
|
||||||
roles: storage("lacal").getItem("roles").val || [],
|
roles: storage("lacal").getItem("roles").val || [],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user