From afd8a1348dd49e7aa6041fca98778679b8016ba9 Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Mon, 20 Jun 2022 15:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=E5=92=8C=20=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/chexingchaxun/modelinquire.js | 2 +- .../vehiclelibraryconfiguration.vue | 4 +- .../cheliangxuqiu/cheliangxuqiuAdd.vue | 2 + .../cheliangxuqiu/modelsToChoose.vue | 3 + .../relation/vehiclelibraryconfiguration.vue | 2 +- anrui-system-ui/src/api/system/menu/index.js | 48 ++++++-------- .../src/api/system/roleAdminister/index.js | 9 +++ .../views/RoleAdminister/RoleAdminister.vue | 65 +++++++++++++++---- 8 files changed, 90 insertions(+), 45 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js index 81e0e3b0a5..3e83bd695d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js @@ -18,7 +18,7 @@ export function modelPageList(data) { export function configPageList(data) { return request({ // url: '/base/v1/basemodelconfig/configPageList', // 旧 - url: '/base/v1/basemodelconfig/getModelConfigList', + url: '/base/v1/basemodelconfig/getPcModelConfigList', method: 'post', data: data, headers: { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue index f756fa91ba..e2c98bd0e8 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue @@ -412,8 +412,8 @@ export default { configPageList(this.listQuery).then((response) => { this.listLoading = false if (response.code === '200') { - this.listQuery.total = response.data.pages - this.list = response.data.modelConfigList + this.listQuery.total = response.data.total + this.list = response.data.records } }) }, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue index b01cbb1777..bda6b2d20c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue @@ -704,7 +704,9 @@ export default { arrayList = value console.log(arrayList, 8888) this.temp.model = arrayList[0].modelName + this.temp.modelSid = arrayList[0].modelSid this.temp.configName = arrayList[0].configName + this.temp.configSid = arrayList[0].configSid this.temp.otherConfig = arrayList[0].otherConfig this.temp.guidancePrice = arrayList[0].guidedPrice }, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue index 13958ab1e5..3c4d5ed7e2 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue @@ -121,10 +121,13 @@ export default { // 勾选 handleSelectionChange(row) { const aa = [] + console.log('1122',row) row.forEach((element) => { aa.push({ modelName: element.modelName, + modelSid: element.modelSid, configName: element.configName, + configSid:element.configSid, otherConfig: element.otherConfig, guidedPrice: element.guidedPrice }) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue index 02df6ef1d1..b2d4929b6a 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue @@ -404,7 +404,7 @@ export default { this.listLoading = false if (response.code === '200') { this.listQuery.total = response.data.pages - this.list = response.data.modelConfigList + this.list = response.data.records } }) }, diff --git a/anrui-system-ui/src/api/system/menu/index.js b/anrui-system-ui/src/api/system/menu/index.js index 357511feca..9348efe515 100644 --- a/anrui-system-ui/src/api/system/menu/index.js +++ b/anrui-system-ui/src/api/system/menu/index.js @@ -3,43 +3,49 @@ import qs from 'qs' //let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY' let tokens = window.sessionStorage.getItem('token'); + //获取菜单 分页列表 export function pageList(data) { return request({ url: '/portal/v1/sysmenu/listAllVoForSource', method: 'POST', data: data, - headers: {'Content-Type': 'application/json', - 'token':tokens + headers: { + 'Content-Type': 'application/json', + 'token': tokens } }) } + // 新增保存 菜单信息 export function saveMenusInfo(data) { return request({ url: '/portal/v1/sysmenu/save', method: 'POST', data: data, - headers: {'Content-Type': 'application/json'} + headers: {'Content-Type': 'application/json'} }) } + // 修改保存 菜单信息 export function putMenusInfo(data) { return request({ - url: '/portal/v1/sysmenu/update/'+ data.sid, + url: '/portal/v1/sysmenu/update/' + data.sid, method: 'POST', data: data, - headers: {'Content-Type': 'application/json'} + headers: {'Content-Type': 'application/json'} }) } + //根据sid 删除单个 资源信息 export function delMenus(data) { return request({ url: '/portal/v1/sysmenu/delBySids/' + data.sid, method: 'get', data: qs.stringify(data), - headers: {'Content-Type': 'application/json', - 'token':tokens + headers: { + 'Content-Type': 'application/json', + 'token': tokens } }) } @@ -47,35 +53,24 @@ export function delMenus(data) { // 修改状态 export function IsEnable(data) { return request({ - url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid+'/'+data.isEnable, + url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable, method: 'POST', - /* data: qs.stringify(data),*/ - headers:{'Content-Type':'application/json', - 'token':tokens + /* data: qs.stringify(data),*/ + headers: { + 'Content-Type': 'application/json', + 'token': tokens } }) } - - - - - - - - - - - - // 获取菜单 不分页列表 export function roleList(data) { return request({ url: '/system/v1/menus/list', method: 'post', data: data, - headers: {'Content-Type': 'application/json'} + headers: {'Content-Type': 'application/json'} }) } @@ -85,7 +80,7 @@ export function menusPageList(data) { url: '/system/v1/menus/pagelist', method: 'POST', data: data, - headers: {'Content-Type': 'application/json'} + headers: {'Content-Type': 'application/json'} }) } @@ -95,12 +90,11 @@ export function menusTreelist(data) { url: '/system/v1/menus/treelist', method: 'POST', data: data, - headers: {'Content-Type': 'application/json'} + headers: {'Content-Type': 'application/json'} }) } - //根据sid 获取单个菜单 信息 export function getRoleInfo(data) { return request({ diff --git a/anrui-system-ui/src/api/system/roleAdminister/index.js b/anrui-system-ui/src/api/system/roleAdminister/index.js index 86cc020a7c..92b39231a8 100644 --- a/anrui-system-ui/src/api/system/roleAdminister/index.js +++ b/anrui-system-ui/src/api/system/roleAdminister/index.js @@ -23,6 +23,15 @@ export function postList(data){ }) } +// 获取数据字典下拉列表 +export function typeValues(data) { + return request({ + url: '/portal/v1/dictcommons/typeValues', + method: 'get', + params: data + }) +} + // 设置是否可用：isEnable：1可用，0不可用 export function setRoleEnable(data) { return request({ diff --git a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue index be4c62676e..8c762a2a6c 100644 --- a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue +++ b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue @@ -78,6 +78,19 @@ + + 组织层级 + + + + + + + 排序 @@ -174,12 +187,13 @@ + - - - + + - @@ -221,18 +240,19 @@
岗位 + @@ -190,14 +204,19 @@
编码
组织层级 + + + + + 排序 @@ -205,7 +224,7 @@
备注 +