module-menu 0.2.42 → 0.2.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.42",
+  "version": "0.2.44",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/constData.jsx

@@ -15,6 +15,11 @@ export const menuList = (stash = '') => [
         // url: require('../../assets/datacollection_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/datacollection_slogo.svg') : require('../../assets/datacollection_slogo_LNRD.svg'),
       },
+      {
+        childName: "数据填报",
+        path: "/datafill",
+        url: require('../../assets/dataApp/datafill.png'),
+    }
     ],
   },
   {
@@ -40,6 +45,11 @@ export const menuList = (stash = '') => [
         // url: require('../../assets/quality_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/quality_slogo.svg') : require('../../assets/quality_slogo_LNRD.svg'),
       },
+      {
+        childName: "指标管理",
+        path: "/indicator",
+        url: require('../../assets/dataApp/indicator.png'),
+      },
     ],
   },
   {
@@ -108,17 +118,6 @@ export const menuList = (stash = '') => [
             // url: require('../../assets/jilianguanl_slogo.png'),
             url: stash !=='LNRD' ? require('../../assets/jilianguanl_slogo.png') : require('../../assets/jilianguanl_slogo_LNRD.svg'),
           },
-          {
-            childName: '综合评价系统',
-            path: '/evaluate',
-            // url: require('../../assets/ic_pingjia.png'),
-            url: stash !=='LNRD' ? require('../../assets/ic_pingjia.png') : require('../../assets/ic_pingjia_LNRD.svg'),
-          },
-          {
-            childName: '数据标签',
-            path: '/datatag/',
-            url: require('../../assets/ic_biaoqian.png'),
-          },
         ]
       : [
           {
@@ -145,10 +144,20 @@ export const menuList = (stash = '') => [
     children: [
       {
         childName: '数据标签',
-        path: '',
+        path: '/datatag',
         // url: require('../../assets/datalabel_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/datalabel_slogo.svg') : require('../../assets/datalabel_slogo_LNRD.svg'),
       },
+      {
+        childName: "数据可视化",
+        path: "/dataview",
+        url: require("../../assets/dataApp/dataview.png"),
+    },
+      {
+        childName: '综合评价系统',
+        path: '/evaluate',
+        url: stash !=='LNRD' ? require('../../assets/ic_pingjia.png') : require('../../assets/ic_pingjia_LNRD.svg'),
+      },
     ],
   },
   {

package/src/pages/ModuleMenu/index.jsx

@@ -2,6 +2,7 @@ import { useState, useEffect, useRef, useMemo } from 'react';
 import { Popconfirm, message, Popover } from 'antd';
 import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constData';
 import HeaderDropdown from '../ModuleUser/HeaderDropdown';
+import { getInfoByName, getUrlByInfo } from './service.js'
 import Axios from '../util/axios';
 import _ from 'lodash';
 import './index.less';
@@ -95,8 +96,21 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
     return logoAndTitle;
   };
 
+  const getUrl = async (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
+  },
+
+
   // 跳转各个模块
-  const toModulePage = (nameStr) => {
+  const toModulePage = async (nameStr) => {
     if (!sessionMenu || sessionMenu.length === 0) {
       message.destroy();
       message.warning('没有获取到菜单列表，请联系管理员添加权限');
@@ -180,6 +194,12 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         case '数据标签':
           thirdPartyServiceJumpPath = '/datatag/';
           break;
+          case '数据可视化':
+            thirdPartyServiceJumpPath = await this.getUrl('dataview')
+            break;
+        case '数据填报':
+            thirdPartyServiceJumpPath = await this.getUrl('datafill')
+            break;
         default:
           break;
       }

package/src/pages/ModuleMenu/service.js

@@ -0,0 +1,22 @@
+import Axios from '../util/axios';
+
+export function getInfoByName(name) {
+    return Axios(
+        'get',
+        `/admin-api/system/oauth2-client/getByName?name=${name}`,
+        '',
+        {},
+      )
+  }
+  
+  export function getUrlByInfo(obj) {
+      return Axios(
+        'post',
+        `/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`,
+        '',
+        {},
+      )
+  }
+
+  
+