duxianjin..
/
qn-sim-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:修改权限管理按钮在不同账号展示问题

confidence
杜贤金 3 years ago
parent
0cc5eb0740
commit
4a019640df
2 changed files with 380 additions and 346 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 175
      src/views/authority/role.vue
  2. 53
      src/views/iot/components/ProductDetail/Server.vue

175
src/views/authority/role.vue
Unescape View File

@ -1,6 +1,7 @@
<template> <template>
<basic-container> <basic-container>
<avue-crud :option="option" <avue-crud
:option="option"
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"
ref="crud" ref="crud"
@ -16,80 +17,96 @@
@current-change="currentChange" @current-change="currentChange"
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad"> @on-load="onLoad"
>
<template slot="menuLeft"> <template slot="menuLeft">
<el-button type="danger" <el-button
type="danger"
size="small" size="small"
icon="el-icon-delete" icon="el-icon-delete"
v-if="permission.role_delete" v-if="permission.role_delete"
plain plain
@click="handleDelete">删 除 @click="handleDelete"
>删 除
</el-button> </el-button>
<el-button size="small" <!-- v-if="userInfo.role_name.includes('admin')" -->
icon="el-icon-setting" <el-button size="small" icon="el-icon-setting" @click="handleRole" plain
@click="handleRole" >权限设置
v-if="userInfo.role_name.includes('admin')"
plain>权限设置
</el-button> </el-button>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog title="角色权限配置" <el-dialog
title="角色权限配置"
append-to-body append-to-body
:visible.sync="box" :visible.sync="box"
width="345px"> width="345px"
>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="菜单权限"> <el-tab-pane label="菜单权限">
<el-tree :data="menuGrantList" <el-tree
:data="menuGrantList"
show-checkbox show-checkbox
node-key="id" node-key="id"
ref="treeMenu" ref="treeMenu"
:default-checked-keys="menuTreeObj" :default-checked-keys="menuTreeObj"
:props="props"> :props="props"
>
</el-tree> </el-tree>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="数据权限"> <el-tab-pane label="数据权限">
<el-tree :data="dataScopeGrantList" <el-tree
:data="dataScopeGrantList"
show-checkbox show-checkbox
node-key="id" node-key="id"
ref="treeDataScope" ref="treeDataScope"
:default-checked-keys="dataScopeTreeObj" :default-checked-keys="dataScopeTreeObj"
:props="props"> :props="props"
>
</el-tree> </el-tree>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="接口权限"> <el-tab-pane label="接口权限">
<el-tree :data="apiScopeGrantList" <el-tree
:data="apiScopeGrantList"
show-checkbox show-checkbox
node-key="id" node-key="id"
ref="treeApiScope" ref="treeApiScope"
:default-checked-keys="apiScopeTreeObj" :default-checked-keys="apiScopeTreeObj"
:props="props"> :props="props"
>
</el-tree> </el-tree>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" <span slot="footer" class="dialog-footer">
class="dialog-footer">
<el-button @click="box = false">取 消</el-button> <el-button @click="box = false">取 消</el-button>
<el-button type="primary" <el-button type="primary" @click="submit">确 定</el-button>
@click="submit">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import {add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role"; import {
import {mapGetters} from "vuex"; add,
import website from '@/config/website'; getList,
getRole,
getRoleTreeById,
grant,
grantTree,
remove,
update,
} from "@/api/system/role";
import { mapGetters } from "vuex";
import website from "@/config/website";
export default { export default {
data() { data() {
return { return {
form: {}, form: {},
box: false, box: false,
props: { props: {
label: "title", label: "title",
value: "key" value: "key",
}, },
menuGrantList: [], menuGrantList: [],
dataScopeGrantList: [], dataScopeGrantList: [],
@ -104,7 +121,7 @@
page: { page: {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
total: 0 total: 0,
}, },
option: { option: {
tip: false, tip: false,
@ -128,9 +145,9 @@
{ {
required: true, required: true,
message: "请输入角色名称", message: "请输入角色名称",
trigger: "blur" trigger: "blur",
} },
] ],
}, },
{ {
label: "所属租户", label: "所属租户",
@ -143,15 +160,17 @@
span: 24, span: 24,
props: { props: {
label: "tenantName", label: "tenantName",
value: "tenantId" value: "tenantId",
}, },
hide: !website.tenantMode, hide: !website.tenantMode,
search: website.tenantMode, search: website.tenantMode,
rules: [{ rules: [
{
required: true, required: true,
message: "请输入所属租户", message: "请输入所属租户",
trigger: "click" trigger: "click",
}] },
],
}, },
{ {
label: "角色别名", label: "角色别名",
@ -162,9 +181,9 @@
{ {
required: true, required: true,
message: "请输入角色别名", message: "请输入角色别名",
trigger: "blur" trigger: "blur",
} },
] ],
}, },
{ {
label: "上级角色", label: "上级角色",
@ -174,15 +193,15 @@
hide: true, hide: true,
span: 24, span: 24,
props: { props: {
label: "title" label: "title",
}, },
rules: [ rules: [
{ {
required: false, required: false,
message: "请选择上级角色", message: "请选择上级角色",
trigger: "click" trigger: "click",
} },
] ],
}, },
{ {
label: "角色排序", label: "角色排序",
@ -193,13 +212,13 @@
{ {
required: true, required: true,
message: "请输入角色排序", message: "请输入角色排序",
trigger: "blur" trigger: "blur",
} },
] ],
} },
] ],
}, },
data: [] data: [],
}; };
}, },
computed: { computed: {
@ -209,28 +228,27 @@
addBtn: this.vaildData(this.permission.role_add, false), addBtn: this.vaildData(this.permission.role_add, false),
viewBtn: this.vaildData(this.permission.role_view, false), viewBtn: this.vaildData(this.permission.role_view, false),
delBtn: this.vaildData(this.permission.role_delete, false), delBtn: this.vaildData(this.permission.role_delete, false),
editBtn: this.vaildData(this.permission.role_edit, false) editBtn: this.vaildData(this.permission.role_edit, false),
}; };
}, },
ids() { ids() {
let ids = []; let ids = [];
this.selectionList.forEach(ele => { this.selectionList.forEach((ele) => {
ids.push(ele.id); ids.push(ele.id);
}); });
return ids.join(","); return ids.join(",");
}, },
idsArray() { idsArray() {
let ids = []; let ids = [];
this.selectionList.forEach(ele => { this.selectionList.forEach((ele) => {
ids.push(ele.id); ids.push(ele.id);
}); });
return ids; return ids;
} },
}, },
methods: { methods: {
initData(roleId){ initData(roleId) {
getRoleTreeById(roleId).then(res => { getRoleTreeById(roleId).then((res) => {
const column = this.findObject(this.option.column, "parentId"); const column = this.findObject(this.option.column, "parentId");
column.dicData = res.data.data; column.dicData = res.data.data;
}); });
@ -243,42 +261,48 @@
this.box = false; this.box = false;
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
this.onLoad(this.page); this.onLoad(this.page);
}); });
}, },
rowSave(row, done, loading) { rowSave(row, done, loading) {
add(row).then(() => { add(row).then(
() => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
done(); done();
}, error => { },
(error) => {
window.console.log(error); window.console.log(error);
loading(); loading();
}); }
);
}, },
rowUpdate(row, index, done, loading) { rowUpdate(row, index, done, loading) {
update(row).then(() => { update(row).then(
() => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
done(); done();
}, error => { },
(error) => {
window.console.log(error); window.console.log(error);
loading(); loading();
}); }
);
}, },
rowDel(row) { rowDel(row) {
this.$confirm("确定将选择数据删除?", { this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(() => { .then(() => {
return remove(row.id); return remove(row.id);
@ -287,7 +311,7 @@
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
}); });
}, },
@ -323,12 +347,11 @@
this.menuTreeObj = []; this.menuTreeObj = [];
this.dataScopeTreeObj = []; this.dataScopeTreeObj = [];
this.apiScopeTreeObj = []; this.apiScopeTreeObj = [];
grantTree() grantTree().then((res) => {
.then(res => {
this.menuGrantList = res.data.data.menu; this.menuGrantList = res.data.data.menu;
this.dataScopeGrantList = res.data.data.dataScope; this.dataScopeGrantList = res.data.data.dataScope;
this.apiScopeGrantList = res.data.data.apiScope; this.apiScopeGrantList = res.data.data.apiScope;
getRole(this.ids).then(res => { getRole(this.ids).then((res) => {
this.menuTreeObj = res.data.data.menu; this.menuTreeObj = res.data.data.menu;
this.dataScopeTreeObj = res.data.data.dataScope; this.dataScopeTreeObj = res.data.data.dataScope;
this.apiScopeTreeObj = res.data.data.apiScope; this.apiScopeTreeObj = res.data.data.apiScope;
@ -344,7 +367,7 @@
this.$confirm("确定将选择数据删除?", { this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(() => { .then(() => {
return remove(this.ids); return remove(this.ids);
@ -353,7 +376,7 @@
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
}); });
@ -369,12 +392,16 @@
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
).then((res) => {
this.data = res.data.data; this.data = res.data.data;
this.loading = false; this.loading = false;
this.selectionClear(); this.selectionClear();
}); });
} },
} },
}; };
</script> </script>

53
src/views/iot/components/ProductDetail/Server.vue
Unescape View File

@ -1,26 +1,30 @@
<template> <template>
<div> <div>
<avue-crud <avue-
:option='option' :option="option"
:data='data' :data="data"
:table-loading='loading' :table-loading="loading"
@on-load='onLoad' @on-load="onLoad"
> >
<template #menuLeft> <template #menuLeft>
<el-button type='primary' size='small' @click='$router.push("/iot/server/subscribe")'> <el-button
type="primary"
size="small"
@click="$router.push('/iot/server/subscribe')"
>
管理订阅 管理订阅
</el-button> </el-button>
</template> </template>
</avue-crud> </avue->
</div> </div>
</template> </template>
<script> <script>
import { getServerSubscribeList } from '@/api/iot/device/product'; import { getServerSubscribeList } from "@/api/iot/device/product";
import {isEmptyObject} from '@/util/util'; import { isEmptyObject } from "@/util/util";
export default { export default {
name: 'Server', name: "Server",
props: { props: {
detail: { detail: {
type: Object, type: Object,
@ -37,26 +41,27 @@ export default {
border: true, border: true,
columnBtn: false, columnBtn: false,
refreshBtn: false, refreshBtn: false,
size: 'small', size: "small",
column: [ column: [
{ {
label: '订阅类型', label: "订阅类型",
prop: 'type', prop: "type",
}, },
{ {
label: '订阅消息', label: "订阅消息",
dicUrl: '/api/iot-system/dict/dictionary?code=subscribe_message_type', dicUrl:
"/api/iot-system/dict/dictionary?code=subscribe_message_type",
props: { props: {
label: 'dictValue', label: "dictValue",
value: 'dictKey' value: "dictKey",
}, },
prop: 'messageType', prop: "messageType",
dataType: 'number', dataType: "number",
type: 'tree', type: "tree",
}, },
{ {
label: '创建时间', label: "创建时间",
prop: 'createTime', prop: "createTime",
}, },
], ],
}, },
@ -68,7 +73,9 @@ export default {
this.loading = true; this.loading = true;
getServerSubscribeList(this.detail.id).then((res) => { getServerSubscribeList(this.detail.id).then((res) => {
// type 类型写死 // type 类型写死
this.data = !isEmptyObject(res.data.data) ? [{...res.data.data, type: 'mqtt'}] : []; this.data = !isEmptyObject(res.data.data)
? [{ ...res.data.data, type: "mqtt" }]
: [];
this.loading = false; this.loading = false;
}); });
}, },

Write Preview
Loading…
Cancel
Save