odjbin/SmartOpsWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into test

Browse Source 
# Conflicts:
#	docker.sh
This commit is contained in:
odjbin
2024-10-03 17:05:18 +08:00
parent aa84769740 de83cc57da
commit 9f2df9b3aa
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker.sh
View File

@@ -12,5 +12,5 @@ docker rmi smartopsweb:latest
echo '----build image start----' echo '----build image start----'
docker build -t smartopsweb:latest . docker build -t smartopsweb:latest .
echo '----build image success----' echo '----build image success----'
docker run --name smartopsweb --restart=always -d -p 8080:80 smartopsweb:latest docker run --name smartopsweb --restart=always -d -p 28081:80 smartopsweb:latest

8
src/views/system/role/DistributeUser.vue
View File

@@ -320,9 +320,15 @@ const handleDialogSelect = (selection) => {
} }
} }
const handleSubmit = (userIds) => { const handleSubmit = (userIds) => {
let ids=[]
if(userIds instanceof Array){
ids=userIds
}else{
ids.push(userIds)
}
roleBindUser({ roleBindUser({
id: roleId, id: roleId,
ids: userIds, ids: ids,
}).then(res => { }).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
ElMessage.success(res.msg); ElMessage.success(res.msg);