From 1e2c2fb3ffd982dc7a132b8dc615a119111b8bd5 Mon Sep 17 00:00:00 2001
From: xinghaodong <975115611@qq.com>
Date: Sat, 28 Dec 2024 17:40:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor(systemSetting):=20=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E5=86=85=E9=83=A8=E7=94=A8=E6=88=B7=E5=92=8C=E7=BB=84?=
=?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在内部用户页面中，使用可选链操作符改进了对 avatar 属性的访问
- 在组织管理页面中，修复了编辑和删除操作的逻辑错误
- 新增了组织详情和删除组织的 API 接口
---
src/pages/systemSetting/internalusers.vue | 4 ++--
src/pages/systemSetting/management.vue | 9 +++++----
src/utils/request.js | 8 ++++++++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/pages/systemSetting/internalusers.vue b/src/pages/systemSetting/internalusers.vue
index f7a70e9..e442407 100644
--- a/src/pages/systemSetting/internalusers.vue
+++ b/src/pages/systemSetting/internalusers.vue
@@ -29,14 +29,14 @@
diff --git a/src/pages/systemSetting/management.vue b/src/pages/systemSetting/management.vue
index 6814209..fe97af4 100644
--- a/src/pages/systemSetting/management.vue
+++ b/src/pages/systemSetting/management.vue
@@ -17,8 +17,8 @@
- 编辑
- 删除
+ 编辑
+ 删除
@@ -137,12 +137,13 @@ const onSubmit = formEl => {
};
// 删除
const handleDelete = async row => {
+ console.log(row);
proxy.$messageBox
.confirm('确定要删除吗?', '提示', {
type: '提示',
})
.then(async () => {
- const data = await proxy.$api.deletemenu({ id: row });
+ const data = await proxy.$api.deleteOrganization({ id: row });
if (data.code == 200) {
proxy.$message.success(data.message);
getOrganizationList();
@@ -153,7 +154,7 @@ const handleDelete = async row => {
const handleEdit = async row => {
dialogVisible.value = true;
// 调用详情接口
- const data = await proxy.$api.detail({ id: row.id });
+ const data = await proxy.$api.detailOrganization({ id: row });
Object.assign(form, data.data);
if (!data.data.parentId) {
form.parentId = 0;
diff --git a/src/utils/request.js b/src/utils/request.js
index ff01dc6..1ce1458 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -231,6 +231,14 @@ export default {
addOrganization(params) {
return oPost(baseUrl + '/orgManagement/add', params);
},
+ // 组织详情
+ detailOrganization(params) {
+ return oGet(baseUrl + '/orgManagement/detail', params);
+ },
+ // 删除组织
+ deleteOrganization(params) {
+ return oPost(baseUrl + '/orgManagement/delete', params);
+ },
};
//封装post/get请求
--
Gitee
From 04a3526bd99c4c9899157514cb40e55e4f6b2e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A2=E6=B5=A9=E4=B8=9C?= <975115611@qq.com>
Date: Fri, 3 Jan 2025 18:08:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(menu):=20=E4=BC=98=E5=8C=96=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加资源类型列和角色选择功能
- 优化菜单数据加载逻辑
- 清理 localStorage 数据
- 修复一些菜单相关的问题
---
src/home.vue | 7 ++++---
src/pages/index.vue | 34 +++++++++++++++++++++++++++-------
src/router/index.js | 6 +++++-
src/stortes/menu.js | 5 ++++-
4 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/src/home.vue b/src/home.vue
index 5bf83f6..6ca31a6 100644
--- a/src/home.vue
+++ b/src/home.vue
@@ -70,7 +70,7 @@ const rightMouseData = ref(null);
const rightMouseKey = ref(null);
// 一定一个波尔变量是否显示关闭右侧菜单
const isRightMenu = ref(false);
-const isShowRouter = ref(true);
+const isShowRouter = ref(false);
const isActiveMenu = ref(false);
const isLeftMenu = ref(false);
// 定义contextMenuVisible默认为 false
@@ -236,9 +236,10 @@ onMounted(async () => {
getMatched();
try {
userData.value = allArray.value;
+ nextTick(() => {
+ isShowRouter.value = true; // 确保在DOM更新后再显示路由
+ });
return;
- // const res = await proxy.$api.menus();
- // userData.value = res.data;
getscoket();
} catch (error) {
console.error('失败信息:', error);
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 47dc4a6..74eef32 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -15,6 +15,12 @@
+
+
+ 菜单
+ 按钮
+
+
@@ -52,12 +58,12 @@
-->
-
+
@@ -102,7 +108,7 @@
-
+
+
+
+
+
+
+
+
+
- 新增
+ 新增
@@ -143,12 +136,10 @@
-
请选择图标
-
@@ -221,20 +211,18 @@ Object.keys(proxy.$icon).map(item => {
value: item,
});
});
-const form = reactive({
- name: '',
- parentId: 0,
- url: '',
- component: '',
- sorts: 1,
- keepalive: 1,
- icon: '',
-});
+const formTemplate = { name: '', parentId: 0, url: '', component: '', sorts: 1, keepalive: 1, icon: '', menutype: 1, perms: '', code: '', roleIds: [] };
+const form = reactive({ ...formTemplate });
const treeData = ref(null);
const roleList = ref([]);
const handleClose = done => {
done();
};
+const add = () => {
+ dialogVisible.value = true;
+ Object.assign(form, formTemplate);
+ resetForm(ruleFormRef);
+};
const handleUnitChange = val => {};
// 重置表单
const resetForm = () => {
diff --git a/src/pages/systemSetting/roleManagement.vue b/src/pages/systemSetting/roleManagement.vue
index 663b9b9..4905ad8 100644
--- a/src/pages/systemSetting/roleManagement.vue
+++ b/src/pages/systemSetting/roleManagement.vue
@@ -129,7 +129,6 @@ const submitResource = () => {
treeArray = treeArray.concat(treeArray1);
}
console.log(ruleForm, treeArray, '333');
-
proxy.$api.assignMenusToRole({ id: ruleForm.id, menuIds: treeArray || [] }).then(res => {
proxy.$message.success(res.message);
dialogVisibleResource.value = false;
--
Gitee