Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
d58cb9a5
Commit
d58cb9a5
authored
Nov 21, 2023
by
tianhongyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页下拉处理错位更正
parent
b10ed2b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
24 deletions
+27
-24
user.js
dsk-operate-ui/src/api/system/user.js
+25
-22
index.vue
dsk-operate-ui/src/views/index.vue
+2
-2
No files found.
dsk-operate-ui/src/api/system/user.js
View file @
d58cb9a5
import
request
from
'@/utils/request'
import
request
from
'@/utils/request'
;
import
{
parseStrEmpty
}
from
"@/utils/ruoyi"
;
import
{
parseStrEmpty
}
from
"@/utils/ruoyi"
;
// 查询用户列表
// 查询用户列表
...
@@ -7,7 +7,7 @@ export function listUser(query) {
...
@@ -7,7 +7,7 @@ export function listUser(query) {
url
:
'/system/user/list'
,
url
:
'/system/user/list'
,
method
:
'get'
,
method
:
'get'
,
params
:
query
params
:
query
})
})
;
}
}
// 查询用户详细
// 查询用户详细
...
@@ -15,7 +15,7 @@ export function getUser(userId) {
...
@@ -15,7 +15,7 @@ export function getUser(userId) {
return
request
({
return
request
({
url
:
'/system/user/'
+
parseStrEmpty
(
userId
),
url
:
'/system/user/'
+
parseStrEmpty
(
userId
),
method
:
'get'
method
:
'get'
})
})
;
}
}
// 新增用户
// 新增用户
...
@@ -24,7 +24,7 @@ export function addUser(data) {
...
@@ -24,7 +24,7 @@ export function addUser(data) {
url
:
'/system/user'
,
url
:
'/system/user'
,
method
:
'post'
,
method
:
'post'
,
data
:
data
data
:
data
})
})
;
}
}
// 修改用户
// 修改用户
...
@@ -33,7 +33,7 @@ export function updateUser(data) {
...
@@ -33,7 +33,7 @@ export function updateUser(data) {
url
:
'/system/user'
,
url
:
'/system/user'
,
method
:
'put'
,
method
:
'put'
,
data
:
data
data
:
data
})
})
;
}
}
// 删除用户
// 删除用户
...
@@ -41,7 +41,7 @@ export function delUser(userId) {
...
@@ -41,7 +41,7 @@ export function delUser(userId) {
return
request
({
return
request
({
url
:
'/system/user/'
+
userId
,
url
:
'/system/user/'
+
userId
,
method
:
'delete'
method
:
'delete'
})
})
;
}
}
// 用户密码重置
// 用户密码重置
...
@@ -49,12 +49,12 @@ export function resetUserPwd(userId, password) {
...
@@ -49,12 +49,12 @@ export function resetUserPwd(userId, password) {
const
data
=
{
const
data
=
{
userId
,
userId
,
password
password
}
}
;
return
request
({
return
request
({
url
:
'/system/user/resetPwd'
,
url
:
'/system/user/resetPwd'
,
method
:
'put'
,
method
:
'put'
,
data
:
data
data
:
data
})
})
;
}
}
// 用户状态修改
// 用户状态修改
...
@@ -62,12 +62,12 @@ export function changeUserStatus(userId, status) {
...
@@ -62,12 +62,12 @@ export function changeUserStatus(userId, status) {
const
data
=
{
const
data
=
{
userId
,
userId
,
status
status
}
}
;
return
request
({
return
request
({
url
:
'/system/user/changeStatus'
,
url
:
'/system/user/changeStatus'
,
method
:
'put'
,
method
:
'put'
,
data
:
data
data
:
data
})
})
;
}
}
// 查询用户个人信息
// 查询用户个人信息
...
@@ -75,7 +75,7 @@ export function getUserProfile() {
...
@@ -75,7 +75,7 @@ export function getUserProfile() {
return
request
({
return
request
({
url
:
'/system/user/profile'
,
url
:
'/system/user/profile'
,
method
:
'get'
method
:
'get'
})
})
;
}
}
// 修改用户个人信息
// 修改用户个人信息
...
@@ -84,7 +84,7 @@ export function updateUserProfile(data) {
...
@@ -84,7 +84,7 @@ export function updateUserProfile(data) {
url
:
'/system/user/profile'
,
url
:
'/system/user/profile'
,
method
:
'put'
,
method
:
'put'
,
data
:
data
data
:
data
})
})
;
}
}
// 用户密码重置
// 用户密码重置
...
@@ -92,12 +92,12 @@ export function updateUserPwd(oldPassword, newPassword) {
...
@@ -92,12 +92,12 @@ export function updateUserPwd(oldPassword, newPassword) {
const
data
=
{
const
data
=
{
oldPassword
,
oldPassword
,
newPassword
newPassword
}
}
;
return
request
({
return
request
({
url
:
'/system/user/profile/updatePwd'
,
url
:
'/system/user/profile/updatePwd'
,
method
:
'put'
,
method
:
'put'
,
params
:
data
params
:
data
})
})
;
}
}
// 用户头像上传
// 用户头像上传
...
@@ -106,7 +106,7 @@ export function uploadAvatar(data) {
...
@@ -106,7 +106,7 @@ export function uploadAvatar(data) {
url
:
'/system/user/profile/avatar'
,
url
:
'/system/user/profile/avatar'
,
method
:
'post'
,
method
:
'post'
,
data
:
data
data
:
data
})
})
;
}
}
// 查询授权角色
// 查询授权角色
...
@@ -114,7 +114,7 @@ export function getAuthRole(userId) {
...
@@ -114,7 +114,7 @@ export function getAuthRole(userId) {
return
request
({
return
request
({
url
:
'/system/user/authRole/'
+
userId
,
url
:
'/system/user/authRole/'
+
userId
,
method
:
'get'
method
:
'get'
})
})
;
}
}
// 保存授权角色
// 保存授权角色
...
@@ -123,15 +123,18 @@ export function updateAuthRole(data) {
...
@@ -123,15 +123,18 @@ export function updateAuthRole(data) {
url
:
'/system/user/authRole'
,
url
:
'/system/user/authRole'
,
method
:
'put'
,
method
:
'put'
,
params
:
data
params
:
data
})
})
;
}
}
// 查询部门下拉树结构
// 查询部门下拉树结构
export
function
deptTreeSelect
()
{
export
function
deptTreeSelect
()
{
return
request
({
return
request
({
url
:
'/system/user/deptTree'
,
url
:
`/system/user/deptTree`
,
method
:
'get'
method
:
'get'
,
})
params
:
{
status
:
0
}
});
}
}
// 用户文件记录列表
// 用户文件记录列表
...
@@ -139,6 +142,6 @@ export function fileList(data) {
...
@@ -139,6 +142,6 @@ export function fileList(data) {
return
request
({
return
request
({
url
:
'/user/file/record/list'
,
url
:
'/user/file/record/list'
,
method
:
'get'
,
method
:
'get'
,
params
:
data
params
:
data
})
})
;
}
}
dsk-operate-ui/src/views/index.vue
View file @
d58cb9a5
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
prop=
"type"
>
<el-form-item
prop=
"type"
>
<el-select
v-model=
"queryParams1.type"
multiple
collapse-tags
@
change=
"iptAdaptive(inputID6,
''
,'changeSelect2')"
:class=
"[`select-adaptive-${inputID6}`,queryParams1.type.length > 1 ? 'selectTag' : '']"
clearable
placeholder=
"项目类型"
>
<el-select
v-model=
"queryParams1.type"
multiple
collapse-tags
@
change=
"iptAdaptive(inputID6,
true
,'changeSelect2')"
:class=
"[`select-adaptive-${inputID6}`,queryParams1.type.length > 1 ? 'selectTag' : '']"
clearable
placeholder=
"项目类型"
>
<el-option
v-for=
"(item,index) in projectType"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
<el-option
v-for=
"(item,index) in projectType"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
prop=
"projects"
>
<el-form-item
prop=
"projects"
>
<el-select
v-model=
"queryParams2.projects"
@
change=
"iptAdaptive(inputID10,
''
,'changeSelect3')"
multiple
collapse-tags
clearable
placeholder=
"项目类型"
:class=
"[`select-adaptive-${inputID10}`,queryParams2.projects.length > 1 ? 'selectTag' : '']"
>
<el-select
v-model=
"queryParams2.projects"
@
change=
"iptAdaptive(inputID10,
true
,'changeSelect3')"
multiple
collapse-tags
clearable
placeholder=
"项目类型"
:class=
"[`select-adaptive-${inputID10}`,queryParams2.projects.length > 1 ? 'selectTag' : '']"
>
<el-option
v-for=
"(item,index) in projectType"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
<el-option
v-for=
"(item,index) in projectType"
:key=
"index"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment