module-menu-vue 0.0.56 → 0.0.58

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -87,23 +87,27 @@ export default {
   },
   methods: {
     toHref () {
-        if (this.sysName === 'admin') {
-            location.href = this.stash === "integration" ? '/dataadmin/#/datasource' : '/#/admin/user/index'
+        if (this.sysName === 'admin' && this.stash !== "integration") {
+            location.href = '/#/admin/user/index' 
         }
     },
     async getSessionMenu () {
         // 一体化
         if (this.stash === "integration") {
             const rsp = await getMenuList()
-            if (rsp.data.data) {
-                const pathList = rsp.data.data.map(item => {
-                    return {
-                        ...item,
-                        path: item.path.indexOf('/') === -1 ? '/' + item.path : item.path
-                    }
-                })
-                this.sessionMenu = [...pathList]
-                this.getNewMenuList();
+            const rspData = rsp.data.data
+            if (rspData && rspData.length > 0) {
+                const routesList = rspData[0].routes
+                if (rsp.data.data) {
+                    const pathList = routesList.map(item => {
+                        return {
+                            ...item,
+                            path: item.path.indexOf('/') === -1 ? '/' + item.path : item.path
+                        }
+                    })
+                    this.sessionMenu = [...pathList]
+                    this.getNewMenuList();
+                }
             }
         } else {
             // 轻量级
@@ -119,7 +123,15 @@ export default {
         let logoAndTitle = { logoSrc: "", title: "" };
         if (sysInfo) {
             logoAndTitle.logoSrc = sysInfo.logoSrc;
-            logoAndTitle.title = sysInfo.title;
+            if (this.sysName === 'admin') {
+                if (this.stash === "integration") {
+                    // logoAndTitle.title = location.href.indexOf('/appSystem/index') !== -1 ? '应用系统管理' : '数据源管理'
+                } else {
+                    logoAndTitle.title = sysInfo.title;
+                }
+            } else {
+                logoAndTitle.title = sysInfo.title;
+            }
         }
         return logoAndTitle;
     },

package/src/components/Menu/constant.js

@@ -177,7 +177,7 @@ export const sysNameMap = [
     },
     {
         sysName: 'admin',
-        title: token ? '数据源管理' : '系统管理',
+        title: token ? '' : '系统管理',
         logoSrc: require('../../assets/admin_logo.svg'),
     },
     // {

package/src/components/Menu/menu.css

@@ -40,9 +40,9 @@
   color: #4091f7;
 }
 .childMenu {
-  width: 30%;
+  width: 27%;
   display: inline-block;
-  font-size: 13px;
+  font-size: 14px;
 }
 .middle {
   vertical-align: middle;

package/src/components/Menu/service.js

@@ -1,6 +1,6 @@
 import request from 'axios'
 export const getMenuList = () => {
-    return request(`/admin-api/system/user/getUserMenusList`, {
+    return request(`/admin-api/system/user/get-user-menu-List?menuName=数据平台`, {
       method: 'get'
     })
 }

package/src/components/User/UserInfo.vue

@@ -71,7 +71,6 @@ export default {
         async logoutFunc () {
             console.log('开始调用退出接口...')
             if (this.stash === 'integration') {
-                // this.$emit('logout')
                 await integrationLogout();
                 this.logoutUrl()
             } else {

package/src/components/Util/axios.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import getStore from './userInfo';
 import { checkToken } from './permessionUtils';
-let tokenValue = '05774990fd19482ab86e90a46b88abf0';
+let tokenValue = '39e212bf726b439180dadb352a57a8c9';
 axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {