tongtong/vue3-element-admin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:角色回显和角色修改，首页navbar下dropdown样式问题调整

Browse Source
This commit is contained in:
有来技术
2021-12-24 00:21:13 +08:00
parent 677feb8a4d
commit 5d6aa9a09d
4 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/layout/components/Navbar.vue
View File

@@ -38,7 +38,7 @@
<el-dropdown-item>项目文档</el-dropdown-item>
</a>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span>
退出
</el-dropdown-item>
</el-dropdown-menu>
</template>
@@ -96,12 +96,6 @@ export default {
</script>
<style lang="scss" scoped>
.el-dropdown-menu__item{
display: block!important;
line-height: 30px;
}
.navbar {
height: 50px;
overflow: hidden;

2
src/views/system/dict/index.vue
View File

@@ -16,7 +16,7 @@
<el-card class="box-card">
<template #header>
<svg-icon color="#333" icon-class="dict"/>
<span style="margin:0 5px;">字典数据项列表</span>
<span style="margin:0 5px;">字典数据项</span>
<el-tag type="primary" v-if=" state.dictCode" size="small">{{ state.dictName }}</el-tag>
<el-tag type="warning" v-else size="small">未选择字典</el-tag>
</template>

6
src/views/system/menu/components/Perm.vue
View File

@@ -290,13 +290,14 @@ function submitForm() {
const form = unref(dataForm)
form.validate((valid: any) => {
if (valid) {
// 接口权限和按钮权限必选其一
// 接口权限和按钮权限必填其一
console.log(state.urlPerm.requestPath, state.formData.btnPerm)
if (!(state.urlPerm.requestPath || state.formData.btnPerm)) {
ElMessage.warning('请至少填写一种权限')
return false
}
// 如果填写了URL权限，完整性校验
if (!state.urlPerm.requestPath) {
if (!state.urlPerm.requestMethod) {
ElMessage.warning('URL权限的请求方式不能为空')
@@ -306,11 +307,10 @@ function submitForm() {
ElMessage.warning('URL权限的所属服务不能为空')
return false
}
state.formData.urlPerm = state.urlPerm.requestMethod + ':/' + state.urlPerm.serviceName + state.urlPerm.requestPath;
}
state.formData.urlPerm = state.urlPerm.requestMethod + ':/' + state.urlPerm.serviceName + state.urlPerm.requestPath;
state.formData.menuId = props.menuId
if (state.formData.id) {
updatePerm(state.formData.id, state.formData).then(response => {
ElMessage.success('修改成功')

52
src/views/system/role/components/Role.vue
View File

@@ -3,18 +3,18 @@
<!-- 搜索表单 -->
<el-form
ref="queryForm"
:model="state.queryParams"
:model="queryParams"
size="mini"
:inline="true"
>
<el-form-item>
<el-button type="success" :icon="Plus" @click="handleAdd">新增</el-button>
<el-button type="danger" :icon='Delete' :disabled="state.multiple" @click="handleDelete">删除</el-button>
<el-button type="danger" :icon='Delete' :disabled="multiple" @click="handleDelete">删除</el-button>
</el-form-item>
<el-form-item prop="name">
<el-input
v-model="state.queryParams.name"
v-model="queryParams.name"
placeholder="角色名称"
clearable
@keyup.enter.native="handleQuery"
@@ -30,8 +30,8 @@
<!-- 数据表格 -->
<el-table
ref="roleTable"
v-loading="state.loading"
:data="state.pageList"
v-loading="loading"
:data="pageList"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
border
@@ -65,39 +65,39 @@
<!-- 分页工具条 -->
<pagination
v-show="state.total>0"
:total="state.total"
v-model:page="state.queryParams.pageNum"
v-model:limit="state.queryParams.pageSize"
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="handleQuery"
/>
<!-- 表单弹窗 -->
<el-dialog
:title="state.dialog.title"
v-model="state.dialog.visible"
:title="dialog.title"
v-model="dialog.visible"
width="450px"
>
<el-form
ref="dataForm"
:model="state.formData"
:rules="state.rules"
:model="formData"
:rules="rules"
label-width="100px"
>
<el-form-item label="角色名称" prop="name">
<el-input v-model="state.formData.name" placeholder="请输入角色名称"/>
<el-input v-model="formData.name" placeholder="请输入角色名称"/>
</el-form-item>
<el-form-item label="角色编码" prop="code">
<el-input v-model="state.formData.code" placeholder="请输入角色编码"/>
<el-input v-model="formData.code" placeholder="请输入角色编码"/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="state.formData.sort" controls-position="right" :min="0" style="width: 100px"/>
<el-input-number v-model="formData.sort" controls-position="right" :min="0" style="width: 100px"/>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="state.formData.status">
<el-radio-group v-model="formData.status">
<el-radio :label="1">正常</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
@@ -117,14 +117,14 @@
<script setup lang="ts">
import {listRolesWithPage, updateRole, getRoleDetail, addRole, deleteRoles} from '@/api/system/role'
import {defineEmits, defineProps, onMounted, reactive, ref, unref} from "vue"
import {defineEmits, defineProps, onMounted, reactive, ref, toRefs, unref} from "vue"
import {add, del, detail, update} from "@api/system/client";
import {ElForm, ElMessage, ElMessageBox} from "element-plus";
import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
const emit = defineEmits(['roleClick'])
const dataForm = ref() // 属性名必须和元素的ref属性值一致
const dataForm = ref(ElForm) // 属性名必须和元素的ref属性值一致
const state = reactive({
loading: true,
@@ -147,9 +147,9 @@ const state = reactive({
},
formData: {
id: undefined,
parentId: 0,
name: undefined,
sort: 1,
code: undefined,
sort: 100,
status: 1
},
rules: {
@@ -162,6 +162,8 @@ const state = reactive({
}
})
const {loading,single, multiple, queryParams, pageList, total, dialog, formData, rules} = toRefs(state)
function handleQuery() {
emit('roleClick', {})
state.loading = true
@@ -196,7 +198,7 @@ function handleAdd() {
resetForm()
state.dialog = {
title: '添加角色',
visible: true,
visible: true
}
}
@@ -207,7 +209,7 @@ function handleUpdate(row: any) {
visible: true,
}
const roleId = row.id || state.ids
getRoleDetail(roleId).then(response => {
getRoleDetail(roleId).then((response) => {
state.formData = response.data
})
}
@@ -236,9 +238,9 @@ function submitForm() {
function resetForm() {
state.formData = {
id: undefined,
parentId: 0,
name: undefined,
sort: 1,
code: undefined,
sort: 100,
status: 1
}
}