From bb1340ecc6f1a6bf40ccf7eebcb58312f6c6af4d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 25 Feb 2020 19:33:29 +0800
Subject: [PATCH] 操作日志详细显示类型
---
ruoyi-ui/src/views/system/menu/index.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 440cdc3..9f2d04f 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -41,7 +41,7 @@
<el-table-column prop="orderNum" label="排序" width="60px"></el-table-column>
<el-table-column prop="perms" label="权限标识" width="130px" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="component" label="组件路径" width="180px" :show-overflow-tooltip="true"></el-table-column>
- <el-table-column prop="visible" label=" 可见" :formatter="visibleFormat" width="80px"></el-table-column>
+ <el-table-column prop="visible" label="可见" :formatter="visibleFormat" width="80px"></el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -63,7 +63,6 @@
v-hasPermi="['system:menu:add']"
>新增</el-button>
<el-button
- v-if="scope.row.parentId != 0"
size="mini"
type="text"
icon="el-icon-delete"
@@ -78,11 +77,12 @@
<el-dialog :title="title" :visible.sync="open" width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
- <el-col :span="24" v-if="form.parentId !== 0">
+ <el-col :span="24">
<el-form-item label="上级菜单">
<treeselect
v-model="form.parentId"
:options="menuOptions"
+ :normalizer="normalizer"
:show-count="true"
placeholder="选择上级菜单"
/>
@@ -174,12 +174,13 @@
</template>
<script>
-import { listMenu, getMenu, treeselect, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import IconSelect from "@/components/IconSelect";
export default {
+ name: "Menu",
components: { Treeselect, IconSelect },
data() {
return {
@@ -188,7 +189,7 @@
// 菜单表格树数据
menuList: [],
// 菜单树选项
- menuOptions: undefined,
+ menuOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -228,14 +229,28 @@
getList() {
this.loading = true;
listMenu(this.queryParams).then(response => {
- this.menuList = response.data;
+ this.menuList = this.handleTree(response.data, "menuId");
this.loading = false;
});
},
+ /** 转换菜单数据结构 */
+ normalizer(node) {
+ if (node.children && !node.children.length) {
+ delete node.children;
+ }
+ return {
+ id: node.menuId,
+ label: node.menuName,
+ children: node.children
+ };
+ },
/** 查询菜单下拉树结构 */
getTreeselect() {
- treeselect().then(response => {
- this.menuOptions = response.data;
+ listMenu().then(response => {
+ this.menuOptions = [];
+ const menu = { menuId: 0, menuName: '主类目', children: [] };
+ menu.children = this.handleTree(response.data, "menuId");
+ this.menuOptions.push(menu);
});
},
// 菜单显示状态字典翻译
--
Gitblit v1.9.2