From 5114afab01925676dd3907c58231321511773d7c Mon Sep 17 00:00:00 2001 From: jingna <1264204245@qq.com> Date: Thu, 19 Jun 2025 14:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/data-visualization/manage/menu.ts | 10 +++++----- .../data-visualization/manage/organization.ts | 12 ++++++------ .../src/api/data-visualization/manage/role.ts | 16 ++++++++-------- .../src/api/data-visualization/manage/user.ts | 16 ++++++++-------- frontend/src/api/data-visualization/module.ts | 1 + frontend/src/utils/rsaEncrypt.ts | 9 +-------- .../system/userlogin/appframe_container.vue | 6 +++--- 7 files changed, 32 insertions(+), 38 deletions(-) diff --git a/frontend/src/api/data-visualization/manage/menu.ts b/frontend/src/api/data-visualization/manage/menu.ts index ee66fc2..2e91b5b 100644 --- a/frontend/src/api/data-visualization/manage/menu.ts +++ b/frontend/src/api/data-visualization/manage/menu.ts @@ -1,7 +1,7 @@ import request from '@/data-visualization/config/axios' -export const getMenuTree = params => request.post({ url: '/menuInterface/getMenuTree', params }) // 查询菜单 -export const addMenu = data => request.post({ url: '/menuInterface/addMenu', data }) // 新增菜单 -export const updateMenuById = data => request.post({ url: '/menuInterface/updateMenuById', data }) //修改菜单 -export const deleteMenuById = id => request.post({ url: '/menuInterface/deleteMenuById?id=' + id }) //删除菜单 -export const setModuleId = params => request.post({ url: '/menuInterface/setModuleId',params }) //关联模块 \ No newline at end of file +export const getMenuTree = (params:any) => request.post({ url: '/menuInterface/getMenuTree', params }) // 查询菜单 +export const addMenu = (data:any) => request.post({ url: '/menuInterface/addMenu', data }) // 新增菜单 +export const updateMenuById = (data:any) => request.post({ url: '/menuInterface/updateMenuById', data }) //修改菜单 +export const deleteMenuById = (id:any) => request.post({ url: '/menuInterface/deleteMenuById?id=' + id }) //删除菜单 +export const setModuleId = (params:any) => request.post({ url: '/menuInterface/setModuleId',params }) //关联模块 \ No newline at end of file diff --git a/frontend/src/api/data-visualization/manage/organization.ts b/frontend/src/api/data-visualization/manage/organization.ts index 278f281..238dae8 100644 --- a/frontend/src/api/data-visualization/manage/organization.ts +++ b/frontend/src/api/data-visualization/manage/organization.ts @@ -1,8 +1,8 @@ import request from '@/data-visualization/config/axios' -export const getOrganizations = params => request.post({ url: '/organization/getOrganizations', params }) // 查询企业/部门 -export const addOrganization = data => request.post({ url: '/organization/addOrganization', data }) // 新增企业/部门 -export const updateOrganizationById = data => request.post({ url: '/organization/updateOrganizationById', data }) //修改企业/部门 -export const setIsValid = params => request.post({ url: '/organization/setIsValid', params }) //设置有效状态 -export const deleteById = id => request.delete({ url: '/organization/deleteById?id=' + id }) //删除 -export const getOrganizationById = appId => request.post({ url: '/organization/listOrganization?appId=' + appId })//查询所有 +export const getOrganizations = (params:any) => request.post({ url: '/organization/getOrganizations', params }) // 查询企业/部门 +export const addOrganization = (data:any) => request.post({ url: '/organization/addOrganization', data }) // 新增企业/部门 +export const updateOrganizationById = (data:any) => request.post({ url: '/organization/updateOrganizationById', data }) //修改企业/部门 +export const setIsValid = (params:any) => request.post({ url: '/organization/setIsValid', params }) //设置有效状态 +export const deleteById = (id:any) => request.delete({ url: '/organization/deleteById?id=' + id }) //删除 +export const getOrganizationById = (appId:any) => request.post({ url: '/organization/listOrganization?appId=' + appId })//查询所有 diff --git a/frontend/src/api/data-visualization/manage/role.ts b/frontend/src/api/data-visualization/manage/role.ts index 6c119c0..3fea0c7 100644 --- a/frontend/src/api/data-visualization/manage/role.ts +++ b/frontend/src/api/data-visualization/manage/role.ts @@ -1,10 +1,10 @@ import request from '@/data-visualization/config/axios' -export const listRole = params => request.post({ url: '/role/listRole', params }) // 查询角色 -export const addRole = data => request.post({ url: '/role/addRole', data }) // 新增角色 -export const updateRole = data => request.post({ url: '/role/updateRole', data }) //修改企业/部门 -export const setIsValid = params => request.post({ url: '/role/setIsvaild', params }) //设置有效状态 -export const deleteRoleById = id => request.post({ url: '/role/deleteRoleById?id=' + id }) //删除 -export const deleteRoleByIds = id => request.post({ url: '/role/deleteRoleByIds?ids=' + id }) //删除 -export const permissionAssignment = params => request.post({ url: '/menuInterface/permissionAssignment', params }) //查询角色权限 -export const setMenuByRoleId = params => request.post({ url: '/role/setMenuByRoleId', params }) //设置角色权限 +export const listRole = (params:any) => request.post({ url: '/role/listRole', params }) // 查询角色 +export const addRole = (data:any) => request.post({ url: '/role/addRole', data }) // 新增角色 +export const updateRole = (data:any) => request.post({ url: '/role/updateRole', data }) //修改企业/部门 +export const setIsValid = (params:any) => request.post({ url: '/role/setIsvaild', params }) //设置有效状态 +export const deleteRoleById = (id:any) => request.post({ url: '/role/deleteRoleById?id=' + id }) //删除 +export const deleteRoleByIds = (id:any) => request.post({ url: '/role/deleteRoleByIds?ids=' + id }) //删除 +export const permissionAssignment = (params:any) => request.post({ url: '/menuInterface/permissionAssignment', params }) //查询角色权限 +export const setMenuByRoleId = (params:any) => request.post({ url: '/role/setMenuByRoleId', params }) //设置角色权限 diff --git a/frontend/src/api/data-visualization/manage/user.ts b/frontend/src/api/data-visualization/manage/user.ts index 57192b6..18f0ec9 100644 --- a/frontend/src/api/data-visualization/manage/user.ts +++ b/frontend/src/api/data-visualization/manage/user.ts @@ -1,10 +1,10 @@ import request from '@/data-visualization/config/axios' -export const queryUsers = params => request.get({ url: '/user/queryUsers', params }) // 查询用户 -export const addUser = data => request.post({ url: '/user/addUser', data }) // 新增用户 -export const updateUser = data => request.post({ url: '/user/updateUser', data }) //修改用户 -export const setStatus = params => request.post({ url: '/user/setStatus', params }) //设置有效状态 -export const deleteUserById = id => request.post({ url: '/user/deleteUserById?id=' + id }) //删除 -export const deleteUserByIds = id => request.post({ url: '/user/deleteUserByIds?ids=' + id }) //删除 -export const resetPassword = id => request.post({ url: '/user/resetPassword?id=' + id }) //重置密码 -export const userLogin = params => request.post({ url: '/user/login', params }) //登录 \ No newline at end of file +export const queryUsers = (params:any) => request.get({ url: '/user/queryUsers', params }) // 查询用户 +export const addUser = (data:any) => request.post({ url: '/user/addUser', data }) // 新增用户 +export const updateUser = (data:any) => request.post({ url: '/user/updateUser', data }) //修改用户 +export const setStatus = (params:any) => request.post({ url: '/user/setStatus', params }) //设置有效状态 +export const deleteUserById = (id:any) => request.post({ url: '/user/deleteUserById?id=' + id }) //删除 +export const deleteUserByIds = (id:any) => request.post({ url: '/user/deleteUserByIds?ids=' + id }) //删除 +export const resetPassword = (id:any) => request.post({ url: '/user/resetPassword?id=' + id }) //重置密码 +export const userLogin = (params:any) => request.post({ url: '/user/login', params }) //登录 \ No newline at end of file diff --git a/frontend/src/api/data-visualization/module.ts b/frontend/src/api/data-visualization/module.ts index d4c6785..dd5b26a 100644 --- a/frontend/src/api/data-visualization/module.ts +++ b/frontend/src/api/data-visualization/module.ts @@ -1,3 +1,4 @@ import request from '@/data-visualization/config/axios' export const moduleById = id => request.get({ url: '/application/module/'+id }) +export const moduleList = (params:any) => request.get({ url: '/module/list',params }) \ No newline at end of file diff --git a/frontend/src/utils/rsaEncrypt.ts b/frontend/src/utils/rsaEncrypt.ts index 00590bb..e26ab7a 100644 --- a/frontend/src/utils/rsaEncrypt.ts +++ b/frontend/src/utils/rsaEncrypt.ts @@ -4,14 +4,7 @@ import JSEncrypt from 'jsencrypt/bin/jsencrypt.min' const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' + '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==' -const privateKey = 'MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8\n' + - 'mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9p\n' + - 'B6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue\n' + - '/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZ\n' + - 'UBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6\n' + - 'vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha\n' + - '4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3\n' + - 'tTbklZkD2A==' +const privateKey = 'MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==' // 加密 export function encrypt(txt:string) { diff --git a/frontend/src/views/system/userlogin/appframe_container.vue b/frontend/src/views/system/userlogin/appframe_container.vue index 6270eef..4b17871 100644 --- a/frontend/src/views/system/userlogin/appframe_container.vue +++ b/frontend/src/views/system/userlogin/appframe_container.vue @@ -16,8 +16,8 @@ import { i18n } from '@/data-visualization/plugins/vue-i18n' import defaultTemplate from '@/views/system/userlogin/frame.vue?raw' // import { moduleUpdate, moduleById } from '@/api/application/module' import { useCache } from '@/data-visualization/hooks/web/useCache' -import { getMenuTree } from '@/api/permission/menu' -import { moduleList } from '@/api/application/module' +import { getMenuTree } from '@/api/data-visualization/manage/menu' +import { moduleList } from '@/api/data-visualization/module' import { any } from 'vue-types' const route = useRoute() const router = useRouter() @@ -184,7 +184,7 @@ function getmenuinfo() { menuList.value = res.data const paramss = { appId: applicationId.value } moduleList(paramss).then((ress:any) => { - var arr = ress.data.data + var arr = ress.data menuList.value = processMenuTree(menuList.value, arr) }) })