module-menu-vue 0.0.55 → 0.0.57

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -87,8 +87,8 @@ 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 () {
@@ -119,7 +119,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/User/UserInfo.vue

@@ -27,7 +27,7 @@
 import Axios from '../Util/axios.js'
 import { userMenuIcon } from './constant.js'
 import { getUserName } from './../Util/userInfo.js'
-// import { integrationLogout } from './service.js'
+import { integrationLogout } from './service.js'
 export default {
     name: 'UserInfo',
     data () {
@@ -60,24 +60,24 @@ export default {
             let url = ''
             if (flag === 'single') {
                 url = this.stash === "integration" ? '/admin-ui/user/profile' : '/#/info/index'
+                location.href = url;
             } else if (flag === 'systerm') {
                 url = this.stash === "integration" ? '/admin-ui/bpm/manager/user-group' : '/#/admin/user/index'
+                location.href = url;
             } else if (flag === 'logout') {
                 this.logoutFunc()
             }
-            location.href = url;
         },
         async logoutFunc () {
             console.log('开始调用退出接口...')
             if (this.stash === 'integration') {
-                this.$emit('logout')
+                await integrationLogout();
+                this.logoutUrl()
             } else {
                 const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : '/auth/token/logout'
                 const method = this.stash === 'integration'? 'post' : 'delete'
                 Axios(url, method).then(() => {
-                    localStorage.clear();
-                    sessionStorage.clear();
-                    location.href = this.stash === "integration" ? '/admin-ui/login' : '/#/login'
+                    this.logoutUrl();
                 })
                 .catch((err) => {
                     console.log('err: ', err)