module-menu-vue 0.0.95 → 0.0.97

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -1,5 +1,4 @@
 <template>
-    <!-- :class="stash === 'LNRD' ? 'backGroundImg' : ''" -->
     <div>
         <div class='menuPopupAndTitle' :style="{height: stash === 'LNRD' ? '75px': 'auto'}">
             <div class='menuIcon' :style="{background: stash === 'LNRD' ? '#EA1A1A' : '#4091f7',height: stash === 'LNRD' ? '75px' : '50px', width: stash === 'LNRD' ? '75px' : '60px'}" @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
@@ -45,9 +44,9 @@
 </template>
 
 <script>
-import { menuList as menuListInit, menuIconSrc, sysNameMap, lnrdMenuList, lnrdSysNameMap } from './constant.js'
+import { menuList as menuListInit, menuList_PANWEI, menuIconSrc, sysNameMap, lnrdMenuList, lnrdSysNameMap } from './constant.js'
 import './menu.css'
-import {getMenuList, isLogoutThird} from './service.js'
+import { getMenuList, isLogoutThird, getInfoByName, getUrlByInfo } from './service.js'
 export default {
   name: 'ModuleMenu',
   props: {
@@ -80,6 +79,7 @@ export default {
       menuList: [],
       sessionMenu: [],
       menuListInit: menuListInit,
+      menuList_PANWEI,
       lnrdMenuList,
       lnrdSysNameMap,
       sysNameMap: sysNameMap,
@@ -107,7 +107,15 @@ export default {
     },
     toHref () {
         if (this.sysName === 'admin') {
-            location.href = this.stash === "GZW" ? `/data-platform/#${this.systemPath}` : !["integration", 'LNRD'].includes(this.stash) ? `/#${this.systemPath}` : ''
+            let url = ''
+            if (this.stash === "GZW") {
+                url = `/data-platform/#${this.systemPath}`
+            } else if (this.stash === 'PANWEI') {
+                url = `/bigdata-portal/#${this.systemPath}`
+            } else if (!["integration", 'LNRD'].includes(this.stash)) {
+                url = `/#${this.systemPath}`
+            }
+            location.href = url
         }
     },
     async getSessionMenu () {
@@ -164,8 +172,19 @@ export default {
         }
         return logoAndTitle;
     },
+    async getUrl(name) {
+      let res = null;
+      let obj = {}
+      res = await getInfoByName(name)
+      obj = {
+        clientId: res.data.data.clientId,
+        redirectUrl: encodeURIComponent(res.data.data.redirectUris[0]),
+      }
+      res = await getUrlByInfo(obj)
+      return res.data.data
+    },
     // 跳转各个模块
-    toModulePage (nameStr)  {
+    async toModulePage (nameStr)  {
         console.log('nameStr', nameStr)
         if (nameStr === '平台运行总览') {
             window.open('/dataadmin/#/overview', '_blank');
@@ -173,6 +192,15 @@ export default {
         }
         let thirdPartyServiceJumpPath = ""; // 第三方服务跳转路径
         switch (nameStr) {
+            case '数据可视化':
+                thirdPartyServiceJumpPath = await this.getUrl('dataview')
+                break;
+            case '数据填报':
+                thirdPartyServiceJumpPath = await this.getUrl('datafill')
+                break;
+            case '数据标签':
+                thirdPartyServiceJumpPath = '/datatag/';
+                break;
             case "数据集成":
                 thirdPartyServiceJumpPath = "/datacollect/";
                 break;
@@ -232,11 +260,21 @@ export default {
     // 跳转首页
     toHomePage (index)  {
         if (index === 0) {
-            location.href = ["integration", 'LNRD'].includes(this.stash) ? '/dataadmin/#/index' : this.stash === "GZW" ? '/data-platform/#/index' : '/#/index'
+            let url = ''
+            if (["integration", 'LNRD'].includes(this.stash)) {
+                url = '/dataadmin/#/index'
+            } else if (this.stash === "GZW") {
+                url = '/data-platform/#/index'
+            } else if (this.stash === "PANWEI") {
+                url = '/bigdata-portal/#/index'
+            } else {
+                url = '/#/index'
+            }
+            location.href = url
         }
     },
     getNewMenuList () {
-        let newMenuList = this.stash === 'LNRD' ? [...lnrdMenuList] : [...this.menuListInit];
+        let newMenuList = this.stash === 'LNRD' ? [...lnrdMenuList] : this.stash === 'PANWEI' ? [...this.menuList_PANWEI] : [...this.menuListInit];
         if (this.sessionMenu) {
             const pathList = this.sessionMenu.map(item  => item.path)
             // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)

package/src/components/Menu/constant.js

@@ -1,5 +1,5 @@
 const token = localStorage.getItem('ACCESS_TOKEN')
-console.log('token', token)
+
 export const menuList = [{
     name: '首页',
     url: require('../../assets/home.svg'),
@@ -8,11 +8,18 @@ export const menuList = [{
 {
     name: '数据汇聚',
     url: require('../../assets/ic_shujuhuiju_m.svg'),
-    children: [{
-        childName: '数据集成',
-        path: token ? '/datacollect' : '/datacollection',
-        url:require('../../assets/datacollection_slogo.svg'),
-    }]
+    children: [
+        {
+            childName: '数据集成',
+            path: token ? '/datacollect' : '/datacollection',
+            url:require('../../assets/datacollection_slogo.svg'),
+        },
+        {
+            childrenName: "数据填报",
+            path: "/datafill",
+            url: require('../../assets/dataApp/datafill.png'),
+        }
+    ]
 },
 {
     name: '数据治理',
@@ -30,7 +37,12 @@ export const menuList = [{
     {
         childName: '数据质量',
         path: token ? '/quality' : '/quality/',
-        url:require('../../assets/quality_slogo.svg'),
+        url: require('../../assets/quality_slogo.svg'),
+    },
+    {
+        childName: "指标管理",
+        path: "/indicator",
+        url: require('../../assets/dataApp/indicator.png'),
     }]
 },
 {
@@ -85,20 +97,28 @@ export const menuList = [{
         path: "/cascade",
         url: require("../../assets/ic_jilianguanli.png"),
     },
-    {
-        childName: '综合评价系统',
-        path: '/evaluate',
-        url: require("../../assets/ic_pingjia.png"),
-    }]
+    ]
 },
 {
     name: '数据应用',
     url: require('../../assets/ic_shujuyingyong_m.svg'),
-    children: [{
-        childName: '数据标签',
-        path: '',
-        url:require('../../assets/datalabel_slogo.svg'),
-    }]
+    children: [
+        {
+            childName: '数据标签',
+            path: '',
+            url: require('../../assets/datalabel_slogo.svg'),
+        },
+        {
+            childName: "数据可视化",
+            path: "/dataview",
+            url: require("../../assets/dataApp/dataview.png"),
+        },
+        {
+            childName: '综合评价系统',
+            path: '/evaluate',
+            url: require("../../assets/ic_pingjia.png"),
+        }
+    ]
 },
 {
     name: '公共模块',
@@ -133,7 +153,57 @@ export const menuList = [{
         url: require('../../assets/ic_zonglan.png'),
     }]
 }];
+
+export const menuList_PANWEI = [{
+    name: '首页',
+    url: require('../../assets/home.svg'),
+    children: [],
+},
+{
+    name: '数据汇聚',
+    url: require('../../assets/ic_shujuhuiju_m.svg'),
+    children: [{
+        childName: '数据集成',
+        path: token ? '/datacollect' : '/datacollection',
+        url:require('../../assets/datacollection_slogo.svg'),
+    }]
+},
+{
+    name: '数据治理',
+    url: require('../../assets/ic_shujuzhili_m.svg'),
+    children: [
+        {
+            childName: '数据治理',
+            path: token ? '/datamanage' : '/dataManager',
+            url:require('../../assets/datamanager_slogo.svg'),
+        },
+    ]
+},
+{
+    name: '数据开发',
+    url: require('../../assets/ic_shujukaifa_m.svg'),
+    children: [
+        {
+            childName: '离线开发',
+            path: token ? '/datadev' : '/datadev/',
+            url:require('../../assets/datadev_slogo.svg'),
+        },
+    ]
+},
+{
+    name: '数据共享',
+    url: require('../../assets/ic_shujukaifang_m.svg'),
+    children: [
+        {
+            childName: '数据服务',
+            path: '/dataservice',
+            url:require('../../assets/dataservice_slogo.svg'),
+        },
+    ]
+}];
+
 export const menuIconSrc = require('../../assets/menuIcon.svg');
+
 export const sysNameMap = [
     {
         sysName: 'datasecurity',

package/src/components/Menu/service.js

@@ -1,4 +1,5 @@
 import request from 'axios'
+
 export const getMenuList = () => {
     return request(`/admin-api/system/user/get-user-menu-List?menuName=数据平台`, {
       method: 'get'
@@ -8,4 +9,18 @@ export const getMenuList = () => {
 // 是否跳转到第三方
 export const isLogoutThird = () => {
   return request('/admin/social/logoutUri');
+}
+
+export function getInfoByName(name) {
+  return request({
+    url: `/admin-api/system/oauth2-client/getByName?name=${name}`,
+    method: 'get',
+  })
+}
+
+export function getUrlByInfo(obj) {
+    return request({
+      url: `/admin-api/system/oauth2/authorize?response_type=code&client_id=${obj.clientId}&redirect_uri=${obj.redirectUrl}&auto_approve=true&scope=%7B"user.read":true%7D`,
+      method: 'post',
+    })
 }

package/src/components/User/UserInfo.vue

@@ -68,6 +68,8 @@ export default {
         }
         if (this.stash === 'GZW') {
             sessionStorage.setItem('stash', 'GZW')
+        } else if (this.stash === 'PANWEI') {
+            sessionStorage.setItem('stash', 'PANWEI')
         } else {
             sessionStorage.removeItem('stash')
         }
@@ -90,7 +92,15 @@ export default {
         handleClickmenu (flag){
             let url = ''
             if (flag === 'single') {
-                url = ["integration", 'LNRD'].includes(this.stash) ? '/admin-ui/data-share-portal/personal/info' : this.stash === "GZW" ? '/data-platform/#/info/index' : '/#/info/index'
+                if (["integration", 'LNRD'].includes(this.stash)) {
+                    url = '/admin-ui/data-share-portal/personal/info'
+                } else if (this.stash === "GZW") {
+                    url = '/data-platform/#/info/index'
+                } else if (this.stash === "PANWEI") {
+                    url = '/bigdata-portal/#/info/index'
+                } else {
+                    url = '/#/info/index'
+                }
                 location.href = url;
             } else if (flag === 'systerm') {
                 if (["integration", 'LNRD'].includes(this.stash)) {
@@ -113,7 +123,17 @@ export default {
                             }
                         })
                     }
-                    location.href = this.stash === "GZW" ? `/data-platform/#${systemPath}` : `/#${systemPath}`
+                    if (this.sysName === 'admin') {
+                        let url = ''
+                        if (this.stash === "GZW") {
+                            url = `/data-platform/#${systemPath}`
+                        } else if (this.stash === 'PANWEI') {
+                            url = `/bigdata-portal/#${systemPath}`
+                        } else {
+                            url =  `/#${systemPath}`
+                        }
+                        location.href = url
+                    }
                 }
             } else if (flag === 'app') {
                 url = '/dataadmin/#/appSystem/index'
@@ -128,7 +148,14 @@ export default {
                 await integrationLogout();
                 this.logoutUrl()
             } else {
-                const url = ["integration", 'LNRD'].includes(this.stash) ? '/admin-api/system/auth/logout' : this.stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout'
+                let url = ''
+                if (["integration", 'LNRD'].includes(this.stash)) {
+                    url = '/admin-ui/system/auth/logout'
+                } else if (this.stash === 'GZW') {
+                    url = '/data-platform/auth/token/logout'
+                } else {
+                    url = '/auth/token/logout'
+                }
                 const method = ["integration", 'LNRD'].includes(this.stash) ? 'post' : 'delete'
                 Axios(url, method).then(() => {
                     this.logoutUrl();
@@ -141,7 +168,17 @@ export default {
         logoutUrl() {
             localStorage.clear();
             sessionStorage.clear();
-            location.href = ["integration", 'LNRD'].includes(this.stash) ? '/admin-ui/login' : this.stash === 'GZW' ? '/data-platform/#/login' : '/#/login'
+            let url = ''
+            if (["integration", 'LNRD'].includes(this.stash)) {
+                url = '/admin-ui/login'
+            } else if (this.stash === 'GZW') {
+                url = '/data-platform/#/login'
+            } else if (this.stash === 'PANWEI') {
+                url = '/bigdata-portal/#/login'
+            } else {
+                url = '/#/login'
+            }
+            location.href = url
         },
         getName ()  {
             return getUserName()

package/src/components/Util/permessionUtils.js

@@ -1,7 +1,7 @@
 import Axios from './axios';
 const localStorageToken = localStorage.getItem('ACCESS_TOKEN')
 const stash = sessionStorage.getItem('stash')
-const DEFAULT_LOGOUT_URL = localStorageToken ? '/admin-ui/login' : stash === 'GZW' ? '/data-platform/#/login' : '/#/login'
+const DEFAULT_LOGOUT_URL = localStorageToken ? '/admin-ui/login' : stash === 'GZW' ? '/data-platform/#/login' : stash === 'PANWEI' ? '/bigdata-portal/#/login' : '/#/login'
 import { integrationLogout } from '../User/service.js'
 // 校验token是否失效
 export const checkToken = async (token) => {

package/vue.config.js

@@ -1,9 +1,4 @@
-/**npm 
- * 配置参考:
- * https://cli.vuejs.org/zh/config/
- */
-const url = 'https://10.136.106.131:31950'
-// const url = 'https://192.168.108.86:30011/'
+const url = 'https://192.168.108.203:31950'
 module.exports = {
   lintOnSave: true,
   productionSourceMap: false,
@@ -28,7 +23,7 @@ module.exports = {
         },
       },
       '/admin-api': {
-        target: 'https://10.136.106.131:31950',
+        target: url,
         changeOrigin: true,
         pathRewrite: { '^': '' },
       }