module-menu-vue 0.0.96 → 0.0.98

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -46,7 +46,7 @@
 <script>
 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: {
@@ -172,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');
@@ -181,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;

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'),
+        },
+        {
+            childName: "数据填报",
+            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,6 +153,7 @@ export const menuList = [{
         url: require('../../assets/ic_zonglan.png'),
     }]
 }];
+
 export const menuList_PANWEI = [{
     name: '首页',
     url: require('../../assets/home.svg'),
@@ -180,7 +201,9 @@ export const menuList_PANWEI = [{
         },
     ]
 }];
+
 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/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: { '^': '' },
       }