elink-star
/
epmet-oper-lingshan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

登录获取菜单修改

master
hosinokamui 6 years ago
parent
8926ea6c84
commit
a7f4c833c2
5 changed files with 24 additions and 36 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. 2
      epmet-oper-web/src/router/index.js
  2. 2
      epmet-oper-web/src/utils/request.js
  3. 4
      epmet-oper-web/src/views/main.vue
  4. 27
      epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
  5. 25
      epmet-oper-web/src/views/modules/sys/user.vue

2
epmet-oper-web/src/router/index.js
View File

@ -85,7 +85,7 @@ router.beforeEach((to, from, next) => {
window.SITE_CONFIG['dictList'] = res.data window.SITE_CONFIG['dictList'] = res.data
}).catch(() => {}) }).catch(() => {})
// 获取菜单列表, 添加并全局变量保存 // 获取菜单列表, 添加并全局变量保存
http.get('/sys/menu/nav').then(({ data: res }) => { http.get('/oper/access/menu/nav').then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
Vue.prototype.$message.error(res.msg) Vue.prototype.$message.error(res.msg)
return next({ name: 'login' }) return next({ name: 'login' })

2
epmet-oper-web/src/utils/request.js
View File

@ -16,7 +16,7 @@ const http = axios.create({
*/ */
http.interceptors.request.use(config => { http.interceptors.request.use(config => {
config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
config.headers['token'] = Cookies.get('token') || '' config.headers['Authorization'] = Cookies.get('token') || ''
// 默认参数 // 默认参数
var defaults = {} var defaults = {}
// 防止缓存，GET请求默认带_t参数 // 防止缓存，GET请求默认带_t参数

4
epmet-oper-web/src/views/main.vue
View File

@ -82,7 +82,7 @@ export default {
}, },
// 获取当前管理员信息 // 获取当前管理员信息
getUserInfo () { getUserInfo () {
return this.$http.get('/sys/user/info').then(({ data: res }) => { return this.$http.get('/epmetuser/operuser/queryOperUserDto').then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -94,7 +94,7 @@ export default {
}, },
// 获取权限 // 获取权限
getPermissions () { getPermissions () {
return this.$http.get('/sys/menu/permissions').then(({ data: res }) => { return this.$http.get('/oper/access/menu/permissions').then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

27
epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
View File

@ -2,20 +2,20 @@
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form-item prop="username" :label="$t('user.username')"> <el-form-item prop="username" :label="$t('user.username')">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')"></el-input> <el-input v-model="dataForm.realName" :placeholder="$t('user.username')"></el-input>
</el-form-item>
<el-form-item prop="deptName" :label="$t('user.deptName')">
<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="deptName" :label="$t('user.deptName')">-->
<!-- <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>-->
<!-- </el-form-item>-->
<el-form-item prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }"> <el-form-item prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')"></el-input> <el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }"> <el-form-item prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input> <el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="realName" :label="$t('user.realName')"> <!-- <el-form-item prop="realName" :label="$t('user.realName')">-->
<el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input> <!-- <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item prop="gender" :label="$t('user.gender')" size="mini"> <el-form-item prop="gender" :label="$t('user.gender')" size="mini">
<el-radio-group v-model="dataForm.gender"> <el-radio-group v-model="dataForm.gender">
<el-radio :label="0">{{ $t('user.gender0') }}</el-radio> <el-radio :label="0">{{ $t('user.gender0') }}</el-radio>
@ -27,7 +27,7 @@
<el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input> <el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="mobile" :label="$t('user.mobile')"> <el-form-item prop="mobile" :label="$t('user.mobile')">
<el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input> <el-input v-model="dataForm.phone" :placeholder="$t('user.mobile')"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list"> <el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')"> <el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
@ -59,15 +59,12 @@ export default {
roleIdListDefault: [], roleIdListDefault: [],
dataForm: { dataForm: {
id: '', id: '',
username: '',
deptId: '0',
deptName: '',
password: '', password: '',
confirmPassword: '', confirmPassword: '',
realName: '', realName: '',
gender: 0, gender: 0,
email: '', email: '',
mobile: '', phone: '',
roleIdList: [], roleIdList: [],
status: 1 status: 1
} }
@ -147,7 +144,7 @@ export default {
}, },
// 获取角色列表 // 获取角色列表
getRoleList () { getRoleList () {
return this.$http.get('/sys/role/list').then(({ data: res }) => { return this.$http.get('/oper/access/operrole/list').then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -156,7 +153,7 @@ export default {
}, },
// 获取信息 // 获取信息
getInfo () { getInfo () {
this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => { this.$http.get(`/epmetuser/operuser/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -181,7 +178,7 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', { this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/operuser', {
...this.dataForm, ...this.dataForm,
roleIdList: [ roleIdList: [
...this.dataForm.roleIdList, ...this.dataForm.roleIdList,

25
epmet-oper-web/src/views/modules/sys/user.vue
View File

@ -3,13 +3,7 @@
<div class="mod-sys__user"> <div class="mod-sys__user">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input> <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')" clearable></el-input>
</el-form-item>
<el-form-item>
<ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
</el-form-item>
<el-form-item>
<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -32,10 +26,9 @@
@sort-change="dataListSortChangeHandle" @sort-change="dataListSortChangeHandle"
style="width: 100%;"> style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column> <el-table-column prop="realName" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column> <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column> <el-table-column prop="phone" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center"> <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ $getDictLabel("gender", scope.row.gender) }} {{ $getDictLabel("gender", scope.row.gender) }}
@ -47,7 +40,7 @@
<el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag> <el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column> <el-table-column prop="createTime" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -78,16 +71,14 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/sys/user/page', getDataListURL: '/epmetuser/operuser/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/sys/user', deleteURL: '/epmetuser/operuser',
deleteIsBatch: true, deleteIsBatch: true,
exportURL: '/sys/user/export' exportURL: '/epmetuser/operuser/export'
}, },
dataForm: { dataForm: {
username: '', realName: ''
deptId: '',
gender: ''
} }
} }
}, },

Write Preview
Loading…
Cancel
Save