module-menu-vue 0.0.65 → 0.0.67

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -1,229 +1,229 @@
-<template>
-    <div>
-        <div class='menuPopupAndTitle'>
-            <div class='menuIcon' @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
-                <img class="menuIcon_img" :src="menuIconSrc" />
-            </div>
-            <div class="menu_title_content" v-show="showCollapse" @click="toHref()">
-                <img class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" />
-                <span class="menu_title">{{getLogoAndTitle().title}}</span>
-            </div>
-        </div>
-        <div class='menu_list_content' :style="{ display: showMenuList ? 'block' : 'none' }" @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
-            <div v-for="(item, index) in menuList" :key="item.path">
-              <div :key="item.name" class="cardLine" :style="{height: item.children.length > 3 ? '90px' : ''}">
-                <div class='leftMenu'
-                    :style="{
-                      height: item.children.length > 3 ? '96px' : '70px',
-                      lineHeight: item.children.length > 3 ? '45px' : '70px',
-                    }">
-                    <img :src="item.url" class="middle" />
-                    <span class="middle textPad" @click="toHomePage(index)">{{item.name}}</span>
-                </div>
-                <div class='rightMenu'
-                    :style="{
-                        height: item.children.length > 3 ? '96px' : '70px',
-                        lineHeight: item.children.length > 3 ? '45px' : '70px',
-                        borderBottom: index === menuList.length - 1 ? '0px' : '1px solid #E9E9E9',
-                    }">
-                    <span v-for="child in item.children" :key="child.url">
-                        <span :key="child.childName">
-                            <img :src="child.url" class="middle iconPad" />
-                            <span class='childMenu textPad middle' @click="toModulePage(child.childName)">{{child.childName}}</span>
-                        </span>
-                    </span>
-                </div>
-            </div>
-            </div>
-        </div>
-    </div >
-</template>
-
-<script>
-import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constant.js'
-import './menu.css'
-import {getMenuList} from './service.js'
-export default {
-  name: 'ModuleMenu',
-  props: {
-    sysName: {
-        type: String,
-        default: 'admin'
-    },
-    collapse: {
-        type: Boolean,
-        default: true,
-    },
-    stash: {
-        type: String,
-        default: ''
-    }
-  },
-  watch: {
-    collapse: {
-      handler: function (newVal, oldVal) {
-        console.log('---', newVal, oldVal)
-        this.showCollapse = newVal
-      },
-      deep: true
-    }
-  },
-  data () {
-    return {
-      showMenuList: false,
-      menuIconSrc: menuIconSrc,
-      menuList: [],
-      sessionMenu: [],
-      menuListInit: menuListInit,
-      sysNameMap: sysNameMap,
-      showCollapse: true,
-    }
-  },
-  created () {
-    this.getSessionMenu();
-    if (this.stash !== "integration") {
-        this.getNewMenuList();
-    }
-  },
-  methods: {
-    toHref () {
-        if (this.sysName === 'admin' && this.stash !== "integration") {
-            location.href = '/#/admin/user/index' 
-        }
-    },
-    async getSessionMenu () {
-        // 一体化
-        if (this.stash === "integration") {
-            const rsp = await getMenuList()
-            const rspData = rsp.data.data
-            if (rspData && rspData.length > 0) {
-                const routesList = rspData[0].routes
-                if (rsp.data.data) {
-                    const pathList = routesList.map(item => {
-                        if (item.path.indexOf('appSystem') !== -1) {
-                            let appSysMenuList = []
-                            let appSysNameList = []
-                            item.routes.forEach(obj => {
-                                appSysMenuList.push('/' + obj.path)
-                                appSysNameList.push(obj.name)
-                            }) || []
-                            localStorage.setItem('appSysMenuList', JSON.stringify(appSysMenuList))
-                            localStorage.setItem('appSysNameList', JSON.stringify(appSysNameList))
-                        }
-                        return {
-                            ...item,
-                            path: item.path.indexOf('/') === -1 ? '/' + item.path : item.path
-                        }
-                    })
-                    this.sessionMenu = [...pathList]
-                    this.getNewMenuList();
-                }
-            }
-        } else {
-            // 轻量级
-            const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
-            if (menuObj) {
-                this.sessionMenu = [...menuObj.content]
-            }
-        }
-    },
-    // 获取系统logo及title
-    getLogoAndTitle () {
-        let sysInfo = this.sysNameMap.find(item  => item.sysName === this.sysName);
-        let logoAndTitle = { logoSrc: "", title: "" };
-        if (sysInfo) {
-            logoAndTitle.logoSrc = sysInfo.logoSrc;
-            logoAndTitle.title = sysInfo.title;
-        }
-        return logoAndTitle;
-    },
-    // 跳转各个模块
-    toModulePage (nameStr)  {
-        console.log('nameStr', nameStr)
-        let thirdPartyServiceJumpPath = ""; // 第三方服务跳转路径
-        switch (nameStr) {
-            case "数据集成":
-                thirdPartyServiceJumpPath = "/datacollect/";
-                break;
-            case "数据治理":
-                thirdPartyServiceJumpPath = "/datamanage/";
-                break;
-            case "元数据管理":
-                thirdPartyServiceJumpPath = "/metadata/";
-                break;
-            case "数据质量":
-                thirdPartyServiceJumpPath = "/quality/";
-                break;
-            case "离线开发":
-                thirdPartyServiceJumpPath = "/datadev/";
-                break;
-            case "实时开发":
-                thirdPartyServiceJumpPath = "/dataanalytic/";
-                break;
-            case "数据服务":
-                thirdPartyServiceJumpPath = "/dataservice/";
-                break;
-            case "数据资产":
-                thirdPartyServiceJumpPath = "/dataasset/";
-                break;
-            case "数据共享":
-                thirdPartyServiceJumpPath = "/datasharing/";
-                break;
-            case "运维中心":
-                thirdPartyServiceJumpPath = "/operate/";
-                break;
-            case "消息中心":
-                thirdPartyServiceJumpPath = "/alert/";
-                break;
-            case "数据安全":
-                thirdPartyServiceJumpPath = "/datasecurity/";
-                break;
-            case "目录管理":
-                thirdPartyServiceJumpPath = "/admin-ui/catalog/menuClassify/list";
-                break;
-            case "资源管理":
-                thirdPartyServiceJumpPath = "/admin-ui/resource/tableResource/list";
-                break;
-            case "供需对接":
-                thirdPartyServiceJumpPath = '/admin-ui/supply-and-demand-docking/dataRequirement/propose/list';
-                break;
-            default:
-                break;
-        }
-        location.href = thirdPartyServiceJumpPath
-    },
-    // 跳转首页
-    toHomePage (index)  {
-        if (index === 0) {
-            location.href = this.stash === "integration" ? '/dataadmin/#/index' : '/#/index'
-        }
-    },
-    getNewMenuList () {
-        let newMenuList = [...this.menuListInit];
-        if (this.sessionMenu) {
-            const pathList = this.sessionMenu.map(item  => item.path)
-            // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)
-            for (let index = newMenuList.length - 1; index >= 0; index--) {
-                const menuItem = newMenuList[index]
-                for (let index_ch = menuItem.children.length - 1; index_ch >= 0; index_ch--) {
-                    const child = menuItem.children[index_ch]
-                    if (!pathList.includes(child.path)) {
-                        newMenuList[index].children.splice(index_ch, 1)
-                    }
-                }
-                if (menuItem.children.length === 0 && menuItem.name !== '首页') {
-                    newMenuList.splice(index, 1)
-                }
-            }
-        }
-        this.menuList = [...newMenuList];
-    },
-  }
-}
-</script>
-<style scoped>
-.iconPad{
-    width: 15px;
-    height: 15px;
-}
-</style>
+<template>
+    <div>
+        <div class='menuPopupAndTitle'>
+            <div class='menuIcon' @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
+                <img class="menuIcon_img" :src="menuIconSrc" />
+            </div>
+            <div class="menu_title_content" v-show="showCollapse" @click="toHref()">
+                <img class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" />
+                <span class="menu_title">{{getLogoAndTitle().title}}</span>
+            </div>
+        </div>
+        <div class='menu_list_content' :style="{ display: showMenuList ? 'block' : 'none' }" @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
+            <div v-for="(item, index) in menuList" :key="item.path">
+              <div :key="item.name" class="cardLine" :style="{height: item.children.length > 3 ? '90px' : ''}">
+                <div class='leftMenu'
+                    :style="{
+                      height: item.children.length > 3 ? '96px' : '70px',
+                      lineHeight: item.children.length > 3 ? '45px' : '70px',
+                    }">
+                    <img :src="item.url" class="middle" />
+                    <span class="middle textPad" @click="toHomePage(index)">{{item.name}}</span>
+                </div>
+                <div class='rightMenu'
+                    :style="{
+                        height: item.children.length > 3 ? '96px' : '70px',
+                        lineHeight: item.children.length > 3 ? '45px' : '70px',
+                        borderBottom: index === menuList.length - 1 ? '0px' : '1px solid #E9E9E9',
+                    }">
+                    <span v-for="child in item.children" :key="child.url">
+                        <span :key="child.childName">
+                            <img :src="child.url" class="middle iconPad" />
+                            <span class='childMenu textPad middle' @click="toModulePage(child.childName)">{{child.childName}}</span>
+                        </span>
+                    </span>
+                </div>
+            </div>
+            </div>
+        </div>
+    </div >
+</template>
+
+<script>
+import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constant.js'
+import './menu.css'
+import {getMenuList} from './service.js'
+export default {
+  name: 'ModuleMenu',
+  props: {
+    sysName: {
+        type: String,
+        default: 'admin'
+    },
+    collapse: {
+        type: Boolean,
+        default: true,
+    },
+    stash: {
+        type: String,
+        default: ''
+    }
+  },
+  watch: {
+    collapse: {
+      handler: function (newVal, oldVal) {
+        console.log('---', newVal, oldVal)
+        this.showCollapse = newVal
+      },
+      deep: true
+    }
+  },
+  data () {
+    return {
+      showMenuList: false,
+      menuIconSrc: menuIconSrc,
+      menuList: [],
+      sessionMenu: [],
+      menuListInit: menuListInit,
+      sysNameMap: sysNameMap,
+      showCollapse: true,
+    }
+  },
+  created () {
+    this.getSessionMenu();
+    if (this.stash !== "integration") {
+        this.getNewMenuList();
+    }
+  },
+  methods: {
+    toHref () {
+        if (this.sysName === 'admin' && this.stash !== "integration") {
+            location.href = '/#/admin/user/index' 
+        }
+    },
+    async getSessionMenu () {
+        // 一体化
+        if (this.stash === "integration") {
+            const rsp = await getMenuList()
+            const rspData = rsp.data.data
+            if (rspData && rspData.length > 0) {
+                const routesList = rspData[0].routes
+                if (rsp.data.data) {
+                    const pathList = routesList.map(item => {
+                        if (item.path.indexOf('appSystem') !== -1) {
+                            let appSysMenuList = []
+                            let appSysNameList = []
+                            item.routes.forEach(obj => {
+                                appSysMenuList.push('/' + obj.path)
+                                appSysNameList.push(obj.name)
+                            }) || []
+                            localStorage.setItem('appSysMenuList', JSON.stringify(appSysMenuList))
+                            localStorage.setItem('appSysNameList', JSON.stringify(appSysNameList))
+                        }
+                        return {
+                            ...item,
+                            path: item.path.indexOf('/') === -1 ? '/' + item.path : item.path
+                        }
+                    })
+                    this.sessionMenu = [...pathList]
+                    this.getNewMenuList();
+                }
+            }
+        } else {
+            // 轻量级
+            const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
+            if (menuObj) {
+                this.sessionMenu = [...menuObj.content]
+            }
+        }
+    },
+    // 获取系统logo及title
+    getLogoAndTitle () {
+        let sysInfo = this.sysNameMap.find(item  => item.sysName === this.sysName);
+        let logoAndTitle = { logoSrc: "", title: "" };
+        if (sysInfo) {
+            logoAndTitle.logoSrc = sysInfo.logoSrc;
+            logoAndTitle.title = sysInfo.title;
+        }
+        return logoAndTitle;
+    },
+    // 跳转各个模块
+    toModulePage (nameStr)  {
+        console.log('nameStr', nameStr)
+        let thirdPartyServiceJumpPath = ""; // 第三方服务跳转路径
+        switch (nameStr) {
+            case "数据集成":
+                thirdPartyServiceJumpPath = "/datacollect/";
+                break;
+            case "数据治理":
+                thirdPartyServiceJumpPath = "/datamanage/";
+                break;
+            case "元数据管理":
+                thirdPartyServiceJumpPath = "/metadata/";
+                break;
+            case "数据质量":
+                thirdPartyServiceJumpPath = "/quality/";
+                break;
+            case "离线开发":
+                thirdPartyServiceJumpPath = "/datadev/";
+                break;
+            case "实时开发":
+                thirdPartyServiceJumpPath = "/dataanalytic/";
+                break;
+            case "数据服务":
+                thirdPartyServiceJumpPath = "/dataservice/";
+                break;
+            case "数据资产":
+                thirdPartyServiceJumpPath = "/dataasset/";
+                break;
+            case "数据共享":
+                thirdPartyServiceJumpPath = "/datasharing/";
+                break;
+            case "运维中心":
+                thirdPartyServiceJumpPath = "/operate/";
+                break;
+            case "消息中心":
+                thirdPartyServiceJumpPath = "/alert/";
+                break;
+            case "数据安全":
+                thirdPartyServiceJumpPath = "/datasecurity/";
+                break;
+            case "目录管理":
+                thirdPartyServiceJumpPath = "/admin-ui/catalog/menuClassify/list";
+                break;
+            case "资源管理":
+                thirdPartyServiceJumpPath = "/admin-ui/resource/tableResource/list";
+                break;
+            case "供需对接":
+                thirdPartyServiceJumpPath = '/admin-ui/supply-and-demand-docking/dataRequirement/propose/list';
+                break;
+            default:
+                break;
+        }
+        location.href = thirdPartyServiceJumpPath
+    },
+    // 跳转首页
+    toHomePage (index)  {
+        if (index === 0) {
+            location.href = this.stash === "integration" ? '/dataadmin/#/index' : '/#/index'
+        }
+    },
+    getNewMenuList () {
+        let newMenuList = [...this.menuListInit];
+        if (this.sessionMenu) {
+            const pathList = this.sessionMenu.map(item  => item.path)
+            // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)
+            for (let index = newMenuList.length - 1; index >= 0; index--) {
+                const menuItem = newMenuList[index]
+                for (let index_ch = menuItem.children.length - 1; index_ch >= 0; index_ch--) {
+                    const child = menuItem.children[index_ch]
+                    if (!pathList.includes(child.path)) {
+                        newMenuList[index].children.splice(index_ch, 1)
+                    }
+                }
+                if (menuItem.children.length === 0 && menuItem.name !== '首页') {
+                    newMenuList.splice(index, 1)
+                }
+            }
+        }
+        this.menuList = [...newMenuList];
+    },
+  }
+}
+</script>
+<style scoped>
+.iconPad{
+    width: 15px;
+    height: 15px;
+}
+</style>

package/src/components/Tenant/service.js

@@ -7,7 +7,11 @@ export const getTenantList = () => {
 }
 // 更改后台租户id
 export const changeTenantId = (params) => {
-  return request(`/admin-api/system/auth/setRedisTokenOfTenant?tenantId=${params.id}&token=${params.token}`, {
-    method: 'get'
+  return request(`/admin-api/system/auth/setRedisTokenOfTenant`, {
+    method: 'post',
+    data: {
+      tenantId: params.id,
+      token: params.token
+    }
   })
 }

package/src/components/User/UserInfo.vue

@@ -9,7 +9,7 @@
             <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="single">
                     <img :src="PersonalCenterSrc" alt="" class="menuItem" />
-                    <span>个人中心</span>
+                    <span>{{stash === "integration" ? '用户中心' : '个人中心'}}</span>
                 </el-dropdown-item>
                 <el-dropdown-item v-show="isShowSys" command="systerm">
                     <img :src="SystemManageSrc" alt="" class="menuItem" />
@@ -85,7 +85,7 @@ export default {
         handleClickmenu (flag){
             let url = ''
             if (flag === 'single') {
-                url = this.stash === "integration" ? '/admin-ui/user/profile' : '/#/info/index'
+                url = this.stash === "integration" ? '/admin-ui/data-share-portal/personal/info' : '/#/info/index'
                 location.href = url;
             } else if (flag === 'systerm') {
                 url = this.stash === "integration" ? '/admin-ui/bpm/manager/user-group' : '/#/admin/user/index'

package/vue.config.js

@@ -1,38 +1,38 @@
-/**npm 
- * 配置参考:
- * https://cli.vuejs.org/zh/config/
- */
-const url = 'http://10.136.106.131:31950'
-module.exports = {
-  lintOnSave: true,
-  productionSourceMap: false,
-  css: {
-    // 忽略 CSS order 顺序警告
-    extract: { ignoreOrder: true },
-    // 查看CSS属于哪个css文件
-    sourceMap: process.env.NODE_ENV === "development",
-  },
-  // 配置转发代理
-  devServer: {
-    // disableHostCheck: true,
-    port: 8080,
-    proxy: {
-      "/": {
-        // target:' https://10.136.106.82:30011',
-        target: url,
-        ws: false, // 需要websocket 开启
-        changOrigin: true,  //允许跨域
-        pathRewrite: {
-          "^/": "/",
-        },
-      },
-      '/admin-api': {
-        target: 'http://10.136.106.131:30097',
-        changeOrigin: true,
-        pathRewrite: { '^': '' },
-      }
-      // 3.5 以后不需要再配置
-    },
-  },
-};
-
+/**npm 
+ * 配置参考:
+ * https://cli.vuejs.org/zh/config/
+ */
+const url = 'http://10.136.106.131:31950'
+module.exports = {
+  lintOnSave: true,
+  productionSourceMap: false,
+  css: {
+    // 忽略 CSS order 顺序警告
+    extract: { ignoreOrder: true },
+    // 查看CSS属于哪个css文件
+    sourceMap: process.env.NODE_ENV === "development",
+  },
+  // 配置转发代理
+  devServer: {
+    // disableHostCheck: true,
+    port: 8080,
+    proxy: {
+      "/": {
+        // target:' https://10.136.106.82:30011',
+        target: url,
+        ws: false, // 需要websocket 开启
+        changOrigin: true,  //允许跨域
+        pathRewrite: {
+          "^/": "/",
+        },
+      },
+      '/admin-api': {
+        target: 'http://10.136.106.131:30097',
+        changeOrigin: true,
+        pathRewrite: { '^': '' },
+      }
+      // 3.5 以后不需要再配置
+    },
+  },
+};
+