diff --git a/src/pages/index.vue b/src/pages/index.vue
index e6f15355438257349dc3249dfe85e3942656e8e5..a7abf7e245a3a1c861c6b609d55eff896ba08e40 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,354 +1,7 @@
+<!--首页 -->
 <template>
-    <div>
-        <!--首页 -->
-        <div class="mb-4">
-            <el-button type="primary" @click="add">新增</el-button>
-        </div>
-        <!-- 生成一个菜单树表格 -->
-        <el-table :data="treeData" style="width: 100%; margin-bottom: 20px" row-key="id" border default-expand-all>
-            <el-table-column prop="name" label="菜单名" />
-            <el-table-column prop="url" label="菜单名地址" />
-            <el-table-column prop="menutype" label="资源类型" width="100">
-                <template #default="{ row }">
-                    <el-tag v-if="row.menutype == 1" type="success">菜单</el-tag>
-                    <el-tag v-if="row.menutype == 2">按钮</el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column prop="id" label="id" />
-            <el-table-column label="操作" width="140" align="left">
-                <template #default="scope">
-                    <el-button v-if="scope.row.id" type="primary" link @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button v-if="scope.row.id" type="primary" link @click="handleDelete(scope.row.id)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <el-dialog v-model="dialogVisible" :title="form.id ? '修改菜单' : '新增菜单'" width="650" :before-close="handleClose">
-            <el-form :model="form" :label-width="formLabelWidth" :rules="rules" ref="ruleFormRef">
-                <el-row>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="菜单名称" prop="name">
-                            <el-input v-model="form.name" autocomplete="off" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="上级菜单" prop="parentId">
-                            <el-tree-select
-                                @change="val => handleUnitChange(val)"
-                                v-model="form.parentId"
-                                node-key="id"
-                                :data="treeData"
-                                :props="treeProps"
-                                :default-expanded-keys="[0]"
-                                check-strictly
-                                :render-after-expand="false"
-                                placeholder="请选择上级菜单"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                    <el-form-item label="菜单地址" prop="url">
-                        <el-input v-model="form.url" autocomplete="off" />
-                    </el-form-item>
-                </el-col> -->
-                    <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="24">
-                        <el-form-item label="资源类型" prop="menutype">
-                            <el-radio v-model="form.menutype" label="1" border>菜单</el-radio>
-                            <el-radio v-model="form.menutype" label="2" border>按钮</el-radio>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
-                        <el-form-item label="资源序号" prop="sorts">
-                            <el-input-number v-model="form.sorts" placeholder="请输入"></el-input-number>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item prop="code">
-                            <template #label>
-                                <el-tooltip content="资源的唯一编码，菜单的是组件名称" placement="top">
-                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
-                                </el-tooltip>
-                                资源编码
-                            </template>
-                            <el-input v-model="form.code" placeholder="请输入" clearable />
-                        </el-form-item>
-                    </el-col>
-                    <!-- <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" v-show="form.menutype === 1">
-                        <el-form-item label="是否外链" prop="outlink">
-                            <el-radio v-model="form.outlink" :label="1" border>是</el-radio>
-                            <el-radio v-model="form.outlink" :label="0" border>否</el-radio>
-                        </el-form-item>
-                    </el-col> -->
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item prop="">
-                            <template #label>
-                                <el-tooltip content="访问的路由地址，如：`/user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
-                                </el-tooltip>
-                                路由路径
-                            </template>
-                            <el-input v-model="form.url" placeholder="请输入"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="" prop="component">
-                            <template #label>
-                                <el-tooltip content="pages下组件位置 以/开头" placement="top">
-                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
-                                </el-tooltip>
-                                组件位置
-                            </template>
-                            <el-input v-model="form.component" placeholder="请输入"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="" prop="perms">
-                            <template #label>
-                                <el-tooltip content="权限唯一标识，如：`user:add`，模块名：功能名" placement="top">
-                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
-                                </el-tooltip>
-                                权限标识
-                            </template>
-                            <el-input v-model="form.perms" placeholder="请输入"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <!-- 角色 下拉多选 -->
-                        <el-form-item label="资源角色" prop="roleIds">
-                            <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                                <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="是否有效" prop="states">
-                            <el-radio v-model="form.states" :label="1" border>是</el-radio>
-                            <el-radio v-model="form.states" :label="0" border>否</el-radio>
-                        </el-form-item>
-                    </el-col> -->
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="是否缓存" prop="keepalive">
-                            <el-radio v-model="form.keepalive" :label="'1'" border>是</el-radio>
-                            <el-radio v-model="form.keepalive" :label="'0'" border>否</el-radio>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="菜单图标" prop="icon">
-                            <el-col :span="22">
-                                <el-popover ref="iconListPopover" :width="500" popper-class="mod-menu__icon-popover" placement="top-start" trigger="click" :visible="visible">
-                                    <div class="popover-title">请选择图标</div>
-                                    <el-scrollbar style="height: 95%" wrap-style="overflow-x:hidden;">
-                                        <div class="mod-menu__icon-list">
-                                            <el-button
-                                                v-for="(item, index) in iconList"
-                                                :key="index"
-                                                class="buttonP"
-                                                style="font-size: 16px"
-                                                @click="iconActiveHandle(item.value)"
-                                                :class="{ 'is-active': item.value === form.icon }"
-                                            >
-                                                <el-icon>
-                                                    <component :is="item.value" />
-                                                </el-icon>
-                                            </el-button>
-                                        </div>
-                                    </el-scrollbar>
-                                    <template #reference>
-                                        <el-input v-model="form.icon" @click="visible = true" :readonly="true" placeholder="请选择菜单图标">
-                                            <template #prepend>
-                                                <el-icon v-if="form.icon" class="tooltip-icon">
-                                                    <component :is="form.icon" />
-                                                </el-icon>
-                                            </template>
-                                        </el-input>
-                                    </template>
-                                </el-popover>
-                            </el-col>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="onSubmit(ruleFormRef)"> 确定 </el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
+    <div>这是首页、工作台</div>
 </template>
 
-<script setup>
-import { ref, reactive, onMounted, getCurrentInstance } from 'vue';
-import useUserInfoStore from '@/stortes/user'; //引入仓库
-import { storeToRefs } from 'pinia'; //引入pinia转换
-const { proxy } = getCurrentInstance();
-const dialogVisible = ref(false);
-const userInfoStore = useUserInfoStore();
-
-const { userInfo } = storeToRefs(userInfoStore); // 响应式
-const formLabelWidth = '100px';
-const ruleFormRef = ref();
-const treeProps = {
-    children: 'children',
-    label: 'name',
-};
-const rules = {
-    name: [{ required: true, message: '请输入菜单名字', trigger: 'blur' }],
-    parentId: [{ required: false, message: '请选择上级菜单', trigger: 'change' }],
-    url: [{ required: false, message: '请输入菜单地址', trigger: 'blur' }],
-    code: [{ required: true, message: '请输入菜单编码', trigger: 'blur' }],
-    sorts: [{ required: true, message: '请输入菜单序号', trigger: 'blur' }],
-    menutype: [{ required: true, message: '请选择菜单类型', trigger: 'blur' }],
-};
-const visible = ref(false);
-// 示例的图标列表
-const iconList = ref([]);
-
-Object.keys(proxy.$icon).map(item => {
-    iconList.value.push({
-        value: item,
-    });
-});
-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 = () => {
-    if (ruleFormRef.value) ruleFormRef.value.resetFields();
-};
-// 处理图标点击事件
-const iconActiveHandle = iconValue => {
-    visible.value = false; // 关闭弹出框
-    form.icon = iconValue;
-};
-
-const onSubmit = formEl => {
-    formEl.validate(async valid => {
-        if (!valid) {
-            return false;
-        }
-        console.log(form);
-        if (form.id) {
-            // 更新菜单
-            proxy.$api.updatemenu(form).then(res => {
-                if (res.code == 200) {
-                    proxy.$message.success(res.message);
-                    dialogVisible.value = false;
-                    getTreeData();
-                }
-            });
-        } else {
-            // 新增菜单
-            if (form.parentId == 0) {
-                form.parentId = '';
-            }
-            // return;
-            const data = await proxy.$api.addmenu(form);
-            if (data.code == 200) {
-                dialogVisible.value = false;
-                proxy.$message.success(data.message);
-                getTreeData();
-            }
-        }
-    });
-};
-// 删除菜单
-const handleDelete = async row => {
-    // 弹框提示 校验
-    proxy.$messageBox
-        .confirm('确定要删除吗?', '提示', {
-            type: '提示',
-        })
-        .then(async () => {
-            const data = await proxy.$api.deletemenu({ id: row });
-            if (data.code == 200) {
-                proxy.$message.success(data.message);
-                getTreeData();
-            }
-        });
-};
-// 修改菜单
-const handleEdit = async row => {
-    dialogVisible.value = true;
-    // 调用详情接口
-    const data = await proxy.$api.detail({ id: row.id });
-    Object.assign(form, data.data);
-    if (!data.data.parentId) {
-        form.parentId = 0;
-    }
-};
-
-// 获取菜单
-const getTreeData = async () => {
-    const res = await proxy.$api.menus();
-    const treedata = getParentMenuTree(res.data);
-    treeData.value = treedata;
-};
-
-const getParentMenuTree = tableTreeDdata => {
-    let parent = {
-        parentId: '',
-        name: '顶级菜单',
-        id: 0,
-        children: tableTreeDdata,
-    };
-    return [parent];
-};
-
-onMounted(async () => {
-    try {
-        await getTreeData();
-        proxy.$api.getRolsList().then(res => {
-            roleList.value = res.data;
-        });
-    } catch (error) {
-        console.error('失败信息:', error);
-    }
-});
-</script>
-<style>
-.iconsStyle {
-    top: 9px;
-    right: 3px;
-    cursor: pointer;
-}
-
-.mod-menu__icon-list {
-    overflow: auto;
-    height: 100%;
-}
-
-.mod-menu__icon-popover {
-    width: 510px;
-    height: 350px !important;
-    overflow: hidden !important;
-}
-.buttonP {
-    margin-left: 10px !important;
-    margin-bottom: 10px !important;
-}
-
-.el-button--medium {
-    padding: 10px 20px;
-    font-size: 13px;
-    border-radius: 4px;
-}
-.popover-title {
-    margin-bottom: 12px;
-    font-size: 14px;
-    padding-left: 9px;
-    color: #303133;
-}
-</style>
+<script setup></script>
+<style></style>
diff --git a/src/pages/systemSetting/internalusers.vue b/src/pages/systemSetting/internalusers.vue
index 188958cef4c5d922ad830fb477622060ec8f819d..10b8dcf36ae081bfe9b810018c41b8d51a541690 100644
--- a/src/pages/systemSetting/internalusers.vue
+++ b/src/pages/systemSetting/internalusers.vue
@@ -172,19 +172,8 @@ const rules = {
 const resetForm = () => {
     ruleForm = reactive({ ...formTemplate });
     if (ruleFormRef.value) ruleFormRef.value.resetFields();
-    // if (formRef.value) {
-    //     formRef.value.resetFields();
-    // }
 };
 const dialogVisible = ref(false);
-// const requestajax = async () => {
-//     // try catch包下
-//     const formData = new FormData();
-//     formData.append('file', ruleForm.file);
-//     console.log(ruleForm.file, 'ruleForm.file');
-//     const res = await proxy.$api.post('/api/upload/uploadFile', formData);
-//     console.log(res, '4554');
-// };
 const handleSizeChange = val => {
     pageSize.value = val;
     getInternalUsers();
@@ -201,7 +190,6 @@ onMounted(() => {
     });
     // 组织列表
     proxy.$api.getOrganizationList().then(res => {
-        console.log(res.data, 'res.data');
         zztree.value = res.data;
         // ruleForm.organizationId = res.data[0].id;
     });
diff --git a/src/pages/systemSetting/menuResource.vue b/src/pages/systemSetting/menuResource.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e6f15355438257349dc3249dfe85e3942656e8e5
--- /dev/null
+++ b/src/pages/systemSetting/menuResource.vue
@@ -0,0 +1,354 @@
+<template>
+    <div>
+        <!--首页 -->
+        <div class="mb-4">
+            <el-button type="primary" @click="add">新增</el-button>
+        </div>
+        <!-- 生成一个菜单树表格 -->
+        <el-table :data="treeData" style="width: 100%; margin-bottom: 20px" row-key="id" border default-expand-all>
+            <el-table-column prop="name" label="菜单名" />
+            <el-table-column prop="url" label="菜单名地址" />
+            <el-table-column prop="menutype" label="资源类型" width="100">
+                <template #default="{ row }">
+                    <el-tag v-if="row.menutype == 1" type="success">菜单</el-tag>
+                    <el-tag v-if="row.menutype == 2">按钮</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="id" label="id" />
+            <el-table-column label="操作" width="140" align="left">
+                <template #default="scope">
+                    <el-button v-if="scope.row.id" type="primary" link @click="handleEdit(scope.row)">编辑</el-button>
+                    <el-button v-if="scope.row.id" type="primary" link @click="handleDelete(scope.row.id)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-dialog v-model="dialogVisible" :title="form.id ? '修改菜单' : '新增菜单'" width="650" :before-close="handleClose">
+            <el-form :model="form" :label-width="formLabelWidth" :rules="rules" ref="ruleFormRef">
+                <el-row>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="菜单名称" prop="name">
+                            <el-input v-model="form.name" autocomplete="off" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="上级菜单" prop="parentId">
+                            <el-tree-select
+                                @change="val => handleUnitChange(val)"
+                                v-model="form.parentId"
+                                node-key="id"
+                                :data="treeData"
+                                :props="treeProps"
+                                :default-expanded-keys="[0]"
+                                check-strictly
+                                :render-after-expand="false"
+                                placeholder="请选择上级菜单"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                    <el-form-item label="菜单地址" prop="url">
+                        <el-input v-model="form.url" autocomplete="off" />
+                    </el-form-item>
+                </el-col> -->
+                    <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="24">
+                        <el-form-item label="资源类型" prop="menutype">
+                            <el-radio v-model="form.menutype" label="1" border>菜单</el-radio>
+                            <el-radio v-model="form.menutype" label="2" border>按钮</el-radio>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
+                        <el-form-item label="资源序号" prop="sorts">
+                            <el-input-number v-model="form.sorts" placeholder="请输入"></el-input-number>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item prop="code">
+                            <template #label>
+                                <el-tooltip content="资源的唯一编码，菜单的是组件名称" placement="top">
+                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
+                                </el-tooltip>
+                                资源编码
+                            </template>
+                            <el-input v-model="form.code" placeholder="请输入" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" v-show="form.menutype === 1">
+                        <el-form-item label="是否外链" prop="outlink">
+                            <el-radio v-model="form.outlink" :label="1" border>是</el-radio>
+                            <el-radio v-model="form.outlink" :label="0" border>否</el-radio>
+                        </el-form-item>
+                    </el-col> -->
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item prop="">
+                            <template #label>
+                                <el-tooltip content="访问的路由地址，如：`/user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
+                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
+                                </el-tooltip>
+                                路由路径
+                            </template>
+                            <el-input v-model="form.url" placeholder="请输入"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="" prop="component">
+                            <template #label>
+                                <el-tooltip content="pages下组件位置 以/开头" placement="top">
+                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
+                                </el-tooltip>
+                                组件位置
+                            </template>
+                            <el-input v-model="form.component" placeholder="请输入"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="" prop="perms">
+                            <template #label>
+                                <el-tooltip content="权限唯一标识，如：`user:add`，模块名：功能名" placement="top">
+                                    <el-icon class="iconsStyle"><InfoFilled /></el-icon>
+                                </el-tooltip>
+                                权限标识
+                            </template>
+                            <el-input v-model="form.perms" placeholder="请输入"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <!-- 角色 下拉多选 -->
+                        <el-form-item label="资源角色" prop="roleIds">
+                            <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                                <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="是否有效" prop="states">
+                            <el-radio v-model="form.states" :label="1" border>是</el-radio>
+                            <el-radio v-model="form.states" :label="0" border>否</el-radio>
+                        </el-form-item>
+                    </el-col> -->
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="是否缓存" prop="keepalive">
+                            <el-radio v-model="form.keepalive" :label="'1'" border>是</el-radio>
+                            <el-radio v-model="form.keepalive" :label="'0'" border>否</el-radio>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+                        <el-form-item label="菜单图标" prop="icon">
+                            <el-col :span="22">
+                                <el-popover ref="iconListPopover" :width="500" popper-class="mod-menu__icon-popover" placement="top-start" trigger="click" :visible="visible">
+                                    <div class="popover-title">请选择图标</div>
+                                    <el-scrollbar style="height: 95%" wrap-style="overflow-x:hidden;">
+                                        <div class="mod-menu__icon-list">
+                                            <el-button
+                                                v-for="(item, index) in iconList"
+                                                :key="index"
+                                                class="buttonP"
+                                                style="font-size: 16px"
+                                                @click="iconActiveHandle(item.value)"
+                                                :class="{ 'is-active': item.value === form.icon }"
+                                            >
+                                                <el-icon>
+                                                    <component :is="item.value" />
+                                                </el-icon>
+                                            </el-button>
+                                        </div>
+                                    </el-scrollbar>
+                                    <template #reference>
+                                        <el-input v-model="form.icon" @click="visible = true" :readonly="true" placeholder="请选择菜单图标">
+                                            <template #prepend>
+                                                <el-icon v-if="form.icon" class="tooltip-icon">
+                                                    <component :is="form.icon" />
+                                                </el-icon>
+                                            </template>
+                                        </el-input>
+                                    </template>
+                                </el-popover>
+                            </el-col>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="onSubmit(ruleFormRef)"> 确定 </el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, getCurrentInstance } from 'vue';
+import useUserInfoStore from '@/stortes/user'; //引入仓库
+import { storeToRefs } from 'pinia'; //引入pinia转换
+const { proxy } = getCurrentInstance();
+const dialogVisible = ref(false);
+const userInfoStore = useUserInfoStore();
+
+const { userInfo } = storeToRefs(userInfoStore); // 响应式
+const formLabelWidth = '100px';
+const ruleFormRef = ref();
+const treeProps = {
+    children: 'children',
+    label: 'name',
+};
+const rules = {
+    name: [{ required: true, message: '请输入菜单名字', trigger: 'blur' }],
+    parentId: [{ required: false, message: '请选择上级菜单', trigger: 'change' }],
+    url: [{ required: false, message: '请输入菜单地址', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入菜单编码', trigger: 'blur' }],
+    sorts: [{ required: true, message: '请输入菜单序号', trigger: 'blur' }],
+    menutype: [{ required: true, message: '请选择菜单类型', trigger: 'blur' }],
+};
+const visible = ref(false);
+// 示例的图标列表
+const iconList = ref([]);
+
+Object.keys(proxy.$icon).map(item => {
+    iconList.value.push({
+        value: item,
+    });
+});
+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 = () => {
+    if (ruleFormRef.value) ruleFormRef.value.resetFields();
+};
+// 处理图标点击事件
+const iconActiveHandle = iconValue => {
+    visible.value = false; // 关闭弹出框
+    form.icon = iconValue;
+};
+
+const onSubmit = formEl => {
+    formEl.validate(async valid => {
+        if (!valid) {
+            return false;
+        }
+        console.log(form);
+        if (form.id) {
+            // 更新菜单
+            proxy.$api.updatemenu(form).then(res => {
+                if (res.code == 200) {
+                    proxy.$message.success(res.message);
+                    dialogVisible.value = false;
+                    getTreeData();
+                }
+            });
+        } else {
+            // 新增菜单
+            if (form.parentId == 0) {
+                form.parentId = '';
+            }
+            // return;
+            const data = await proxy.$api.addmenu(form);
+            if (data.code == 200) {
+                dialogVisible.value = false;
+                proxy.$message.success(data.message);
+                getTreeData();
+            }
+        }
+    });
+};
+// 删除菜单
+const handleDelete = async row => {
+    // 弹框提示 校验
+    proxy.$messageBox
+        .confirm('确定要删除吗?', '提示', {
+            type: '提示',
+        })
+        .then(async () => {
+            const data = await proxy.$api.deletemenu({ id: row });
+            if (data.code == 200) {
+                proxy.$message.success(data.message);
+                getTreeData();
+            }
+        });
+};
+// 修改菜单
+const handleEdit = async row => {
+    dialogVisible.value = true;
+    // 调用详情接口
+    const data = await proxy.$api.detail({ id: row.id });
+    Object.assign(form, data.data);
+    if (!data.data.parentId) {
+        form.parentId = 0;
+    }
+};
+
+// 获取菜单
+const getTreeData = async () => {
+    const res = await proxy.$api.menus();
+    const treedata = getParentMenuTree(res.data);
+    treeData.value = treedata;
+};
+
+const getParentMenuTree = tableTreeDdata => {
+    let parent = {
+        parentId: '',
+        name: '顶级菜单',
+        id: 0,
+        children: tableTreeDdata,
+    };
+    return [parent];
+};
+
+onMounted(async () => {
+    try {
+        await getTreeData();
+        proxy.$api.getRolsList().then(res => {
+            roleList.value = res.data;
+        });
+    } catch (error) {
+        console.error('失败信息:', error);
+    }
+});
+</script>
+<style>
+.iconsStyle {
+    top: 9px;
+    right: 3px;
+    cursor: pointer;
+}
+
+.mod-menu__icon-list {
+    overflow: auto;
+    height: 100%;
+}
+
+.mod-menu__icon-popover {
+    width: 510px;
+    height: 350px !important;
+    overflow: hidden !important;
+}
+.buttonP {
+    margin-left: 10px !important;
+    margin-bottom: 10px !important;
+}
+
+.el-button--medium {
+    padding: 10px 20px;
+    font-size: 13px;
+    border-radius: 4px;
+}
+.popover-title {
+    margin-bottom: 12px;
+    font-size: 14px;
+    padding-left: 9px;
+    color: #303133;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index d79a672ef389f65bfb857f503c351da6cecdd930..a11d1293f0dcdbc6e0599ead624c7d455d2d22d1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -66,7 +66,7 @@ function transformRoute(route, parentPath = '') {
         if (components[componentPath]) {
             transformed.component = components[componentPath];
         } else {
-            console.error(`组件不存在: ${componentPath}`);
+            // console.error(`组件不存在: ${componentPath}`);
             // router.addRoute({ path: '/:catchAll(.*)', redirect: '/404' });
             return null; // 跳过无效路由
         }
@@ -74,12 +74,27 @@ function transformRoute(route, parentPath = '') {
     return transformed;
 }
 
+function filterMenuTree(menuTree) {
+    return menuTree
+        .filter(menu => menu.menutype !== '2') // 过滤掉 menutype 为 "2" 的节点
+        .map(menu => {
+            if (menu.children && menu.children.length > 0) {
+                // 递归处理子菜单
+                menu.children = filterMenuTree(menu.children);
+            }
+            return menu;
+        });
+}
+
 // 异步加载路由并添加到路由器
 const setupDynamicRoutes = async () => {
     console.log('开始加载动态路由...');
     try {
-        const res = await api.menus();
-        const backendRoutes = res.data;
+        const res = await api.menus({ type: 1 });
+        let backendRoutes = res.data;
+        // 递归过滤掉 menutype == 2 的数据
+        backendRoutes = filterMenuTree(backendRoutes);
+        console.log('后端返回的路由:', backendRoutes);
         const useMenuStores = useMenuStore();
         useMenuStores.getAllMenu(backendRoutes);
         // 转换路由
@@ -95,7 +110,7 @@ const setupDynamicRoutes = async () => {
         });
         return res;
     } catch (error) {
-        console.error('Failed to setup dynamic routes:', error);
+        console.error(error);
     }
 };