Compare commits
No commits in common. "0f380ec86e7bd36198059ff5fbc2a508f6a39183" and "d5a1a8edcd1cee6fa8988974802d3ea7d072b036" have entirely different histories.
0f380ec86e
...
d5a1a8edcd
|
@ -3,10 +3,7 @@ import request from '@/utils/request'
|
|||
// 获取部门列表
|
||||
export const reqGetDepartments = () => request({ url: `/WRD-admin/sys/dept/list`, method: 'get' })
|
||||
|
||||
// 获取所有部门
|
||||
export const reqGetAllDepartments = () => request({ url: `/WRD-admin/sys/dept/listAll`, method: 'get' })
|
||||
|
||||
// 获取区域及城市
|
||||
// 获取部门列表
|
||||
export const reqGetRegionAndCity = () => request({ url: `/WRD-admin/sys/user/ReignAndCity`, method: 'get' })
|
||||
|
||||
// 不带部门
|
||||
|
|
|
@ -101,8 +101,8 @@ export default {
|
|||
async logout() {
|
||||
await this.$store.dispatch('user/logout')
|
||||
// this.$router.push(`/login?redirect=${this.$route.fullPath}`);
|
||||
this.$router.push(`/login`)
|
||||
// window.location.href = 'https://oneid.siemens.com.cn/frontend/login?idaasAppId=siemens_ciam2'
|
||||
// this.$router.push(`/login`)
|
||||
window.location.href = 'https://oneid.siemens.com.cn/frontend/login?idaasAppId=siemens_ciam2'
|
||||
},
|
||||
// 修改个人信息回调
|
||||
updatePersonalPassword() {
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
<template>
|
||||
<div class="user-container">
|
||||
<el-form label-width="80px" :inline="true" class="button-headers">
|
||||
<el-form-item>
|
||||
<el-input v-model="name" placeholder="请输入用户姓名" clearable />
|
||||
<!-- <el-form-item>
|
||||
<el-input v-model="model" placeholder="请输入GID"></el-input>
|
||||
</el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" @click="userSearch">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" @click="search"
|
||||
>查询</el-button
|
||||
>
|
||||
<el-button type="default" @click="resetSearch">清空</el-button> -->
|
||||
<el-button type="primary" @click="showAddUserDialog">添加用户</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
|
@ -156,7 +159,6 @@ export default {
|
|||
loadingOfGetUserList: false,
|
||||
loadingOfSaveUserButton: false,
|
||||
dialogUserVisible: false,
|
||||
name: '',
|
||||
user: {},
|
||||
page: 1,
|
||||
limit: 10,
|
||||
|
@ -207,15 +209,15 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
async fetchDepartmentsList() {
|
||||
const result = await this.$API.select.reqGetAllDepartments()
|
||||
if (result.code === 0) {
|
||||
const result = await this.$API.select.reqGetDepartments()
|
||||
if (result.code == 0) {
|
||||
this.departmentList = result.data
|
||||
}
|
||||
},
|
||||
async fetchRolesList() {
|
||||
const resOfGetRolesList = await this.$API.role.reqGetRoleList()
|
||||
|
||||
if (resOfGetRolesList.code === 0) {
|
||||
if (resOfGetRolesList.code == 0) {
|
||||
this.roles = resOfGetRolesList.data
|
||||
}
|
||||
},
|
||||
|
@ -228,9 +230,6 @@ export default {
|
|||
page: page,
|
||||
limit: limit
|
||||
}
|
||||
if (this.name) {
|
||||
queryInfo.name = this.name
|
||||
}
|
||||
const resOfFetchUserList = await this.$API.user.reqGetUserList(queryInfo)
|
||||
if (resOfFetchUserList.code == 0) {
|
||||
this.total = resOfFetchUserList.data.total
|
||||
|
@ -356,9 +355,6 @@ export default {
|
|||
if (theRole) {
|
||||
return theRole.name
|
||||
}
|
||||
},
|
||||
userSearch() {
|
||||
this.fetchUsersList()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ module.exports = {
|
|||
[process.env.VUE_APP_BASE_API]: {
|
||||
target: 'http://139.219.4.195:8003',
|
||||
// 测试地址
|
||||
// target: 'http://192.168.1.169:8003',
|
||||
// target: 'http://192.168.1.161:8003',
|
||||
pathRewrite: {
|
||||
['^' + process.env.VUE_APP_BASE_API]: ''
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue