Commit 20e7aaa7 authored by liuyang's avatar liuyang

菜单功能完成

parent 58c4f0e0
...@@ -105,11 +105,11 @@ ...@@ -105,11 +105,11 @@
init (id) { init (id) {
this.dataForm.id = id || 0 this.dataForm.id = id || 0
this.$http({ this.$http({
url: this.$http.adornUrl('/sys/menu/select'), url: this.$http.adornUrl('/api/sys/menu/select'),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
this.menuList = treeDataTranslate(data.menuList, 'menuId') this.menuList = treeDataTranslate(data, 'id')
}).then(() => { }).then(() => {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
...@@ -122,18 +122,18 @@ ...@@ -122,18 +122,18 @@
} else { } else {
// 修改 // 修改
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/menu/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/api/sys/menu/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
this.dataForm.id = data.menu.menuId this.dataForm.id = data.id
this.dataForm.type = data.menu.type this.dataForm.type = data.type
this.dataForm.name = data.menu.name this.dataForm.name = data.name
this.dataForm.parentId = data.menu.parentId this.dataForm.parentId = data.parentId
this.dataForm.url = data.menu.url this.dataForm.url = data.url
this.dataForm.perms = data.menu.perms this.dataForm.perms = data.perms
this.dataForm.orderNum = data.menu.orderNum this.dataForm.orderNum = data.orderNum
this.dataForm.icon = data.menu.icon this.dataForm.icon = data.icon
this.menuListTreeSetCurrentNode() this.menuListTreeSetCurrentNode()
}) })
} }
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
}, },
// 菜单树选中 // 菜单树选中
menuListTreeCurrentChangeHandle (data, node) { menuListTreeCurrentChangeHandle (data, node) {
this.dataForm.parentId = data.menuId this.dataForm.parentId = data.id
this.dataForm.parentName = data.name this.dataForm.parentName = data.name
}, },
// 菜单树设置当前选中节点 // 菜单树设置当前选中节点
...@@ -154,10 +154,10 @@ ...@@ -154,10 +154,10 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`), url: this.$http.adornUrl(`/api/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'menuId': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,
'type': this.dataForm.type, 'type': this.dataForm.type,
'name': this.dataForm.name, 'name': this.dataForm.name,
'parentId': this.dataForm.parentId, 'parentId': this.dataForm.parentId,
...@@ -167,7 +167,9 @@ ...@@ -167,7 +167,9 @@
'icon': this.dataForm.icon 'icon': this.dataForm.icon
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 200) { if(data && data.errorCode){
this.$message.error(data.msg)
}else{
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
...@@ -177,8 +179,6 @@ ...@@ -177,8 +179,6 @@
this.$emit('refreshDataList') this.$emit('refreshDataList')
} }
}) })
} else {
this.$message.error(data.msg)
} }
}) })
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-table <el-table
:data="dataList" :data="dataList"
row-key="menuId" row-key="id"
border border
style="width: 100%; "> style="width: 100%; ">
<el-table-column <el-table-column
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="isAuth('sys:menu:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.menuId)">修改</el-button> <el-button v-if="isAuth('sys:menu:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button v-if="isAuth('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row.menuId)">删除</el-button> <el-button v-if="isAuth('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -105,11 +105,11 @@ ...@@ -105,11 +105,11 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/sys/menu/list'), url: this.$http.adornUrl('/api/sys/menu/list'),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
this.dataList = treeDataTranslate(data, 'menuId') this.dataList = treeDataTranslate(data, 'id')
this.dataListLoading = false this.dataListLoading = false
}) })
}, },
...@@ -128,11 +128,13 @@ ...@@ -128,11 +128,13 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/menu/delete/${id}`), url: this.$http.adornUrl(`/api/sys/menu/delete/${id}`),
method: 'post', method: 'get',
data: this.$http.adornData() data: this.$http.adornData()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 200) { if(data){
this.$message.error(data.message)
}else{
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
...@@ -141,8 +143,6 @@ ...@@ -141,8 +143,6 @@
this.getDataList() this.getDataList()
} }
}) })
} else {
this.$message.error(data.msg)
} }
}) })
}).catch(() => {}) }).catch(() => {})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment