Skip to content

9
91isoft_vue_manage
Commit 3c61dc58 authored by 拾柒's avatar 拾柒
Browse files
Options

完善数据权限功能，

parent a0d865e5
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 33 deletions
src/views/monitor/errorLog/index.vue
View file @ 3c61dc58
......@@ -484,6 +484,9 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.dateRange = ''
this.queryParams.title = ''
this.queryParams.operName = ''
this.queryParams.operTime = ''
this.resetForm('queryParams')
this.handleQuery()
},
......
src/views/monitor/loginInfo/index.vue
View file @ 3c61dc58
......@@ -363,6 +363,10 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.dateRange = ''
this.queryParams.ipaddr = ''
this.queryParams.username = ''
this.queryParams.status = ''
this.queryParams.loginTime = ''
this.resetForm('queryParams')
this.handleQuery()
},
......
src/views/monitor/operLog/index.vue
View file @ 3c61dc58
......@@ -481,6 +481,9 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.dateRange = ''
this.queryParams.title = ''
this.queryParams.operName = ''
this.queryParams.operTime = ''
this.resetForm('queryParams')
this.handleQuery()
},
......
src/views/system/dict/data.vue
View file @ 3c61dc58
......@@ -137,13 +137,13 @@
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<coolbutton style="color: #49cec9" :type="typeParent" :name="updataName" :size="size" :haspermi="editHaspermi" @btn-click="handleUpdate(scope.row)" />
<!-- <el-button-->
<!-- v-hasPermi="['sys:dictConfig:remove']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
<coolbutton :type="typeParent" :icon="delicon" :name="nameParent" :size="size" :haspermi="removeHaspermi" @btn-click="handleDelete(scope.row)" />
<el-button
v-hasPermi="['sys:dictConfig:remove']"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
<!-- <coolbutton :type="typeParent" :name="nameParent" :size="size" :haspermi="removeHaspermi" @btn-click="handleDelete(scope.row)" /> -->
<!-- <el-switch-->
<!-- v-model="scope.row.status"-->
<!-- v-hasPermi="['sys:dictConfig:toggle']"-->
......@@ -391,9 +391,9 @@ export default {
const dictId = this.$route.params && this.$route.params.dictId
this.getType(dictId)
this.getTypeList()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data
// })
this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
this.statusOptions = response.data
})
},
methods: {
// 状态
......
src/views/system/role/index.vue
View file @ 3c61dc58
......@@ -98,7 +98,7 @@
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="240px">
<el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:update']"-->
......@@ -108,13 +108,12 @@
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<coolbutton style="color: #49cec9" :type="typeParent" :name="updataName" :size="size" :haspermi="updateHaspermi" @btn-click="handleUpdate(scope.row)" />
<el-button
v-hasPermi="['sys:role:update']"
size="mini"
type="text"
icon="el-icon-circle-check"
@click="handleMenu(scope.row)"
>数据权限</el-button>
<el-button
v-hasPermi="['sys:role:update']"
size="mini"
type="text"
@click="handleMenu(scope.row)"
>数据权限</el-button>
<el-button
size="mini"
type="text"
......@@ -179,14 +178,15 @@
</el-dialog>
<!-- 分配角色数据权限对话框 -->
<el-dialog class="roleDialog" title="数据权限信息" :visible.sync="openDataScope" width="900px" append-to-body>
<el-dialog class="roleDialog" @close='getList' title="数据权限信息" :visible.sync="openDataScope" width="900px" append-to-body>
<el-row>
<el-col style="width: 49%">
<el-col style="width: 43%">
<el-form ref="form" :model="form" :rules="rules" label-width="70px">
<el-form-item label="角色名称">
<el-input v-model.trim="form.roleName" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />
</el-form-item>
<el-table
highlight-current-row
v-loading="loading"
:data="menuList"
row-key="businessId"
......@@ -196,13 +196,12 @@
<!-- <el-form-item label="权限字符">-->
<!-- <el-input v-model.trim="form.roleKey" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />-->
<!-- </el-form-item>-->
<el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160" />
<el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="230px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-circle-check"
@click="handleDataScope(scope.row)"
>修改</el-button>
</template>
......@@ -215,13 +214,13 @@
<el-divider direction="vertical" />
</div>
</el-col>
<el-col style="width: 49%">
<el-col style="width: 55%">
<el-form :model="form" label-width="80px">
<el-form-item label="菜单名称" prop="roleName">
<el-input v-model="form.menuName" placeholder="未选择菜单名称" disabled />
<el-input v-model="form.menuName" placeholder="未选择菜单名称" disabled style = "width: 300px"/>
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope">
<el-form-item label="权限范围" style = "width: 300px">
<el-select v-model="form.dataScope" style = "width: 300px">
<el-option
v-for="item in dataScopeOptions"
:key="item.value"
......@@ -230,10 +229,10 @@
/>
</el-select>
</el-form-item>
<el-form-item v-show="form.dataScope === 2" label="数据权限">
<!-- <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>-->
<!-- <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>-->
<!-- <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>-->
<el-form-item v-show="form.dataScope == 2" label="数据权限">
<!-- <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>-->
<!-- <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>-->
<!-- <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>-->
<el-tree
ref="dept"
class="tree-border"
......@@ -241,10 +240,12 @@
show-checkbox
default-expand-all
node-key="id"
:check-strictly="!form.deptCheckStrictly"
check-strictly
empty-text="加载中，请稍后"
:props="defaultProps"
@check-change="handleMenuCheckChange"
/>
<!-- 修改 :check-strictly="!form.deptCheckStrictly" 改为 check-strictly -->
</el-form-item>
</el-form>
</el-col>
......@@ -521,6 +522,7 @@ export default {
// 取消按钮（数据权限）
cancelDataScope() {
this.openDataScope = false
this.getList()
this.reset()
},
// 表单重置
......@@ -674,8 +676,7 @@ export default {
this.form.deptIds = this.getDeptAllCheckedKeys()
dataScope(this.form).then(response => {
this.msgSuccess('修改成功')
this.openDataScope = false
this.getList()
})
}
},
......
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 to comment