Skip to content

G
gin-vue-admin

Elij4h / gin-vue-admin
与 Fork 源项目一致

Fork自 FLIPPED-AURORA / gin-vue-admin

通知 1
Star 0
Fork 0
G
gin-vue-admin

体验新版 GitCode，发现更多精彩内容 >>

提交 8e8bdc5d 编写于 作者: Mr.奇淼（'s avatar Mr.奇淼（
浏览文件
操作

增加删除用户功能 修正一些细节bug

上级 a4b0802f
隐藏空白更改
内联 并排
Showing with 247 addition and 168 deletion
server/api/v1/sys_user.go
浏览文件 @ 8e8bdc5d
...@@ -229,3 +229,22 @@ func SetUserAuthority(c *gin.Context) { ...@@ -229,3 +229,22 @@ func SetUserAuthority(c *gin.Context) {
response.OkWithMessage("修改成功", c) response.OkWithMessage("修改成功", c)
} }
} }
// @Tags SysUser
// @Summary 删除用户
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.SetUserAuth true "删除用户"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/deleteUser [delete]
func DeleteUser(c *gin.Context) {
var reqId request.GetById
_ = c.ShouldBindJSON(&reqId)
err := service.DeleteUser(reqId.Id)
if err != nil {
response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c)
} else {
response.OkWithMessage("删除成功", c)
}
}
server/router/sys_user.go
浏览文件 @ 8e8bdc5d
...@@ -13,5 +13,6 @@ func InitUserRouter(Router *gin.RouterGroup) { ...@@ -13,5 +13,6 @@ func InitUserRouter(Router *gin.RouterGroup) {
UserRouter.POST("uploadHeaderImg", v1.UploadHeaderImg) //上传头像 UserRouter.POST("uploadHeaderImg", v1.UploadHeaderImg) //上传头像
UserRouter.POST("getUserList", v1.GetUserList) // 分页获取用户列表 UserRouter.POST("getUserList", v1.GetUserList) // 分页获取用户列表
UserRouter.POST("setUserAuthority", v1.SetUserAuthority) //设置用户权限 UserRouter.POST("setUserAuthority", v1.SetUserAuthority) //设置用户权限
UserRouter.DELETE("deleteUser", v1.DeleteUser) //删除用户
} }
} }
server/service/sys_base_menu.go
浏览文件 @ 8e8bdc5d
...@@ -35,6 +35,7 @@ func DeleteBaseMenu(id float64) (err error) { ...@@ -35,6 +35,7 @@ func DeleteBaseMenu(id float64) (err error) {
// @return err errorgetMenu // @return err errorgetMenu
func UpdateBaseMenu(menu model.SysBaseMenu) (err error) { func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
var oldMenu model.SysBaseMenu
upDateMap := make(map[string]interface{}) upDateMap := make(map[string]interface{})
upDateMap["keep_alive"] = menu.KeepAlive upDateMap["keep_alive"] = menu.KeepAlive
upDateMap["default_menu"] = menu.DefaultMenu upDateMap["default_menu"] = menu.DefaultMenu
...@@ -46,7 +47,15 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) { ...@@ -46,7 +47,15 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
upDateMap["title"] = menu.Title upDateMap["title"] = menu.Title
upDateMap["icon"] = menu.Icon upDateMap["icon"] = menu.Icon
upDateMap["sort"] = menu.Sort upDateMap["sort"] = menu.Sort
err = global.GVA_DB.Where("id = ?", menu.ID).Find(&model.SysBaseMenu{}).Updates(upDateMap).Error db := global.GVA_DB.Where("id = ?", menu.ID).Find(&oldMenu)
if oldMenu.Name != menu.Name {
notSame := global.GVA_DB.Where("id <> ? AND name = ?", menu.ID, menu.Name).First(&model.SysBaseMenu{}).RecordNotFound()
if !notSame {
global.GVA_LOG.Debug("存在相同name修改失败")
return errors.New("存在相同name修改失败")
}
}
err = db.Updates(upDateMap).Error
global.GVA_LOG.Debug("菜单修改时候，关联菜单err:%v", err) global.GVA_LOG.Debug("菜单修改时候，关联菜单err:%v", err)
return err return err
} }
......
server/service/sys_user.go
浏览文件 @ 8e8bdc5d
...@@ -95,6 +95,19 @@ func SetUserAuthority(uuid uuid.UUID, authorityId string) (err error) { ...@@ -95,6 +95,19 @@ func SetUserAuthority(uuid uuid.UUID, authorityId string) (err error) {
return err return err
} }
// @title SetUserAuthority
// @description set the authority of a certain user, 设置一个用户的权限
// @auth （2020/04/05 20:22）
// @param uuid UUID
// @param authorityId string
// @return err error
func DeleteUser(id float64) (err error) {
var user model.SysUser
err = global.GVA_DB.Where("id = ?", id).Delete(&user).Error
return err
}
// @title UploadHeaderImg // @title UploadHeaderImg
// @description upload avatar, 用户头像上传更新地址 // @description upload avatar, 用户头像上传更新地址
// @auth （2020/04/05 20:22） // @auth （2020/04/05 20:22）
......
web/src/api/user.js
浏览文件 @ 8e8bdc5d
...@@ -77,4 +77,21 @@ export const setUserAuthority = (data) => { ...@@ -77,4 +77,21 @@ export const setUserAuthority = (data) => {
method: 'post', method: 'post',
data: data data: data
}) })
}
// @Tags SysUser
// @Summary 删除用户
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.SetUserAuth true "删除用户"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/deleteUser [delete]
export const deleteUser = (data) => {
return service({
url: "/user/deleteUser",
method: 'delete',
data: data
})
} }
\ No newline at end of file
web/src/style/main.scss
浏览文件 @ 8e8bdc5d
...@@ -530,11 +530,12 @@ ol, ...@@ -530,11 +530,12 @@ ol,
li { li {
list-style-type: none; list-style-type: none;
} }
.el-table__body-wrapper{
tr{ .el-table__body-wrapper {
td{ tr {
.cell{ td {
.el-button+.el-button{ .cell {
.el-button+.el-button {
margin-left: 0; margin-left: 0;
} }
} }
...@@ -542,210 +543,204 @@ li { ...@@ -542,210 +543,204 @@ li {
} }
} }
// navbar // navbar
.aside{ .aside {
.el-scrollbar { .el-scrollbar {
.el-scrollbar__view { .el-scrollbar__view {
.el-menu-vertical{ .el-menu-vertical {
background-color: #001529; background-color: #001529;
}
.el-menu-item:hover i,
.el-menu-item:hover span{
color:#fff;
}
li{
background-color: #001529;
ul{
.el-menu-item{
background-color: #000408;
height: 44px;
line-height: 44px;
}
.is-active{
background-color:#1890ff;
}
}
}
.el-submenu__title:hover{
background-color: #001529;
}
.el-submenu__title:hover i,
.el-submenu__title:hover span{
color:#fff;
}
.el-menu--inline{
border-left: 5px solid #2c3b41;
}
}
}
}
// layout
.layout-cont{
.main-cont{
position: relative;
&.el-main {
background-color: #ecf0f5;
padding: 0;
} }
.breadcrumb{ .el-menu-item:hover i,
background-color: #fff; .el-menu-item:hover span {
padding: 0 0 15px 15px; color: #fff;
}
li {
background-color: #001529;
ul {
.el-menu-item {
background-color: #000408;
height: 44px;
line-height: 44px;
}
.is-active {
background-color: #1890ff;
}
}
}
.el-submenu__title:hover {
background-color: #001529;
}
.el-submenu__title:hover i,
.el-submenu__title:hover span {
color: #fff;
}
.el-menu--inline {
border-left: 5px solid #2c3b41;
} }
} }
} }
}
.admin-box { // layout
padding: 15px 20px; .layout-cont {
.el-button{ .main-cont {
padding: 7px 10px; position: relative;
} &.el-main {
.el-input__inner{ background-color: #ecf0f5;
height: 30px; padding: 0;
line-height: 30px;
} }
.el-input__icon{ .breadcrumb {
line-height: 30px; background-color: #fff;
padding: 0 0 15px 15px;
} }
} }
.button-box{ }
background: #fff;
border: 1px solid #ebeef5;
border-bottom: none;
.admin-box {
padding: 15px 20px;
.el-button {
padding: 7px 10px;
} }
.el-input__inner {
.search-term{ height: 30px;
background: #fff; line-height: 30px;
padding: 0 15px; }
border-left: 1px solid #ebeef5; .el-input__icon {
border-right: 1px solid #ebeef5; line-height: 30px;
} }
}
.button-box {
background: #fff;
border: 1px solid #ebeef5;
border-bottom: none;
}
.search-term {
background: #fff;
padding: 0 15px;
border-left: 1px solid #ebeef5;
border-right: 1px solid #ebeef5;
}
// table // table
.has-gutter{ .has-gutter {
tr{ tr {
th{ th {
background-color: #fafafa; background-color: #fafafa;
} }
} }
} }
.el-table--striped{
.el-table__body{ .el-table--striped {
tr.el-table__row--striped{ .el-table__body {
td{ tr.el-table__row--striped {
td {
background: #fff!important; background: #fff!important;
} }
} }
} }
} }
.el-table th, .el-table tr{
.el-table th,
.el-table tr {
background-color: #fafafa; background-color: #fafafa;
} }
.el-pagination{
.el-pagination {
.btn-prev, .btn-prev,
.btn-next{ .btn-next {
border: 1px solid #ddd; border: 1px solid #ddd;
border-radius: 4px; border-radius: 4px;
} }
.el-pager{ .el-pager {
li {
li{
color: #666; color: #666;
font-size: 12px; font-size: 12px;
margin: 0 5px; margin: 0 5px;
border: 1px solid #ddd; border: 1px solid #ddd;
border-radius: 4px; border-radius: 4px;
} }
} }
} }
// el-form // el-form
.el-form{ .el-form {
background-color: #fff; background-color: #fff;
padding: 10px 0; padding: 10px 0;
} }
.el-row{
.el-row {
padding: 10px 0; padding: 10px 0;
.el-col>label{ .el-col>label {
line-height: 30px;
line-height: 30px; text-align: right;
text-align: right; width: 80%;
width: 80%; padding-right: 15px;
padding-right: 15px; display: inline-block;
display: inline-block;
} }
.line {
.line{
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
} }
} }
// edit_container // edit_container
.edit_container{ .edit_container {
background-color: #fff; background-color: #fff;
padding: 15px; padding: 15px;
.el-button { .el-button {
margin: 15px 0; margin: 15px 0;
} }
} }
.edit{
.edit {
background-color: #fff; background-color: #fff;
padding: 15px; padding: 15px;
.el-button { .el-button {
margin: 15px 0; margin: 15px 0;
} }
} }
// upload-demo // upload-demo
.upload-demo, .upload-demo,
.upload{ .upload {
background-color: #fff; background-color: #fff;
padding: 15px; padding: 15px;
.el-upload-list__item-status-label{ .el-upload-list__item-status-label {
right: 0; right: 0;
left: 120px; left: 120px;
} }
.el-upload__tip{ .el-upload__tip {
margin: 10px 0; margin: 10px 0;
} }
} }
// system // system
.system{ .system {
padding: 15px; padding: 15px;
.el-input__inner{ .el-input__inner {
width: 80%; width: 80%;
} }
} }
// 导航 // 导航
#app { #app {
.el-container{ .el-container {
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
.el-container.mobile.openside { .el-container.mobile.openside {
position: fixed; position: fixed;
top: 0; top: 0;
} }
.hideside{ .hideside {
.aside{ .aside {
width: 54px!important; width: 54px!important;
} }
} }
.el-aside{ .el-aside {
-webkit-transition: width .2s; -webkit-transition: width .2s;
transition: width .2s; transition: width .2s;
width: 220px; width: 220px;
...@@ -759,66 +754,57 @@ li { ...@@ -759,66 +754,57 @@ li {
z-index: 1001; z-index: 1001;
overflow: hidden; overflow: hidden;
} }
.mobile.hideside {
.mobile.hideside{ .el-aside {
.el-aside{
// pointer-events: none; // pointer-events: none;
-webkit-transition-duration: .2s; -webkit-transition-duration: .2s;
transition-duration: .2s; transition-duration: .2s;
-webkit-transform: translate3d(-210px,0,0); -webkit-transform: translate3d(-210px, 0, 0);
transform: translate3d(-220px,0,0); transform: translate3d(-220px, 0, 0);
} }
} }
.mobile {
.mobile{ .el-aside {
.el-aside{
-webkit-transition: -webkit-transform .28s; -webkit-transition: -webkit-transform .28s;
transition: -webkit-transform .28s; transition: -webkit-transform .28s;
transition: transform .28s; transition: transform .28s;
transition: transform .28s,-webkit-transform .28s; transition: transform .28s, -webkit-transform .28s;
width: 210px!important width: 210px!important
} }
} }
.el-container {
.el-container{
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
.el-aside{ .el-aside {
// transition: none; // transition: none;
.aside { .aside {
background: #000; background: #000;
.el-menu{ .el-menu {
border-right: none; border-right: none;
} }
} }
} }
} }
.main-cont.el-main {
.main-cont.el-main{
min-height: 100%; min-height: 100%;
-webkit-transition: margin-left .28s; -webkit-transition: margin-left .28s;
transition: margin-left .28s; transition: margin-left .28s;
margin-left: 220px; margin-left: 220px;
position: relative; position: relative;
} }
.hideside {
.main-cont.el-main {
.hideside{
.main-cont.el-main{
margin-left: 54px; margin-left: 54px;
} }
} }
.mobile { .mobile {
.main-cont.el-main{ .main-cont.el-main {
margin-left: 0px; margin-left: 0px;
} }
} }
.openside.mobile{ .openside.mobile {
.shadowBg{ .shadowBg {
background: #000; background: #000;
opacity: .3; opacity: .3;
width: 100%; width: 100%;
...@@ -829,22 +815,39 @@ li { ...@@ -829,22 +815,39 @@ li {
left: 0; left: 0;
} }
} }
} }
.el-menu--vertical{
.el-menu{ .el-menu .el-menu--inline {
background: #2c3b41;
}
.el-submenu .el-submenu {
background-color: #000408 !important;
}
.aside .el-scrollbar .el-scrollbar__view .el-submenu__title:hover {
background-color: #000408 !important;
}
.el-submenu {
.aside .el-scrollbar .el-scrollbar__view .el-submenu__title:hover {
background-color: #000408 !important;
}
}
.el-menu--vertical {
.el-menu {
margin-left: -8px; margin-left: -8px;
background-color:rgb(48,65,86); background-color: rgb(48, 65, 86);
.el-menu-item{ .el-menu-item {
background-color:rgb(48,65,86); background-color: rgb(48, 65, 86);
} }
.el-menu-item:focus, .el-menu-item:focus,
.el-menu-item:hover{ .el-menu-item:hover {
background-color: #263445; background-color: #263445;
color: #fff; color: #fff;
} }
} }
} }
// 导航*****
// 导航*****
\ No newline at end of file
web/src/view/superAdmin/api/api.vue
浏览文件 @ 8e8bdc5d
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
if (res.code == 0) { if (res.code == 0) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '添加成功', message: '编辑成功',
showClose: true showClose: true
}) })
} }
......
web/src/view/superAdmin/menu/menu.vue
浏览文件 @ 8e8bdc5d
...@@ -225,14 +225,9 @@ export default { ...@@ -225,14 +225,9 @@ export default {
if (res.code == 0) { if (res.code == 0) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '添加成功!' message: this.isEdit?'编辑成功':'添加成功!'
}) })
this.getTableData() this.getTableData()
} else {
this.$message({
type: 'error',
message: '添加失败!'
})
} }
this.initForm() this.initForm()
this.dialogFormVisible = false this.dialogFormVisible = false
......
web/src/view/superAdmin/user/user.vue
浏览文件 @ 8e8bdc5d
...@@ -30,6 +30,21 @@ ...@@ -30,6 +30,21 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" min-width="150">
<template slot-scope="scope">
<el-popover
placement="top"
width="160"
v-model="scope.row.visible">
<p>确定要删除此用户吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
</div>
<el-button type="text" size="small" slot="reference">删除</el-button>
</el-popover>
</template>
</el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:current-page="page" :current-page="page"
...@@ -89,7 +104,7 @@ ...@@ -89,7 +104,7 @@
<script> <script>
// 获取列表内容封装在mixins内部 getTableData方法 初始化已封装完成 // 获取列表内容封装在mixins内部 getTableData方法 初始化已封装完成
const path = process.env.VUE_APP_BASE_API const path = process.env.VUE_APP_BASE_API
import { getUserList, setUserAuthority, register } from '@/api/user' import { getUserList, setUserAuthority, register, deleteUser } from '@/api/user'
import { getAuthorityList } from '@/api/authority' import { getAuthorityList } from '@/api/authority'
import infoList from '@/components/mixins/infoList' import infoList from '@/components/mixins/infoList'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
...@@ -127,6 +142,13 @@ export default { ...@@ -127,6 +142,13 @@ export default {
...mapGetters('user', ['token']) ...mapGetters('user', ['token'])
}, },
methods: { methods: {
async deleteUser(row){
const res = await deleteUser({id:row.ID})
if(res.code == 0){
this.getTableData()
row.visible = false
}
},
getAuthorityList(AuthorityData){ getAuthorityList(AuthorityData){
AuthorityData.map(item=>{ AuthorityData.map(item=>{
this.authOptions.push({ this.authOptions.push({
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或