Skip to content

phsl / admin

Go to a project
Commit 88f45027 by dhb52
Options

Merge remote-tracking branch 'yudao/dev' into dev

parents cb452774 c14b5c5b
Showing with 69 additions and 31 deletions
.env
...@@ -13,8 +13,5 @@ VITE_APP_TENANT_ENABLE=true ...@@ -13,8 +13,5 @@ VITE_APP_TENANT_ENABLE=true
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true VITE_APP_CAPTCHA_ENABLE=true
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true
# 百度统计 # 百度统计
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
README.md
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
## 🐶 新手必读 ## 🐶 新手必读
* nodejs > 16.0.0 && pnpm > 7.30.0 * nodejs > 16.0.0 && pnpm > 7.30.0
* 演示地址：<http://dashboard.yudao.iocoder.cn> * 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.yudao.iocoder.cn>
* 演示地址【Vue2 + element-ui】：<http://dashboard.yudao.iocoder.cn>
* 启动文档：<https://doc.iocoder.cn/quick-start/> * 启动文档：<https://doc.iocoder.cn/quick-start/>
* 视频教程：<https://doc.iocoder.cn/video/> * 视频教程：<https://doc.iocoder.cn/video/>
......
src/views/Login/components/LoginForm.vue
...@@ -125,6 +125,21 @@ ...@@ -125,6 +125,21 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-divider content-position="center">萌新必读</el-divider>
<el-col :span="24" style="padding-left: 10px; padding-right: 10px">
<el-form-item>
<div class="flex justify-between w-[100%]">
<el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
<el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>
<el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">
⚡面试手册
</el-link>
<el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank">
🤝外包咨询
</el-link>
</div>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</template> </template>
......
src/views/system/menu/index.vue
...@@ -5,27 +5,27 @@ ...@@ -5,27 +5,27 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<ContentWrap> <ContentWrap>
<el-form <el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef" ref="queryFormRef"
:inline="true" :inline="true"
:model="queryParams"
class="-mb-15px"
label-width="68px" label-width="68px"
> >
<el-form-item label="菜单名称" prop="name"> <el-form-item label="菜单名称" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
placeholder="请输入菜单名称" class="!w-240px"
clearable clearable
placeholder="请输入菜单名称"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择菜单状态"
clearable
class="!w-240px" class="!w-240px"
clearable
placeholder="请选择菜单状态"
> >
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
...@@ -36,18 +36,30 @@ ...@@ -36,18 +36,30 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery">
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <Icon class="mr-5px" icon="ep:search" />
搜索
</el-button>
<el-button @click="resetQuery">
<Icon class="mr-5px" icon="ep:refresh" />
重置
</el-button>
<el-button <el-button
type="primary" v-hasPermi="['system:menu:create']"
plain plain
type="primary"
@click="openForm('create')" @click="openForm('create')"
v-hasPermi="['system:menu:create']"
> >
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon class="mr-5px" icon="ep:plus" />
新增
</el-button>
<el-button plain type="danger" @click="toggleExpandAll">
<Icon class="mr-5px" icon="ep:sort" />
展开/折叠
</el-button> </el-button>
<el-button type="danger" plain @click="toggleExpandAll"> <el-button plain @click="refreshMenu">
<Icon icon="ep:sort" class="mr-5px" /> 展开/折叠 <Icon class="mr-5px" icon="ep:refresh" />
刷新菜单缓存
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -56,50 +68,50 @@ ...@@ -56,50 +68,50 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table <el-table
v-if="refreshTable"
v-loading="loading" v-loading="loading"
:data="list" :data="list"
row-key="id"
v-if="refreshTable"
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
row-key="id"
> >
<el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="250" /> <el-table-column :show-overflow-tooltip="true" label="菜单名称" prop="name" width="250" />
<el-table-column prop="icon" label="图标" align="center" width="100"> <el-table-column align="center" label="图标" prop="icon" width="100">
<template #default="scope"> <template #default="scope">
<Icon :icon="scope.row.icon" /> <Icon :icon="scope.row.icon" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sort" label="排序" width="60" /> <el-table-column label="排序" prop="sort" width="60" />
<el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" label="权限标识" prop="permission" />
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component" />
<el-table-column prop="componentName" label="组件名称" :show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" label="组件名称" prop="componentName" />
<el-table-column prop="status" label="状态" width="80"> <el-table-column label="状态" prop="status" width="80">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column align="center" label="操作">
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-hasPermi="['system:menu:update']"
link link
type="primary" type="primary"
@click="openForm('update', scope.row.id)" @click="openForm('update', scope.row.id)"
v-hasPermi="['system:menu:update']"
> >
修改 修改
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['system:menu:create']"
link link
type="primary" type="primary"
@click="openForm('create', undefined, scope.row.id)" @click="openForm('create', undefined, scope.row.id)"
v-hasPermi="['system:menu:create']"
> >
新增 新增
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['system:menu:delete']"
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"
v-hasPermi="['system:menu:delete']"
> >
删除 删除
</el-button> </el-button>
...@@ -111,11 +123,13 @@ ...@@ -111,11 +123,13 @@
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<MenuForm ref="formRef" @success="getList" /> <MenuForm ref="formRef" @success="getList" />
</template> </template>
<script setup lang="ts" name="SystemMenu"> <script lang="ts" name="SystemMenu" setup>
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { handleTree } from '@/utils/tree' import { handleTree } from '@/utils/tree'
import * as MenuApi from '@/api/system/menu' import * as MenuApi from '@/api/system/menu'
import MenuForm from './MenuForm.vue' import MenuForm from './MenuForm.vue'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
const { wsCache } = useCache()
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
...@@ -166,6 +180,17 @@ const toggleExpandAll = () => { ...@@ -166,6 +180,17 @@ const toggleExpandAll = () => {
}) })
} }
/** 刷新菜单缓存按钮操作 */
const refreshMenu = async () => {
try {
await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
// 清空，从而触发刷新
wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
// 刷新浏览器
location.reload()
} catch {}
}
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment