a5d80329 by lxs

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents ab2d0a0d ce1a4de5
......@@ -25,10 +25,17 @@ export const refreshToken = (params) => {
})
}
export const getSystemMenu = (params) => {
/** 获取登录人员的菜单 */
export const getSystemMenu = (params, isAdmin) => {
return request({
url: `${import.meta.env.VITE_APP_AUTH_URL
}/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`,
url:
isAdmin == "Y"
? `${
import.meta.env.VITE_APP_AUTH_URL
}/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`
: `${
import.meta.env.VITE_APP_AUTH_URL
}/product-menu-permission/staff/get-product-menu-template?platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`,
method: "get",
});
};
......
......@@ -60,7 +60,7 @@ const useUserStore = defineStore(
userName.value = res.data.staffName;
localStorage.setItem('userName', res.data?.staffName);
localStorage.setItem('userData', JSON.stringify(res.data));
return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => { //解决页面调用流程接口传递staffGuid,为空的问题
return getSystemMenu({ tenantGuid: currentTenantGuid.value }, res.data?.isAdmin).then((info: any) => { //解决页面调用流程接口传递staffGuid,为空的问题
if (info.code == '00000') {
localStorage.setItem('userInfoData', JSON.stringify(info.data));
userInfoData.value = info.data;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!