module-menu-vue 0.3.24 → 0.3.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu-vue",
-  "version": "0.3.24",
+  "version": "0.3.26",
   "description": "城市大数据平台菜单--Vue版",
   "main": "/index.js",
   "scripts": {

package/src/components/Menu/service.js

@@ -6,6 +6,13 @@ export const getMenuList = () => {
     })
 }
 
+// 获取系统菜单列表（用于系统管理菜单判断）
+export const getAuthListMenus = () => {
+  return request('/admin-api/system/auth/list-menus', {
+    method: 'get'
+  })
+}
+
 // 是否跳转到第三方
 export const isLogoutThird = () => {
   return request('/admin/social/logoutUri');

package/src/components/User/UserInfo.vue

@@ -15,7 +15,7 @@
                     <img :src="SystemManageSrc" alt="" class="menuItem" />
                     <span>系统管理</span>
                 </el-dropdown-item>
-                <el-dropdown-item v-show="isShowApp" command="app">
+                <el-dropdown-item v-show="isShowAppFinal" command="app">
                     <img :src="appSystemSrc" alt="" class="menuItem" />
                     <span>应用系统配置</span>
                 </el-dropdown-item>
@@ -32,8 +32,8 @@ import Axios from '../Util/axios.js'
 import { userMenuIcon } from './constant.js'
 import { getUserName, getIsHaveSystemManagementPermissionFlag } from './../Util/userInfo.js'
 import { integrationLogout, getSysUrl } from './service.js'
-import {getMenuList} from '../Menu/service.js'
 import { getLoginUrl } from '../Util/permessionUtils.js';
+import {getMenuList, getAuthListMenus} from '../Menu/service.js'
 
 export default {
     name: 'UserInfo',
@@ -45,14 +45,28 @@ export default {
             SystemManageSrc: userMenuIcon.SystemManageSrc, 
             appSystemSrc: userMenuIcon.appSystemSrc,
             LogoutSrc: userMenuIcon.LogoutSrc,
-            isShowApp: false
+            isShowApp: false,
+            isShowSysIntegration: false,
+            isShowAppIntegration: false
         }
     },
     computed: {
         // 是否显示系统管理菜单项
         isShowSys () {
-            return ["integration", 'LNRD', 'HBJK'].includes(this.stash) ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
+            if (this.stash === 'integration') {
+                return this.isShowSysIntegration
+            } else if (['LNRD', 'HBJK'].includes(this.stash)) {
+                return true
+            }  else {
+                return this.isHaveSystemManagementPermission
+            }
         },
+        isShowAppFinal () {
+            if (this.stash === 'integration') {
+                return this.isShowAppIntegration
+            }
+            return this.isShowApp
+        }
     },
     props: {
         sysName: {
@@ -72,6 +86,10 @@ export default {
         if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
             this.isShowAppFunc()
         }
+        if (this.stash === 'integration') {
+            this.checkSystemMenu()
+            this.checkAppMenu()
+        }
         if (this.stash === 'GZW') {
             sessionStorage.setItem('stash', 'GZW')
         } else if (this.stash === 'PANWEI') {
@@ -81,6 +99,40 @@ export default {
         }
     },
     methods: {
+        hasMenu(menuList, targetId, targetName) {
+            for (const item of menuList) {
+                if (item.id === targetId || item.name === targetName) {
+                    return true
+                }
+                if (item.children && item.children.length > 0) {
+                    if (this.hasMenu(item.children, targetId, targetName)) {
+                        return true
+                    }
+                }
+            }
+            return false
+        },
+        async checkSystemMenu() {
+            try {
+                const rsp = await getAuthListMenus()
+                const menuList = rsp.data.data || []
+                this.isShowSysIntegration = this.hasMenu(menuList, 1, '系统管理')
+            } catch (e) {
+                console.error('获取系统菜单失败:', e)
+                this.isShowSysIntegration = false
+            }
+        },
+        async checkAppMenu() {
+            try {
+                const rsp = await getMenuList()
+                const menuList = rsp.data.data[0].routes || []
+                console.log("menuList===", menuList)
+                this.isShowAppIntegration = this.hasMenu(menuList, 7500, '应用系统配置')
+            } catch (e) {
+                console.error('获取用户菜单失败:', e)
+                this.isShowAppIntegration = false
+            }
+        },
         async isShowAppFunc() {
             const rsp = await getMenuList()
             const rspData = rsp.data.data
@@ -111,7 +163,7 @@ export default {
                 }
                 location.href = url;
             } else if (flag === 'systerm') {
-                if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
+                if (['LNRD', 'HBJK'].includes(this.stash)) {
                     // 查询 系统管理 需要跳转的页面
                     getSysUrl().then(rsp => {
                         const data = rsp.data.data
@@ -121,6 +173,8 @@ export default {
                     }).catch(e => {
                         console.error('getSysUrl 接口异常: ', e)
                     })
+                } else if (this.stash === 'integration'){
+                    location.href = '/admin-ui/system/menu'
                 } else {
                     const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
                     let systemPath = ''
@@ -231,4 +285,4 @@ export default {
 .el-popper{
     margin-top: -2px !important;
 }
-</style>
+</style>

package/vue.config.js

@@ -1,4 +1,4 @@
-const url = 'https://192.168.108.203:31950'
+const url = 'https://192.168.108.81:31950'
 module.exports = {
   lintOnSave: true,
   productionSourceMap: false,
@@ -18,6 +18,7 @@ module.exports = {
         target: url,
         ws: false, // 需要websocket 开启
         changOrigin: true,  //允许跨域
+        secure: false,
         pathRewrite: {
           "^/": "/",
         },
@@ -25,6 +26,7 @@ module.exports = {
       '/admin-api': {
         target: url,
         changeOrigin: true,
+        secure: false,
         pathRewrite: { '^': '' },
       }
       // 3.5 以后不需要再配置