Skip to content

N
newShopFront
Commit b716fbe2 authored by Your Name's avatar Your Name
Browse files
Options

权限节点列表管理员列表

parent d476d4dd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 743 additions and 91 deletions
package-lock.json
View file @ b716fbe2
......@@ -3866,9 +3866,9 @@
}
},
"buffer": {
"version": "4.9.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"version": "4.9.2",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
"integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
"dev": true,
"requires": {
"base64-js": "^1.0.2",
......@@ -5793,9 +5793,9 @@
"dev": true
},
"des.js": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
"dev": true,
"requires": {
"inherits": "^2.0.1",
......@@ -6089,9 +6089,9 @@
"dev": true
},
"elliptic": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
"integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
"integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
"dev": true,
"requires": {
"bn.js": "^4.4.0",
......@@ -14055,9 +14055,9 @@
}
},
"serialize-javascript": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
"integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
"integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
"dev": true
},
"serve-index": {
......@@ -15054,16 +15054,16 @@
}
},
"terser-webpack-plugin": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
"integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
"version": "1.4.3",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
"integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
"dev": true,
"requires": {
"cacache": "^12.0.2",
"find-cache-dir": "^2.1.0",
"is-wsl": "^1.1.0",
"schema-utils": "^1.0.0",
"serialize-javascript": "^1.7.0",
"serialize-javascript": "^2.1.2",
"source-map": "^0.6.1",
"terser": "^4.1.2",
"webpack-sources": "^1.4.0",
......@@ -16103,9 +16103,9 @@
"dev": true
},
"webpack": {
"version": "4.41.2",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
"integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
"version": "4.41.3",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.3.tgz",
"integrity": "sha512-EcNzP9jGoxpQAXq1VOoTet0ik7/VVU1MovIfcUSAjLowc7GhcQku/sOXALvq5nPpSei2HF6VRhibeJSC3i/Law==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.8.5",
......@@ -16128,7 +16128,7 @@
"node-libs-browser": "^2.2.1",
"schema-utils": "^1.0.0",
"tapable": "^1.1.3",
"terser-webpack-plugin": "^1.4.1",
"terser-webpack-plugin": "^1.4.3",
"watchpack": "^1.6.0",
"webpack-sources": "^1.4.1"
}
......
src/api/authority.js
View file @ b716fbe2
......@@ -14,7 +14,16 @@ import homeUrl from './homeURL'
* @param parameter
* @returns {*}
*/
// 获取权限节点列表
export function getMenuList(parameter) {
console.log('111111111111111111111111111111111111111111111')
console.log(parameter)
return axios({
url: 'authority/authority-nodes/node-list',
method: 'get',
params: parameter
})
}
// 获取角色列表
export function getRoleList(parameter) {
return axios({
......@@ -50,7 +59,7 @@ export function modifyRoleDetails (parameter) {
})
}
// 获取权限节点
export function getTreeDetails (parameter) {
export function getTreeList (parameter) {
return axios({
url: 'authority/authority-nodes/role-authorities',
method: 'get',
......@@ -65,7 +74,15 @@ export function modifyAuthority (parameter) {
data: parameter
})
}
// 获取管理员列表
export function getMangeList(parameter) {
console.log(parameter)
return axios({
url: 'authority/manage-lists/get-manage-list',
method: 'get',
params: parameter
})
}
/**
* get user 2step code open?
* @param parameter {*}
......
src/api/manage.js
View file @ b716fbe2
......@@ -11,69 +11,69 @@ const api = {
export default api
export function getUserList(parameter) {
return axios({
url: api.user,
method: 'get',
params: parameter
})
}
// export function getUserList(parameter) {
// return axios({
// url: api.user,
// method: 'get',
// params: parameter
// })
// }
export function getRoleList(parameter) {
return axios({
url: api.role,
method: 'get',
params: parameter
})
}
// export function getRoleList(parameter) {
// return axios({
// url: api.role,
// method: 'get',
// params: parameter
// })
// }
export function getServiceList(parameter) {
console.log(parameter);
let newparameter = {
'page': parameter.page-1,
'pageSize': parameter.pageSize,
}
return axios({
url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-complains/user-complain",
method: 'get',
headers: {
'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
},
params: newparameter
})
}
// export function getServiceList(parameter) {
// console.log(parameter);
// let newparameter = {
// 'page': parameter.page-1,
// 'pageSize': parameter.pageSize,
// }
// return axios({
// url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-complains/user-complain",
// method: 'get',
// headers: {
// 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
// },
// params: newparameter
// })
// }
export function getPermissions(parameter) {
console.log(parameter);
let newparameter = {
'page': parameter.page-1,
'pageSize': parameter.pageSize,
}
return axios({
url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/shop-users/employee-list",
method: 'get',
headers: {
'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
},
params: newparameter
})
}
// export function getPermissions(parameter) {
// console.log(parameter);
// let newparameter = {
// 'page': parameter.page-1,
// 'pageSize': parameter.pageSize,
// }
// return axios({
// url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/shop-users/employee-list",
// method: 'get',
// headers: {
// 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
// },
// params: newparameter
// })
// }
export function getOrgTree(parameter) {
console.log(parameter);
let newparameter = {
'page': parameter.page-1,
'pageSize': parameter.pageSize,
}
return axios({
url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-departments/department",
method: 'get',
headers: {
'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
},
params: newparameter
})
}
// export function getOrgTree(parameter) {
// console.log(parameter);
// let newparameter = {
// 'page': parameter.page-1,
// 'pageSize': parameter.pageSize,
// }
// return axios({
// url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-departments/department",
// method: 'get',
// headers: {
// 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
// },
// params: newparameter
// })
// }
// id == 0 add post
// id != 0 update put
......
src/components/Table/index.js
View file @ b716fbe2
......@@ -167,12 +167,25 @@ export default {
this.loadData()
return
}
// 这里用于判断接口是否有返回 r.totalCount 且 this.showPagination = true 且 pageNo 和 pageSize 存在 且 totalCount 小于等于 pageNo * pageSize 的大小
// 当情况满足时，表示数据不满足分页大小，关闭 table 分页功能
try {
if ((['auto', true].includes(this.showPagination) && r.totalCount <= (r.page * this.localPagination.pageSize))) {
this.localPagination.hideOnSinglePage = true
// this.localPagination = this.showPagination && Object.assign({}, this.localPagination, {
// current: r.page, // 返回结果中的当前分页数
// total: r.totalCount, // 返回结果中的总记录数
// showSizeChanger: this.showSizeChanger,
// pageSize: (pagination && pagination.pageSize) ||
// this.localPagination.pageSize
// }) || false
// // 为防止删除数据后导致页面当前页面数据长度为 0 ,自动翻页到上一页
// if (r.data.length === 0 && this.showPagination && this.localPagination.current > 1) {
// this.localPagination.current--
// this.loadData()
// return
// }
}
} catch (e) {
this.localPagination = false
......
src/config/router.config.js
View file @ b716fbe2
......@@ -167,11 +167,23 @@ export const asyncRouterMap = [
component: PageView,
meta: { title: '权限管理', keepAlive: true, icon: 'safety', permission: ['table'] },
children: [
{
path: '/authority/menuList',
name: 'menuList',
component: () => import('@/views/authority/menuList'),
meta: { title: '权限节点列表', keepAlive: false, permission: ['table'] }
},
{
path: '/authority/rolelist',
name: 'rolelist',
component: () => import('@/views/authority/roleList'),
meta: { title: '角色列表', keepAlive: false, permission: ['table'] }
},
{
path: '/authority/manageList',
name: 'manageList',
component: () => import('@/views/authority/manageList'),
meta: { title: '管理员列表', keepAlive: false, permission: ['table'] }
}
]
},
......
src/main.js
View file @ b716fbe2
......@@ -16,16 +16,19 @@ import 'quill/dist/quill.bubble.css'
import VueAMap from 'vue-amap';
// mock
// WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.
import './mock'
// import './mock'
import bootstrap from './core/bootstrap'
import './core/lazy_use'
import './permission' // permission control
import './utils/filter' // global filter
import './components/global.less'
import common from '@/static/js/common.js'
Vue.config.productionTip = false
Vue.prototype.common=common
// mount axios Vue.$http and this.$http
Vue.use(VueAxios)
Vue.use(VueQuillEditor)
......
src/views/authority/manageList.vue 0 → 100644
View file @ b716fbe2
<template>
<div>
<a-card style="margin-bottom:10px">
<div class="table-operator">
<a-button-group>
<a-button type='primary' icon='plus' @click="goEdit(1)">添加管理员</a-button>
</a-button-group>
</div>
<s-table
style="margin-top:10px"
ref="table"
size="default"
rowKey="GUID"
:columns="columns"
:data="loadData"
:showPagination="pagination"
>
<span slot="action" slot-scope="text, record">
<template>
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
<a>删除</a>
</a-popconfirm>
</template>
</span>
</s-table>
</a-card>
</div>
</template>
<script>
// , addMenu, updateMenu, deleteMenu
import moment from 'moment'
import { STable } from '@/components'
import { getMangeList } from '@/api/authority'
export default {
name:"authority",
components: {
STable
},
data() {
return {
labelCol: {
xs: { span: 5 }
},
wrapperCol: {
xs: { span: 17 }
},
form: this.$form.createForm(this),
columns: [
{
title: '管理员姓名',
dataIndex: 'NAME'
},
{
title: '手机号',
dataIndex: 'MOBILEPHONE'
},
{
title: '创建时间',
dataIndex: 'CREATE_DATE'
},
{
title: '角色',
dataIndex: 'ROLENAME'
},
{
title: '操作',
dataIndex: 'action',
width: '150px',
scopedSlots: { customRender: 'action' }
}
],
// listData:[],
pagination:false,
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
console.log('shujujiazai')
return getMangeList(Object.assign(parameter, this.queryParam)).then(res => {
console.log('1212121')
console.log(res)
// this.listData = res
// console.log(this.listData)
// res.data=this.listData
return res
})
},
selectedRowKeys: [],
selectedRows: [],
modalNow: 1
}
},
methods: {
}
}
</script>
<style>
.ant-card-body {
padding: 10px;
}
.ant-card-wider-padding .ant-card-body {
padding: 10px;
}
.ant-table-tbody > tr > td {
padding: 10px 10px;
}
</style>
src/views/authority/menuList.vue 0 → 100644
View file @ b716fbe2
This diff is collapsed.
src/views/authority/roleList.vue
View file @ b716fbe2
......@@ -109,7 +109,7 @@
<script>
import moment from 'moment'
import { STable } from '@/components'
import { getRoleList,addRole,getRoleDetails,modifyRoleDetails,getTreeDetails,modifyAuthority } from '@/api/authority'
import { getRoleList,addRole,getRoleDetails,modifyRoleDetails,getTreeList,modifyAuthority } from '@/api/authority'
export default {
name: 'RoleList',
......@@ -215,7 +215,8 @@ export default {
"ID":value.ID,
"NAME":value.NAME
}
getTreeDetails(treeParameters).then(res => {
console.log(treeParameters)
getTreeList(treeParameters).then(res => {
// res:cur_role_nodes=>树节点
// every_role_name:该权限节点的name
// every_role_node_ids:该节点包括的节点的id
......
src/views/storedc/Scategorymg.vue
View file @ b716fbe2
......@@ -13,7 +13,6 @@
rowKey="GUID"
:columns="columns"
:data="loadData"
showPagination="auto"
>
<span slot="action" slot-scope="text, record">
<template>
......@@ -121,10 +120,10 @@ export default {
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
return getScategorymg(Object.assign(parameter, this.queryParam)).then(res => {
res.pageSize = res._meta.perPage
res.page = res._meta.currentPage
res.totalPage = res._meta.pageCount
res.totalCount = res._meta.totalCount
// res.pageSize = res._meta.perPage
// res.page = res._meta.currentPage
// res.totalPage = res._meta.pageCount
// res.totalCount = res._meta.totalCount
// res.data = []
// res.data = res.userdepartment
return res
......
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