From f0cec44ed8a2ae04c4aded56287a1caf3986978f Mon Sep 17 00:00:00 2001 From: wangmeng <1620161711@qq.com> Date: Wed, 31 Dec 2025 17:10:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/menu.js | 2 +- src/api/system/role.js | 9 ++++---- src/page/index/index.vue | 1 + src/page/index/top/top-menu.vue | 2 ++ src/store/modules/dict.js | 2 +- src/store/modules/user.js | 5 +++-- src/views/authority/apiscope.vue | 2 +- src/views/authority/datascope.vue | 2 +- src/views/authority/role.vue | 34 +++++++++++++++++-------------- src/views/firstOrder/inbound.vue | 2 +- src/views/system/dict.vue | 1 + 11 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/api/system/menu.js b/src/api/system/menu.js index 77d38b7..c4997ef 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -98,7 +98,7 @@ export const getTopMenu = () => request({ }); export const getRoutes = (topMenuId) => request({ - url: '/api/blade-system/menu/routes', + url: '/smartpark/menu/routes', method: 'get', params: { topMenuId, diff --git a/src/api/system/role.js b/src/api/system/role.js index be4d4d3..781a82f 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -13,14 +13,15 @@ export const getList = (current, size, params) => { } export const grantTree = () => { return request({ - url: '/api/blade-system/menu/grant-tree', + url: '/smartpark/menu/grant-tree', method: 'get', + }) } export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => { return request({ - url: '/api/blade-system/role/grant', + url: '/smartpark/role/grant', method: 'post', data: { roleIds, @@ -60,7 +61,7 @@ export const update = (row) => { export const getRole = (roleIds) => { return request({ - url: '/api/blade-system/menu/role-tree-keys', + url: '/smartpark/menu/role-tree-keys', method: 'get', params: { roleIds, @@ -70,7 +71,7 @@ export const getRole = (roleIds) => { export const getRoleTree = (tenantId) => { return request({ - url: '/api/blade-system/role/tree', + url: '/smartpark/role/tree', method: 'get', params: { tenantId, diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 1a6da59..3a51591 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -88,6 +88,7 @@ }, //打开菜单 openMenu(item = {}) { + console.log("itemitemitemopenMenu", item) this.$store.dispatch("GetMenu", item.id).then(data => { if (data.length !== 0) { this.$router.$avueRouter.formatRoutes(data, true); diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue index 3add0bf..29fc412 100644 --- a/src/page/index/top/top-menu.vue +++ b/src/page/index/top/top-menu.vue @@ -45,12 +45,14 @@ }, methods: { openHome(itemHome) { + this.index.openMenu(itemHome); this.$router.push({ path: this.$router.$avueRouter.getPath({name: itemHome.name, src: ''}, {}) }); }, openMenu(item) { + console.log("openMenu", item) this.index.openMenu(item) }, getMenu() { diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js index 837dbe6..75e0af7 100644 --- a/src/store/modules/dict.js +++ b/src/store/modules/dict.js @@ -10,7 +10,7 @@ const dict = { FlowRoutes({commit}) { return new Promise((resolve, reject) => { getDictionary({code: 'flow'}).then(res => { - commit('SET_FLOW_ROUTES', res.data.data); + commit('SET_FLOW_ROUTES', res.data.result || []); resolve(); }).catch(error => { reject(error) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 7121612..b40804c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -253,10 +253,11 @@ const user = { }) }, //获取系统菜单 - GetMenu({commit, dispatch}, topMenuId) { + GetMenu({ commit, dispatch }, topMenuId) { + console.log("") return new Promise(resolve => { getRoutes(topMenuId).then((res) => { - const data = res.data.data + const data = res.data.result let menu = deepClone(data); menu.forEach(ele => { addPath(ele, true); diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue index 8bd6f71..1eb6c30 100644 --- a/src/views/authority/apiscope.vue +++ b/src/views/authority/apiscope.vue @@ -506,7 +506,7 @@ onLoad(page, params = {}) { this.loading = true; getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => { - this.data = res.data.data; + this.data = res.data.result; this.loading = false; this.selectionClear(); }); diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue index 6245070..3f3ca29 100644 --- a/src/views/authority/datascope.vue +++ b/src/views/authority/datascope.vue @@ -552,7 +552,7 @@ export default { onLoad(page, params = {}) { this.loading = true; getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => { - this.data = res.data.data; + this.data = res.data.result; this.loading = false; this.selectionClear(); }); diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index f2df694..1e6a9fe 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -312,9 +312,11 @@ export default { }); }, submit() { - const menuList = this.$refs.treeMenu.getCheckedKeys(); - const dataScopeList = this.$refs.treeDataScope.getCheckedKeys(); - const apiScopeList = this.$refs.treeApiScope.getCheckedKeys(); + + const menuList = this.$refs.treeMenu ? this.$refs.treeMenu.getCheckedKeys() : []; + const dataScopeList = this.$refs.treeDataScope ? this.$refs.treeDataScope.getCheckedKeys() : []; + const apiScopeList = this.$refs.treeApiScope ? this.$refs.treeApiScope.getCheckedKeys() : []; + grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => { this.box = false; this.$message({ @@ -411,13 +413,14 @@ export default { this.dataScopeTreeObj = []; this.apiScopeTreeObj = []; grantTree().then((res) => { - this.menuGrantList = res.data.data.menu; - this.dataScopeGrantList = res.data.data.dataScope; - this.apiScopeGrantList = res.data.data.apiScope; + const data = res.data.result + this.menuGrantList = data.menu; + this.dataScopeGrantList = data.dataScope || []; + this.apiScopeGrantList = data.apiScope || []; getRole(this.ids).then((res) => { - this.menuTreeObj = res.data.data.menu; - this.dataScopeTreeObj = res.data.data.dataScope; - this.apiScopeTreeObj = res.data.data.apiScope; + this.menuTreeObj = res.data.result.menu; + this.dataScopeTreeObj = res.data.result.dataScope || []; + this.apiScopeTreeObj = res.data.result.apiScope || []; this.box = true; }); }); @@ -427,13 +430,14 @@ export default { this.dataScopeTreeObj = []; this.apiScopeTreeObj = []; grantTree().then((res) => { - this.menuGrantList = res.data.data.menu; - this.dataScopeGrantList = res.data.data.dataScope; - this.apiScopeGrantList = res.data.data.apiScope; + const data = res.data.result + this.menuGrantList = data.menu; + this.dataScopeGrantList = data.dataScope || []; + this.apiScopeGrantList = data.apiScope || []; getRole(row.id).then((res) => { - this.menuTreeObj = res.data.data.menu; - this.dataScopeTreeObj = res.data.data.dataScope; - this.apiScopeTreeObj = res.data.data.apiScope; + this.menuTreeObj = res.data.result.menu; + this.dataScopeTreeObj = res.data.result.dataScope; + this.apiScopeTreeObj = res.data.result.apiScope; this.selectionList.push(row); this.box = true; }); diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue index 7049616..b460ef5 100644 --- a/src/views/firstOrder/inbound.vue +++ b/src/views/firstOrder/inbound.vue @@ -135,7 +135,7 @@ export default { width: 180, headerAlign: "center", align: "center", - slot: "purchaseEndInfo" + slot: "purchaseEndInfo", width: 150, align: "center", formatter: (row, column) => { diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue index 1771b2f..2377cff 100644 --- a/src/views/system/dict.vue +++ b/src/views/system/dict.vue @@ -339,6 +339,7 @@ export default { }) .then(() => { this.onLoadChild(this.pageChild); + this.$refs.crudChild.refresh(); this.$message({ type: "success", message: "操作成功!" From 389abd636f34ef4332b8c7aa1400f646c7b2e688 Mon Sep 17 00:00:00 2001 From: wangmeng <1620161711@qq.com> Date: Mon, 5 Jan 2026 09:26:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/menu.js | 5 +- src/store/modules/user.js | 4 +- src/views/authority/role.vue | 186 +++++++++++++++++++---------------- 3 files changed, 107 insertions(+), 88 deletions(-) diff --git a/src/api/system/menu.js b/src/api/system/menu.js index c4997ef..69e7792 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -97,10 +97,11 @@ export const getTopMenu = () => request({ method: 'get' }); -export const getRoutes = (topMenuId) => request({ +export const getRoutes = (roleId) => request({ url: '/smartpark/menu/routes', method: 'get', params: { - topMenuId, + roleId, } }); + diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b40804c..90eb4c2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -254,9 +254,8 @@ const user = { }, //获取系统菜单 GetMenu({ commit, dispatch }, topMenuId) { - console.log("") return new Promise(resolve => { - getRoutes(topMenuId).then((res) => { + getRoutes().then((res) => { const data = res.data.result let menu = deepClone(data); menu.forEach(ele => { @@ -267,6 +266,7 @@ const user = { dispatch('GetButtons'); resolve(menu) }) + }) }, //获取系统按钮 diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index 1e6a9fe..9aaf272 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -20,7 +20,7 @@ @on-load="onLoad" >