module-menu-vue 0.0.42 → 0.0.44

package/index.js

@@ -1,3 +1,5 @@
 import ModuleMenu from './src/components/Menu/ModuleMenu.vue';
-import UserInfo from './src/components/User/UserInfo.vue'
-export {ModuleMenu,UserInfo};
+import UserInfo from './src/components/User/UserInfo.vue';
+import TenantList from './src/components/Tenant/TenantList.vue';
+import PortalBtn from './src/components/Portal/PortalBtn.vue';
+export { ModuleMenu, UserInfo, TenantList, PortalBtn};

package/package.json

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

package/src/App.vue

@@ -1,13 +1,17 @@
 <template>
   <div id="app">
     <ModuleMenu></ModuleMenu>
+    <TenantList></TenantList>
+    <PortalBtn></PortalBtn>
     <UserInfo></UserInfo>
   </div>
 </template>
 
 <script>
-import ModuleMenu from './components/Menu/ModuleMenu.vue'
-import UserInfo from './components/User/UserInfo.vue'
+import ModuleMenu from '@/components/Menu/ModuleMenu.vue'
+import PortalBtn from '@/components/Portal/PortalBtn.vue'
+import TenantList from '@/components/Tenant/TenantList.vue'
+import UserInfo from '@/components/User/UserInfo.vue'
 export default {
   name: 'App',
   data () {
@@ -15,6 +19,8 @@ export default {
   },
   components: {
     ModuleMenu,
+    TenantList,
+    PortalBtn,
     UserInfo
   }
 }

package/src/components/Menu/ModuleMenu.vue

@@ -42,6 +42,7 @@
 <script>
 import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constant.js'
 import './menu.css'
+import {getMenuList} from './service.js'
 export default {
   name: 'ModuleMenu',
   props: {
@@ -52,6 +53,10 @@ export default {
     collapse: {
         type: Boolean,
         default: true,
+    },
+    stash: {
+        type: String,
+        default: 'integration'
     }
   },
   watch: {
@@ -71,23 +76,41 @@ export default {
       sessionMenu: [],
       menuListInit: menuListInit,
       sysNameMap: sysNameMap,
-      showCollapse: true
+      showCollapse: true,
     }
   },
   created () {
     this.getSessionMenu();
-    this.getNewMenuList();
+    if (this.stash !== "integration") {
+        this.getNewMenuList();
+    }
   },
   methods: {
     toHref () {
         if (this.sysName === 'admin') {
-            this.$router.push({path: '/admin/user/index'})
+            location.href = '/#/admin/user/index'
         }
     },
-    getSessionMenu () {
-        const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
-        if (menuObj) {
-            this.sessionMenu = [...menuObj.content]
+    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();
+            }
+        } else {
+            // 轻量级
+            const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
+            if (menuObj) {
+                this.sessionMenu = [...menuObj.content]
+            }
         }
     },
     // 获取系统logo及title
@@ -141,15 +164,21 @@ export default {
             case "数据安全":
                 thirdPartyServiceJumpPath = "/datasecurity/";
                 break;
+            case "目录管理":
+                thirdPartyServiceJumpPath = "/admin-ui/catalog/menuClassify/list";
+                break;
+            case "资源管理":
+                thirdPartyServiceJumpPath = "/admin-ui/resource/tableResource/list";
+                break;
             default:
                 break;
         }
-        window.location.href = thirdPartyServiceJumpPath
+        location.href = thirdPartyServiceJumpPath
     },
     // 跳转首页
     toHomePage (index)  {
         if (index === 0) {
-            window.location.href = '/#/index'
+            location.href = this.stash === "integration" ? '/dataadmin/#/index' : '/#/index'
         }
     },
     getNewMenuList () {
@@ -176,4 +205,8 @@ export default {
 }
 </script>
 <style scoped>
+.iconPad{
+    width: 15px;
+    height: 15px;
+}
 </style>

package/src/components/Menu/constant.js

@@ -1,3 +1,5 @@
+const token = localStorage.getItem('ACCESS_TOKEN')
+console.log('token', token)
 export const menuList = [{
     name: '首页',
     url: require('../../assets/home.svg'),
@@ -8,7 +10,7 @@ export const menuList = [{
     url: require('../../assets/ic_shujuhuiju_m.svg'),
     children: [{
         childName: '数据集成',
-        path: '/datacollection',
+        path: token ? '/datacollect' : '/datacollection',
         url:require('../../assets/datacollection_slogo.svg'),
     }]
 },
@@ -17,7 +19,7 @@ export const menuList = [{
     url: require('../../assets/ic_shujuzhili_m.svg'),
     children: [{
         childName: '数据治理',
-        path: '/dataManager',
+        path: token ? '/datamanage' : '/dataManager',
         url:require('../../assets/datamanager_slogo.svg'),
     },
     {
@@ -27,7 +29,7 @@ export const menuList = [{
     },
     {
         childName: '数据质量',
-        path: '/quality/',
+        path: token ? '/quality' : '/quality/',
         url:require('../../assets/quality_slogo.svg'),
     }]
 },
@@ -36,7 +38,7 @@ export const menuList = [{
     url: require('../../assets/ic_shujukaifa_m.svg'),
     children: [{
         childName: '离线开发',
-        path: '/datadev/',
+        path: token ? '/datadev' : '/datadev/',
         url:require('../../assets/datadev_slogo.svg'),
     },
     {
@@ -62,6 +64,16 @@ export const menuList = [{
         childName: '数据共享',
         path: '/datasharing',
         url:require('../../assets/datasharing_slogo.svg'),
+    },
+    {
+        childName: "目录管理",
+        path: "/muluguanli",
+        url: require("../../assets/ic_muluguanli.png"),
+    },
+    {
+        childName: "资源管理",
+        path: "/ziyuanguanli",
+        url: require("../../assets/ic_ziyuanguanli.png"),
     }]
 },
 {
@@ -165,7 +177,7 @@ export const sysNameMap = [
     },
     {
         sysName: 'admin',
-        title: '系统管理',
+        title: token ? '数据源管理' : '系统管理',
         logoSrc: require('../../assets/admin_logo.svg'),
     },
     // {
@@ -178,5 +190,4 @@ export const sysNameMap = [
         title: '消息中心',
         logoSrc: require('../../assets/alert_logo.svg'),
     },
-
-];
+];

package/src/components/Menu/menu.css

@@ -40,7 +40,7 @@
   color: #4091f7;
 }
 .childMenu {
-  width: 25%;
+  width: 27%;
   display: inline-block;
   font-size: 13px;
 }

package/src/components/Menu/service.js

@@ -0,0 +1,6 @@
+import request from 'axios'
+export const getMenuList = () => {
+    return request(`/admin-api/system/user/getUserMenusList`, {
+      method: 'get'
+    })
+}

package/src/components/Portal/PortalBtn.vue

@@ -0,0 +1,23 @@
+<template>
+    <el-button @click="handleClick()" style="padding: 10px 30px;">服务门户</el-button>
+</template>
+<script>
+export default {
+    name: 'PortalBtn',
+    data () {
+        return {
+        }
+    },
+    methods: {
+        // 跳转至共享交换portal首页
+        handleClick () {
+            location.href = '/admin-ui/data-share-portal/homePage'
+        }
+    }
+}
+</script>
+<style>
+.el-button {
+    background: transparent !important;
+}
+</style>

package/src/components/Tenant/TenantList.vue

@@ -0,0 +1,63 @@
+<template>
+    <el-dropdown @command="handleCommand">
+        <span class="el-dropdown-link">
+            {{tenantName}}<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :command="item.id" v-for="item in options" :key="item.value">{{item.name}}</el-dropdown-item>
+        </el-dropdown-menu>
+    </el-dropdown>
+</template>
+<script>
+import { getTenantList, changeTenantId } from './service.js'
+export default {
+    name: 'TenantList',
+    data () {
+        return {
+            options: [],
+            tenantName: ''
+        }
+    },
+    created () {
+        // 每次都获取最新的租户列表
+        getTenantList().then((res) => {
+            console.log('租户列表:', res)
+            const rspObj = res.data
+            if (rspObj.code === 0) {
+                this.options = [...rspObj.data]
+                const tenantId = localStorage.getItem('curTenantId')
+                // 判断是否存在租户id
+                if (tenantId) {
+                    this.tenantName = this.options.find(item => item.id + '' === tenantId).name
+                } else {
+                    if (this.options.length > 0) {
+                        this.tenantName = this.options[0].name
+                        localStorage.setItem('curTenantId', this.options[0].id)
+                    } else {
+                        this.tenantName = ''
+                    }
+                }
+            }
+        })
+    },
+    methods: {
+        handleCommand (value) {
+            const obj = {
+                id: value,
+                token: localStorage.getItem('ACCESS_TOKEN')
+            }
+            // 切换租户通知后台
+            changeTenantId(obj).then(() => {
+                localStorage.setItem('curTenantId', value)
+                this.tenantName = this.options.find(item => item.id === value).name
+            })
+        }
+    }
+}
+</script>
+<style scoped>
+/deep/.el-input__inner{
+    height: 35px;
+    line-height: 30px;
+}
+</style>

package/src/components/Tenant/service.js

@@ -0,0 +1,15 @@
+import request from 'axios'
+// 获取租户列表
+export const getTenantList = () => {
+    return request({
+      url: '/admin-api/system/user/getUserTenant',
+      method: 'get'
+    })
+}
+// 更改后台租户id
+export const changeTenantId = (params) => {
+  return request({
+    url: `/admin-api/system/auth/setRedisTokenOfTenant?tenantId=${params.id}&token=${params.token}`,
+    method: 'get'
+  })
+}

package/src/components/User/UserInfo.vue

@@ -1,9 +1,9 @@
 <template>
     <div className="right">
-        <el-dropdown v-if="getUserName()" @command="handleClickmenu">
+        <el-dropdown v-if="getName()" @command="handleClickmenu">
             <span class="el-dropdown-link">
                 <img src="../../assets/userLogo.svg" style="vertical-align:middle;padding-right:10px"/>
-                <span style="color: rgba(0, 0, 0, 0.85);">{{getUserName()}}</span>
+                <span style="color: rgba(0, 0, 0, 0.85);">{{getName()}}</span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
@@ -11,7 +11,7 @@
                     <img :src="PersonalCenterSrc" alt="" class="menuItem" />
                     <span>个人中心</span>
                 </el-dropdown-item>
-                <el-dropdown-item v-show="sysName !== 'admin' && isHaveSystemManagementPermission" command="systerm">
+                <el-dropdown-item v-show="isShowSys" command="systerm">
                     <img :src="SystemManageSrc" alt="" class="menuItem" />
                     <span>系统管理</span>
                 </el-dropdown-item>
@@ -21,13 +21,12 @@
                 </el-dropdown-item>
             </el-dropdown-menu>
         </el-dropdown>
-        <v-loading v-else size="small" :style="{ marginLeft: '8px', marginRight: '8px', lineHeight: '57px', textAlign: 'center' }" />
     </div>
 </template>
-
-<script >
+<script>
 import Axios from '../Util/axios.js'
-import {userMenuIcon} from './constant.js'
+import { userMenuIcon } from './constant.js'
+import { getUserName } from './../Util/userInfo.js'
 export default {
     name: 'UserInfo',
     data () {
@@ -39,43 +38,49 @@ export default {
             LogoutSrc: userMenuIcon.LogoutSrc,
         }
     },
+    computed: {
+        // 是否显示系统管理菜单项
+        isShowSys () {
+            return this.stash === "integration" ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
+        }
+    },
     props: {
-    sysName: {
+        sysName: {
             type: String,
             default: 'admin'
         },
+        stash: {
+            type: String,
+            default: ''
+        }
     },
     methods: {
         handleClickmenu (flag){
             let url = ''
             if (flag === 'single') {
-                url = '/#/info/index'
+                url = this.stash === "integration" ? '/admin-ui/user/profile' : '/#/info/index'
             } else if (flag === 'systerm') {
-                url = '/#/admin/user/index'
+                url = this.stash === "integration" ? '/admin-ui/bpm/manager/user-group' : '/#/admin/user/index'
             } else if (flag === 'logout') {
                 this.logoutFunc()
             }
-            window.location.href = url;
+            location.href = url;
         },
         logoutFunc () {
             console.log('开始调用退出接口...')
-            Axios('/auth/token/logout')
-                .then((res) => {
-                    console.log('res: ', res)
-                    localStorage.clear();
-                    sessionStorage.clear();
-                    location.href = '/#/login';
-                })
-                .catch((err) => {
-                    console.log('err: ', err)
-                });
+            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'
+            })
+            .catch((err) => {
+                console.log('err: ', err)
+            });
         },
-        getUserName ()  {
-            const userInfo = JSON.parse(sessionStorage.getItem('bigdata-userInfo')||"{}");
-            if (userInfo && userInfo.content && Object.keys(userInfo.content).length > 0 && userInfo.content.username) {
-                return userInfo.content.username;
-            }
-            return '';
+        getName ()  {
+            return getUserName()
         },
     }
 }

package/src/components/Util/axios.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import getStore from './userInfo';
 import { checkToken } from './permessionUtils';
-let tokenValue = '574536b1-5832-417b-b909-82e204679d67';
+let tokenValue = '64d4c0cf1f334e4fa755780976cdbada';
 axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
@@ -70,9 +70,12 @@ axios.interceptors.request.use(
   },
 );
 
-function Axios(url) {
+function Axios(url, method) {
   return new Promise((resolve, reject) => {
-    axios.delete(url)
+      axios({
+        method: method,
+        url: url,
+      })
       .then((res) => {
         console.log('res', res)
         resolve(res);

package/src/components/Util/config.js

@@ -1,5 +1,5 @@
-const address = window.location.hostname
-const port = window.location.port
+const address = location.hostname
+const port = location.port
 const baseCof = 
 process.env.NODE_ENV === 'production' ? 
 {

package/src/components/Util/permessionUtils.js

@@ -1,21 +1,6 @@
 import Axios from './axios';
-
-const DEFAULT_LOGOUT_URL = '/#/login'
-// 退出登录
-export const logout = () => {
-  console.log('调用了。。。')
-  Axios('delete','/auth/token/logout', '', {})
-    .then(() => {
-      console.log('调用成功')
-      localStorage.clear();
-      sessionStorage.clear();
-      window.location.href = DEFAULT_LOGOUT_URL;
-    })
-    .catch((error) => {
-      console.log('调用失败')
-      console.error('Error while logging out, error:', error);
-    });
-}
+const token = localStorage.getItem('ACCESS_TOKEN')
+const DEFAULT_LOGOUT_URL = token ? '/admin-ui/login' : '/#/login'
 // 校验token是否失效
 export const checkToken = (token) => {
   Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} )
@@ -23,7 +8,7 @@ export const checkToken = (token) => {
       this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = DEFAULT_LOGOUT_URL;
-        }});
-      })
+          location.href = DEFAULT_LOGOUT_URL;
+      }});
+  })
 }

package/src/components/Util/userInfo.js

@@ -2,49 +2,87 @@
 * 获取认证相关的localStorage/SessionStorage
 */
 function getStore(params) {
-    let { name } = params;
-    const { debug } = params;
-    const keyName = 'bigdata-';
-    name = keyName + name;
-    let obj = {};
-    let content;
-    obj = window.sessionStorage.getItem(name);
-    if (!obj || Object.keys(obj).length === 0) obj = window.localStorage.getItem(name);
-    if (!obj || Object.keys(obj).length === 0) return '';
-    try {
-        obj = JSON.parse(obj);
-    } catch (e) {
-        return '';
-    }
-    if (debug) {
-        return '';
-    }
-    if (obj.dataType === 'string') {
-        content = obj.content;
-    } else if (obj.dataType === 'number') {
-        content = Number(obj.content);
-    } else if (obj.dataType === 'boolean') {
-        // eslint-disable-next-line no-eval
-        content = eval(obj.content);
-    } else if (obj.dataType === 'object') {
-        content = obj.content;
+    let { name, debug } = params;
+    // 使用 ACCESS_TOKEN 判断是否是一体化
+    const token = localStorage.getItem('ACCESS_TOKEN')
+    if (token) {
+        let storageStr = '';
+        if (name === 'access_token') {
+            storageStr = localStorage.getItem('ACCESS_TOKEN');
+        } else if (name === 'tenantId') {
+            // 暂定当前租户 curTenantId
+            storageStr = localStorage.getItem('curTenantId');
+        } else if (name === 'userName') {
+            // 获取当前登录用户名称
+            storageStr = localStorage.getItem('userName');
+        } else if (name === 'userId') {
+            // 获取当前登录用户Id
+            storageStr = localStorage.getItem('userId');
+        }
+        return storageStr;
+    } else {
+        const keyName = 'bigdata-';
+        name = keyName + name;
+        let obj = {};
+        let content;
+        obj = sessionStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) obj = localStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) return '';
+        try {
+            obj = JSON.parse(obj);
+        } catch (e) {
+            return '';
+        }
+        if (debug) {
+            return '';
+        }
+        if (obj.dataType === 'string') {
+            content = obj.content;
+        } else if (obj.dataType === 'number') {
+            content = Number(obj.content);
+        } else if (obj.dataType === 'boolean') {
+            // eslint-disable-next-line no-eval
+            content = eval(obj.content);
+        } else if (obj.dataType === 'object') {
+            content = obj.content;
+        }
+        return content;
     }
-    return content;
 }
 export default getStore;
 
 export const getUserName = () => {
-    const userInfo = getStore({ name: 'userInfo' });
-    if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
-        return userInfo.username;
+    // 使用 ACCESS_TOKEN 判断是否是一体化
+    const token = localStorage.getItem('ACCESS_TOKEN')
+    if (token) {
+        const name = getStore({ name: 'userName' });
+        if (!name) {
+        return '';
+        }
+        return name;
+    } else {
+        const userInfo = getStore({ name: 'userInfo' });
+        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
+            return userInfo.username;
+        }
+        return '';
     }
-    return '';
 };
 
 export const getUserId = () => {
-    const userInfo = getStore({ name: 'userInfo' });
-    if (userInfo && Object.keys(userInfo).length > 0 && userInfo.id) {
-        return userInfo.id;
+    // 使用 ACCESS_TOKEN 判断是否是一体化
+    const token = localStorage.getItem('ACCESS_TOKEN')
+    if (token) {
+        const id = getStore({ name: 'userId' });
+        if (!id) {
+            return '';
+        }
+        return id;
+    } else {
+        const userInfo = getStore({ name: 'userInfo' });
+        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.id) {
+            return userInfo.id;
+        }
+        return '';
     }
-    return '';
 }; 

package/src/main.js

@@ -1,13 +1,11 @@
 import Vue from 'vue'
-import App from './App.vue'
 import ElementUI from 'element-ui';
+import App from './App.vue'
 import 'element-ui/lib/theme-chalk/index.css';
 
-
 Vue.config.productionTip = false
 Vue.use(ElementUI);
 
-
 new Vue({
   render: h => h(App),
 }).$mount('#app')

package/vue.config.js

@@ -1,4 +1,38 @@
-const { defineConfig } = require('@vue/cli-service')
-module.exports = defineConfig({
-  transpileDependencies: true
-})
+/**npm 
+ * 配置参考:
+ * https://cli.vuejs.org/zh/config/
+ */
+const url = 'http://10.136.106.131:30097'
+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 以后不需要再配置
+    },
+  },
+};
+

package/src/components/User/service.js

@@ -1,7 +0,0 @@
-import request from 'axios'
-export const logout = () => {
-    return request({
-      url: '/auth/token/logout',
-      method: 'delete'
-    })
-}