Skip to content

D
dsk-cr20g
Commit b0f930f6 authored by huangjie's avatar huangjie
Browse files
Options

*

parent adc24d58
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 41 deletions
dsk-operate-ui/package.json
View file @ b0f930f6
......@@ -45,6 +45,7 @@
"element-resize-detector": "^1.2.4",
"element-ui": "2.15.12",
"file-saver": "2.0.5",
"flatted": "^3.2.7",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"jquery": "^3.7.0",
......
dsk-operate-ui/src/layout/index.vue
View file @ b0f930f6
......@@ -62,7 +62,12 @@ export default {
mounted(){
this.$nextTick(() => {
this.listenSider()
})
})
// console.log(9999)
// let views = localStorage.getItem('views')
// console.log(views)
// this.$store.state.tagsView.visitedViews = JSON.parse(views)
// localStorage.removeItem('views')
},
methods: {
handleClickOutside() {
......
dsk-operate-ui/src/store/modules/tagsView.js
View file @ b0f930f6
import {parse, stringify} from 'flatted';
const state = {
visitedViews: [],
cachedViews: [],
......@@ -20,6 +21,9 @@ const mutations = {
title: view.meta.title || 'no-name'
})
)
// console.log(state.visitedViews)
// let visitedViews = stringify(state.visitedViews)
// localStorage.setItem("views",visitedViews)
},
ADD_CACHED_VIEW: (state, view) => {
if (state.cachedViews.includes(view.name)) return
......@@ -31,6 +35,8 @@ const mutations = {
for (const [i, v] of state.visitedViews.entries()) {
if (v.path === view.path) {
state.visitedViews.splice(i, 1)
let visitedViews = JSON.parse(JSON.stringify(state.visitedViews))
localStorage.setItem("views",JSON.stringify(visitedViews))
break
}
}
......
dsk-operate-ui/src/views/enterpriseManagement/programme.vue
View file @ b0f930f6
......@@ -96,6 +96,13 @@
@click="handleLook(scope.row)"
v-hasPermi="['system:role:edit']"
>查看</el-button>
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-upload"-->
<!--@click="handleSave(scope.row.packageId)"-->
<!--v-hasPermi="['system:role:edit']"-->
<!--&gt;同步</el-button>-->
</template>
</el-table-column>
</el-table>
......
dsk-operate-ui/src/views/system/role/index.vue
View file @ b0f930f6
......@@ -134,15 +134,29 @@
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
<el-dropdown-item command="handleAuthUser" icon="el-icon-user"
v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
size="mini"
type="text"
icon="el-icon-check"
@click="handleDataScope(scope.row)"
v-hasPermi="['system:role:edit']"
>数据权限</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-user"
@click="handleAuthUser(scope.row)"
v-hasPermi="['system:role:edit']"
>分配用户</el-button>
<!--<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">-->
<!--<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>-->
<!--<el-dropdown-menu slot="dropdown">-->
<!--<el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"-->
<!--v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>-->
<!--<el-dropdown-item command="handleAuthUser" icon="el-icon-user"-->
<!--v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>-->
<!--</el-dropdown-menu>-->
<!--</el-dropdown>-->
</template>
</el-table-column>
</el-table>
......@@ -298,11 +312,11 @@ export default {
},
{
value: "3",
label: "本部门数据权限"
label: "本组织数据权限"
},
{
value: "4",
label: "本部门及以下数据权限"
label: "本组织及以下数据权限"
},
{
value: "5",
......@@ -311,7 +325,7 @@ export default {
],
// 菜单列表
menuOptions: [],
// 部门列表
// 组织列表
deptOptions: [],
// 查询参数
queryParams: {
......@@ -370,11 +384,11 @@ export default {
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
},
// 所有部门节点数据
// 所有组织节点数据
getDeptAllCheckedKeys() {
// 目前被选中的部门节点
// 目前被选中的组织节点
let checkedKeys = this.$refs.dept.getCheckedKeys();
// 半选中的部门节点
// 半选中的组织节点
let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
......@@ -382,11 +396,11 @@ export default {
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus;
return response;
this.menuOptions = response.data.menus;
return response.data;
});
},
/** 根据角色ID查询部门树结构 */
/** 根据角色ID查询组织树结构 */
getDeptTree(roleId) {
return deptTreeSelect(roleId).then(response => {
this.deptOptions = response.depts;
......
dsk-operate-ui/src/views/system/user/index.vue
View file @ b0f930f6
<template>
<div class="app-container">
<el-row :gutter="20">
<!--部门数据-->
<!--组织数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
placeholder="请输入组织名称"
clearable
size="small"
prefix-icon="el-icon-search"
......@@ -152,7 +152,7 @@
<el-table-column label="用户编号" align="center" :key='mathkey+1' prop="userId" v-if="columns[0].visible" />
<!--<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />-->
<el-table-column label="用户昵称" align="center" :key='mathkey+2' prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" :key='mathkey+3' prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="组织" align="center" :key='mathkey+3' prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" :key='mathkey+4' prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" :key='mathkey+5' v-if="columns[5].visible">
<template slot-scope="scope">
......@@ -172,7 +172,7 @@
<el-table-column :key='mathkey+7'
label="操作"
align="center"
width="160"
width="260"
class-name="small-padding fixed-width"
fixed="right"
>
......@@ -191,15 +191,22 @@
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
size="mini"
type="text"
icon="el-icon-key"
@click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']"
>重置密码</el-button>
<!--<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">-->
<!--<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>-->
<!--<el-dropdown-menu slot="dropdown">-->
<!--<el-dropdown-item command="handleResetPwd" icon="el-icon-key"-->
<!--v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>-->
<!--<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"-->
<!--v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>-->
<!--</el-dropdown-menu>-->
<!--</el-dropdown>-->
</template>
</el-table-column>
</el-table>
......@@ -224,8 +231,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
<el-form-item label="归属组织" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属组织" />
</el-form-item>
</el-col>
</el-row>
......@@ -420,11 +427,11 @@ export default {
userList: null,
// 弹出层标题
title: "",
// 部门树选项
// 组织树选项
deptOptions: undefined,
// 是否显示弹出层
open: false,
// 部门名称
// 组织名称
deptName: undefined,
// 默认密码
initPassword: undefined,
......@@ -469,7 +476,7 @@ export default {
{ key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 3, label: `组织`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
......@@ -480,7 +487,7 @@ export default {
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "部门不能为空", trigger: "blur" }
{ required: true, message: "组织不能为空", trigger: "blur" }
],
roleIds: [
{ required: true, message: "角色不能为空", trigger: "blur" }
......@@ -500,7 +507,7 @@ export default {
};
},
watch: {
// 根据名称筛选部门树
// 根据名称筛选组织树
deptName(val) {
this.$refs.tree.filter(val);
},
......@@ -529,7 +536,7 @@ export default {
}
);
},
/** 查询部门下拉树结构 */
/** 查询组织下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data;
......
dsk-operate-ui/src/views/system/user/profile/index.vue
View file @ b0f930f6
......@@ -24,7 +24,7 @@
<div class="pull-right">{{ user.email }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<svg-icon icon-class="tree" />所属组织
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
</li>
<li class="list-group-item">
......
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