更改接口字段名称；
This commit is contained in:
terrfly
parent
b1df0968b1
commit
6397a3553a
|
|
@ -115,8 +115,8 @@ const api = {
|
|||
export default api
|
||||
|
||||
/** 获取权限树状结构图 **/
|
||||
export function getEntTree (system) {
|
||||
return request.request({ url: '/api/sysEnts/showTree?system=' + system, method: 'GET' })
|
||||
export function getEntTree (sysType) {
|
||||
return request.request({ url: '/api/sysEnts/showTree?sysType=' + sysType, method: 'GET' })
|
||||
}
|
||||
|
||||
/** 更新用户角色信息 */
|
||||
|
|
@ -266,10 +266,10 @@ export function getConfigs (parameter) {
|
|||
})
|
||||
}
|
||||
|
||||
export function getEntBySystem (entId, system) {
|
||||
export function getEntBySysType (entId, sysType) {
|
||||
return request.request({
|
||||
url: '/api/sysEnts/bySystem',
|
||||
url: '/api/sysEnts/bySysType',
|
||||
method: 'GET',
|
||||
params: { entId: entId, system: system }
|
||||
params: { entId: entId, sysType: sysType }
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ const user = {
|
|||
isAdmin: '', // 是否是超级管理员
|
||||
loginUsername: '', // 登录用户名
|
||||
state: '', // 用户状态
|
||||
system: '', // 所属系统
|
||||
sysType: '', // 所属系统
|
||||
telphone: '', // 手机号
|
||||
sex: '' // 性别
|
||||
},
|
||||
|
|
@ -36,7 +36,7 @@ const user = {
|
|||
state.isAdmin = userInfo.isAdmin // 是否是超级管理员
|
||||
state.loginUsername = userInfo.loginUsername // 登录用户名
|
||||
state.state = userInfo.state // 用户状态
|
||||
state.system = userInfo.system // 所属系统
|
||||
state.sysType = userInfo.sysType // 所属系统
|
||||
state.telphone = userInfo.telphone // 手机号
|
||||
state.sex = userInfo.sex // 性别
|
||||
}
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@
|
|||
<a-col :span="24">
|
||||
<a-descriptions>
|
||||
<a-descriptions-item label="所属系统">
|
||||
{{ $store.state.user.system==="MGR"?"运营平台": $store.state.user.system==="MCH"?"商户系统":"未知" }}
|
||||
{{ $store.state.user.sysType==="MGR"?"运营平台": $store.state.user.sysType==="MCH"?"商户系统":"未知" }}
|
||||
</a-descriptions-item>
|
||||
</a-descriptions>
|
||||
</a-col>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { API_URL_ENT_LIST, req, getEntBySystem } from '@/api/manage'
|
||||
import { API_URL_ENT_LIST, req, getEntBySysType } from '@/api/manage'
|
||||
export default {
|
||||
|
||||
props: {
|
||||
|
|
@ -50,7 +50,7 @@ export default {
|
|||
isShow: false, // 是否显示弹层/抽屉
|
||||
saveObject: {}, // 数据对象
|
||||
recordId: null, // 更新对象ID
|
||||
system: 'MGR', // 菜单类型
|
||||
sysType: 'MGR', // 菜单类型
|
||||
rules: {
|
||||
entName: [
|
||||
{ required: true, message: '请输入资源名称', trigger: 'blur' }
|
||||
|
|
@ -61,9 +61,9 @@ export default {
|
|||
created () {
|
||||
},
|
||||
methods: {
|
||||
show: function (recordId, system) { // 弹层打开事件
|
||||
show: function (recordId, sysType) { // 弹层打开事件
|
||||
this.isAdd = !recordId
|
||||
this.system = system
|
||||
this.sysType = sysType
|
||||
this.saveObject = {} // 数据清空
|
||||
this.confirmLoading = false // 关闭loading
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ export default {
|
|||
const that = this
|
||||
if (!this.isAdd) { // 修改信息 延迟展示弹层
|
||||
that.recordId = recordId
|
||||
getEntBySystem(recordId, system).then(res => { that.saveObject = res })
|
||||
getEntBySysType(recordId, sysType).then(res => { that.saveObject = res })
|
||||
this.isShow = true
|
||||
} else {
|
||||
that.isShow = true // 立马展示弹层信息
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ export default {
|
|||
|
||||
updateState: function (recordId, state) {
|
||||
const that = this
|
||||
return reqLoad.updateById(API_URL_ENT_LIST, recordId, { state: state, system: that.querySysType }).then(res => {
|
||||
return reqLoad.updateById(API_URL_ENT_LIST, recordId, { state: state, sysType: that.querySysType }).then(res => {
|
||||
that.$message.success('更新成功')
|
||||
that.refTable() // 刷新页面
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<jeepay-text-up :placeholder="'用户ID'" :msg="searchData.userId" v-model="searchData.userId" />
|
||||
<jeepay-text-up :placeholder="'用户名'" :msg="searchData.userName" v-model="searchData.userName" />
|
||||
<a-form-item label="" class="table-head-layout">
|
||||
<a-select v-model="searchData.system" placeholder="所属系统" default-value="">
|
||||
<a-select v-model="searchData.sysType" placeholder="所属系统" default-value="">
|
||||
<a-select-option value="">全部</a-select-option>
|
||||
<a-select-option value="MGR">运营平台</a-select-option>
|
||||
<a-select-option value="MCH">商户系统</a-select-option>
|
||||
|
|
@ -48,9 +48,9 @@
|
|||
:scrollX="1200"
|
||||
>
|
||||
<template slot="userNameSlot" slot-scope="{record}"><b>{{ record.userName }}</b></template> <!-- 自定义插槽 -->
|
||||
<template slot="systemSlot" slot-scope="{record}">
|
||||
<a-tag :key="record.system" :color="record.system === 'MGR'?'green':record.system === 'MCH'?'geekblue':'loser'">
|
||||
{{ record.system === 'MGR'?'运营平台':record.system === 'MCH'?'商户系统':'其他' }}
|
||||
<template slot="sysTypeSlot" slot-scope="{record}">
|
||||
<a-tag :key="record.sysType" :color="record.sysType === 'MGR'?'green':record.sysType === 'MCH'?'geekblue':'loser'">
|
||||
{{ record.sysType === 'MGR'?'运营平台':record.sysType === 'MCH'?'商户系统':'其他' }}
|
||||
</a-tag>
|
||||
</template>
|
||||
<template slot="opSlot" slot-scope="{record}"> <!-- 操作列插槽 -->
|
||||
|
|
@ -97,8 +97,8 @@
|
|||
<a-col :sm="12">
|
||||
<a-descriptions>
|
||||
<a-descriptions-item label="所属系统">
|
||||
<a-tag :key="detailData.system" :color="detailData.system === 'MGR'?'green':detailData.system === 'MCH'?'geekblue':'loser'">
|
||||
{{ detailData.system === 'MGR'?'运营平台':detailData.system === 'MCH'?'商户系统':'其他' }}
|
||||
<a-tag :key="detailData.sysType" :color="detailData.sysType === 'MGR'?'green':detailData.sysType === 'MCH'?'geekblue':'loser'">
|
||||
{{ detailData.sysType === 'MGR'?'运营平台':detailData.sysType === 'MCH'?'商户系统':'其他' }}
|
||||
</a-tag>
|
||||
</a-descriptions-item>
|
||||
</a-descriptions>
|
||||
|
|
@ -169,7 +169,7 @@ const tableColumns = [
|
|||
{ key: 'userName', title: '用户名', fixed: 'left', scopedSlots: { customRender: 'userNameSlot' } },
|
||||
{ key: 'userId', title: '用户ID', dataIndex: 'userId' },
|
||||
{ key: 'userIp', title: '用户IP', dataIndex: 'userIp' },
|
||||
{ key: 'system', title: '所属系统', scopedSlots: { customRender: 'systemSlot' } },
|
||||
{ key: 'sysType', title: '所属系统', scopedSlots: { customRender: 'sysTypeSlot' } },
|
||||
{ key: 'methodRemark', title: '操作描述', ellipsis: true, dataIndex: 'methodRemark' },
|
||||
{ key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
|
||||
{ key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
|
||||
|
|
|
|||
|
|
@ -103,17 +103,8 @@ const api = {
|
|||
export default api
|
||||
|
||||
/** 获取权限树状结构图 **/
|
||||
export function getEntTree (system) {
|
||||
return request.request({ url: '/api/sysEnts/showTree?system=' + system, method: 'GET' })
|
||||
}
|
||||
|
||||
/** 更新用户角色信息 */
|
||||
export function uSysRoleEntRela (sysRoleId, entIdList) {
|
||||
return request.request({
|
||||
url: 'api/sysRoleEntRelas/relas/' + sysRoleId,
|
||||
method: 'POST',
|
||||
data: { entIdListStr: JSON.stringify(entIdList) }
|
||||
})
|
||||
export function getEntTree () {
|
||||
return request.request({ url: '/api/sysEnts/showTree', method: 'GET' })
|
||||
}
|
||||
|
||||
/** 更新用户角色信息 */
|
||||
|
|
@ -133,55 +124,6 @@ export function getRoleList (parameter) {
|
|||
})
|
||||
}
|
||||
|
||||
export function getServiceList (parameter) {
|
||||
return request({
|
||||
url: api.service,
|
||||
method: 'get',
|
||||
params: parameter
|
||||
})
|
||||
}
|
||||
|
||||
export function getPermissions (parameter) {
|
||||
return request({
|
||||
url: api.permissionNoPager,
|
||||
method: 'get',
|
||||
params: parameter
|
||||
})
|
||||
}
|
||||
|
||||
export function getOrgTree (parameter) {
|
||||
return request({
|
||||
url: api.orgTree,
|
||||
method: 'get',
|
||||
params: parameter
|
||||
})
|
||||
}
|
||||
|
||||
// id == 0 add post
|
||||
// id != 0 update put
|
||||
export function saveService (parameter) {
|
||||
return request({
|
||||
url: api.service,
|
||||
method: parameter.id === 0 ? 'post' : 'put',
|
||||
data: parameter
|
||||
})
|
||||
}
|
||||
|
||||
export function saveSub (sub) {
|
||||
return request({
|
||||
url: '/sub',
|
||||
method: sub.id === 0 ? 'post' : 'put',
|
||||
data: sub
|
||||
})
|
||||
}
|
||||
|
||||
export function getIsvPayConfigUnique (infoId, ifCode) {
|
||||
return request.request({
|
||||
url: '/api/isv/payConfigs/' + infoId + '/' + ifCode,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
/** 根据支付接口查询支付参数配置 **/
|
||||
export function getMcgPayConfigUnique (ifCode) {
|
||||
return request.request({
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ const user = {
|
|||
isAdmin: '', // 是否是超级管理员
|
||||
loginUsername: '', // 登录用户名
|
||||
state: '', // 用户状态
|
||||
system: '', // 所属系统
|
||||
sysType: '', // 所属系统
|
||||
telphone: '' // 手机号
|
||||
},
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ const user = {
|
|||
state.isAdmin = userInfo.isAdmin // 是否是超级管理员
|
||||
state.loginUsername = userInfo.loginUsername // 登录用户名
|
||||
state.state = userInfo.state // 用户状态
|
||||
state.system = userInfo.system // 所属系统
|
||||
state.sysType = userInfo.sysType // 所属系统
|
||||
state.telphone = userInfo.telphone // 手机号
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ export default {
|
|||
|
||||
that.recordId = recordId
|
||||
// 获取全部权限的树状结构
|
||||
getEntTree('MCH').then(res => {
|
||||
getEntTree().then(res => {
|
||||
that.treeData = res
|
||||
|
||||
// 存储所有的菜单权限集合
|
||||
|
|
|
|||
Loading…
Reference in New Issue