module-menu-vue 0.0.59 → 0.0.61

package/package.json

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

package/src/assets/appSystem.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1706754879161" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4232" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M511.8 155.1l313.9 126.7-314.9 128.1-313.9-126.7 314.9-128.1m0-86.2c-3.7 0-7.3 0.7-10.8 2.1L49.8 254.6c-25.2 10.2-25.2 47.3-0.1 57.5L500.2 494c3.4 1.4 7 2.1 10.7 2.1 3.7 0 7.3-0.7 10.8-2.1l451.2-183.6c25.2-10.2 25.2-47.3 0.1-57.5L522.4 71c-3.4-1.4-7-2.1-10.6-2.1z" p-id="4233" fill="#515151"></path><path d="M510.5 715.7c-8.6 0-17.3-1.7-25.5-5L54.3 536.9c-21-8.5-31.1-32.3-22.6-53.3S64.1 452.5 85 461l425.6 171.8 426.3-173.4c20.9-8.6 44.8 1.5 53.4 22.5 8.5 21-1.5 44.9-22.5 53.4L536.3 710.7c-8.3 3.3-17 5-25.8 5z" p-id="4234" fill="#515151"></path><path d="M512.7 955.1c-8.7 0-17.3-1.7-25.5-5L56.4 776.2c-21-8.5-31.1-32.3-22.6-53.3s32.4-31.1 53.3-22.7L512.7 872 939 698.6c20.9-8.5 44.8 1.5 53.4 22.5 8.5 21-1.6 44.8-22.5 53.4L538.4 950c-8.2 3.4-17 5.1-25.7 5.1z" p-id="4235" fill="#515151"></path></svg>

package/src/components/Menu/ModuleMenu.vue

@@ -100,6 +100,9 @@ export default {
                 const routesList = rspData[0].routes
                 if (rsp.data.data) {
                     const pathList = routesList.map(item => {
+                        if (item.path.indexOf('appSystem') !== -1) {
+                            localStorage.setItem('isShowApp', true)
+                        }
                         return {
                             ...item,
                             path: item.path.indexOf('/') === -1 ? '/' + item.path : item.path
@@ -123,15 +126,7 @@ export default {
         let logoAndTitle = { logoSrc: "", title: "" };
         if (sysInfo) {
             logoAndTitle.logoSrc = sysInfo.logoSrc;
-            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;
-            }
+            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

@@ -15,6 +15,10 @@
                     <img :src="SystemManageSrc" alt="" class="menuItem" />
                     <span>系统管理</span>
                 </el-dropdown-item>
+                <el-dropdown-item v-show="isShowApp" command="app">
+                    <img :src="appSystemSrc" alt="" class="menuItem" />
+                    <span>应用系统配置</span>
+                </el-dropdown-item>
                 <el-dropdown-item command="logout">
                     <img :src="LogoutSrc" alt="" class="menuItem" />
                     <span>退出登录</span>
@@ -36,6 +40,7 @@ export default {
             PersonalCenterSrc: userMenuIcon.PersonalCenterSrc,
             MessageCenterSrc: userMenuIcon.MessageCenterSrc,
             SystemManageSrc: userMenuIcon.SystemManageSrc, 
+            appSystemSrc: userMenuIcon.appSystemSrc,
             LogoutSrc: userMenuIcon.LogoutSrc,
         }
     },
@@ -43,7 +48,11 @@ export default {
         // 是否显示系统管理菜单项
         isShowSys () {
             return this.stash === "integration" ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
-        }
+        },
+        isShowApp() {
+            const flag = localStorage.getItem('isShowApp') === 'true'
+            return  this.stash === 'integration' ? flag : false
+        },
     },
     props: {
         sysName: {
@@ -64,6 +73,9 @@ export default {
             } else if (flag === 'systerm') {
                 url = this.stash === "integration" ? '/admin-ui/bpm/manager/user-group' : '/#/admin/user/index'
                 location.href = url;
+            } else if (flag === 'app') {
+                url = '/dataadmin/#/appSystem/index'
+                location.href = url;
             } else if (flag === 'logout') {
                 this.logoutFunc()
             }
@@ -99,10 +111,11 @@ export default {
 <style scoped>
 .menuItem {
     margin-right: 10px;
-    margin-top: -3px;
+    margin-top: 10px;
+    vertical-align: sub;
 }
 .el-dropdown-menu{
-    width: 135px;
+    width: 145px;
     height: auto;
     padding: 3px 0;
 }

package/src/components/User/constant.js

@@ -3,6 +3,7 @@ export const userMenuIcon = {
     PersonalCenterSrc:require('../../assets/personalCenter.svg'),
     MessageCenterSrc:require('../../assets/messageCenter.svg'),
     SystemManageSrc:require('../../assets/systemManage.svg'),
+    appSystemSrc:require('../../assets/appSystem.svg'),
     LogoutSrc:require('../../assets/logout.png'),
 }
 export const PersonalCenterSrc = require('../../assets/personalCenter.svg');

package/src/components/Util/axios.js

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