module-menu 0.2.51 → 0.2.52-dev-hubjt.3

package/config/config.js

@@ -5,8 +5,7 @@ export default defineConfig({
         // localhost:8000/cmcc/data/** -> http://192.168.108.88:30808/cmcc/data/**
         '/cmcc/data/': {
           // 要代理的地址
-          // target: 'http://192.168.108.86:30808',
-          target: 'http://192.168.108.203:31772',
+          target: 'http://192.168.108.86:30808',
           // target: 'http://10.136.106.82:30808',
           // target: 'http://192.168.200.122:28088',
           // target: 'http://10.136.106.148:32678',
@@ -17,8 +16,7 @@ export default defineConfig({
         },
         '/admin/': {
           // 要代理的地址
-          // target: 'https://192.168.108.86:30011',
-          target: 'https://192.168.108.203:31950',
+          target: 'https://192.168.108.86:30011',
           // target: 'http://10.136.106.82:30808',
           // target: 'http://192.168.200.122:28088',
           // target: 'http://10.136.106.148:32678',
@@ -27,12 +25,5 @@ export default defineConfig({
           // 依赖 origin 的功能可能需要这个，比如 cookie
           changeOrigin: true,
         },
-        '/admin-api':{
-            // 要代理的地址
-            target: 'https://192.168.108.203:31950',
-            // target: 'http://192.168.108.203:30077',
-            changeOrigin: true,
-            pathRewrite: { '^': '' },
-          }
       }
 });

package/config/proxy.js

@@ -0,0 +1,46 @@
+/**
+ * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
+ * -------------------------------
+ * The agent cannot take effect in the production environment
+ * so there is no configuration of the production environment
+ * For details, please see
+ * https://pro.ant.design/docs/deploy
+ */
+const url = 'https://192.168.108.203:31950'
+export default {
+  dev: {
+    '/admin-api': {
+      target: url,
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    "/": {
+      target: url,
+      ws: false, // 需要websocket 开启
+      changOrigin: true,  //允许跨域
+      pathRewrite: {
+        "^/": "/",
+      },
+    },
+    // 3.5 以后不需要再配置
+  },
+,
+  test: {
+    '/api/': {
+      target: 'https://proapi.azurewebsites.net',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+  pre: {
+    '/api/': {
+      target: 'your pre url',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "module-menu",
-  "version": "0.2.51",
+  "version": "0.2.52-dev-hubjt.3",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {
-    "start": "umi dev",
-    "build": "umi build",
+    "start": "set REACT_APP_ENV=dev && umi dev",
+    "build": "set REACT_APP_ENV=production && umi build",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",

package/src/pages/ModuleMenu/constData copy.jsx

@@ -0,0 +1,351 @@
+export const menuList = (stash = '') => [
+  {
+    name: '首页',
+    url: stash !=='LNRD' ? require('../../assets/home.svg') : require('../../assets/home_LNRD.svg'),
+    children: [],
+  },
+  {
+    name: '数据汇聚',
+    url: stash !=='LNRD' ? require('../../assets/ic_shujuhuiju_m.svg') : require('../../assets/ic_shujuhuiju_m_LNRD.svg'),
+    // url: require('../../assets/ic_shujuhuiju_m.svg'),
+    children: [
+      {
+        childName: '数据集成',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datacollect' : '/datacollection',
+        // 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'),
+    }
+    ],
+  },
+  {
+    name: '数据治理',
+    url: stash !=='LNRD' ? require('../../assets/ic_shujuzhili_m.svg') : require('../../assets/ic_shujuzhili_m_LNRD.svg'),
+    // url: require('../../assets/ic_shujuzhili_m.svg'),
+    children: [
+      {
+        childName: '数据治理',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datamanage' : '/dataManager',
+        // url: require('../../assets/datamanager_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/datamanager_slogo.svg') : require('../../assets/datamanager_slogo_LNRD.svg'),
+      },
+      {
+        childName: '元数据管理',
+        path: '/metadata',
+        // url: require('../../assets/metadata_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/metadata_slogo.svg') : require('../../assets/metadata_slogo_LNRD.svg'),
+      },
+      {
+        childName: '数据质量',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/quality' : '/quality/',
+        // 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'),
+      },
+      {
+        childName: "知识图谱",
+        path: "/knowledge",
+        url: require('../../assets/ic_zhishitupu.png'),
+      }
+    ],
+  },
+  {
+    name: '数据开发',
+    url: stash !=='LNRD' ? require('../../assets/ic_shujukaifa_m.svg') : require('../../assets/ic_shujukaifa_m_LNRD.svg'),
+    // url: require('../../assets/ic_shujukaifa_m.svg'),
+    children: [
+      {
+        childName: '离线开发',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datadev' : '/datadev/',
+        // url: require('../../assets/datadev_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/datadev_slogo.svg') : require('../../assets/datadev_slogo_LNRD.svg'),
+      },
+      {
+        childName: '实时开发',
+        path: '/dataanalytic',
+        // url: require('../../assets/dataanalytic_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/dataanalytic_slogo.svg') : require('../../assets/dataanalytic_slogo_LNRD.svg'),
+      },
+    ],
+  },
+  {
+    name: '数据共享',
+    url: stash !=='LNRD' ? require('../../assets/ic_shujukaifang_m.svg') : require('../../assets/ic_shujukaifang_m_LNRD.svg'),
+    // url: require('../../assets/ic_shujukaifang_m.svg'),
+    children: ['integration', 'LNRD'].includes(stash)
+      ? [
+          {
+            childName: '数据服务',
+            path: '/dataservice',
+            // url: require('../../assets/dataservice_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/dataservice_slogo.svg') : require('../../assets/dataservice_slogo_LNRD.svg'),
+          },
+          {
+            childName: '数据资产',
+            path: '/dataasset',
+            // url: require('../../assets/dataasset_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/dataasset_slogo.svg') : require('../../assets/dataasset_slogo_LNRD.svg'),
+          },
+          {
+            childName: '数据共享',
+            path: '/datasharing',
+            // url: require('../../assets/datasharing_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/datasharing_slogo.svg') : require('../../assets/datasharing_slogo_LNRD.svg'),
+          },
+          {
+            childName: '目录管理',
+            path: '/catalog',
+            // url: require('../../assets/muluguanli_slogo.png'),
+            url: stash !=='LNRD' ? require('../../assets/muluguanli_slogo.png') : require('../../assets/muluguanli_slogo_LNRD.svg'),
+          },
+          {
+            childName: '资源管理',
+            path: '/ziyuanguanli',
+            url: require('../../assets/ziyuanguanli_slogo.png'),
+          },
+          {
+            childName: '供需对接',
+            path: '/supply-and-demand-docking',
+            // url: require('../../assets/gongxuduijie_slogo.png'),
+            url: stash !=='LNRD' ? require('../../assets/gongxuduijie_slogo.png') : require('../../assets/gongxuduijie_slogo_LNRD.svg'),
+          },
+          {
+            childName: '数据直达',
+            path: '/cascade',
+            // url: require('../../assets/jilianguanl_slogo.png'),
+            url: stash !=='LNRD' ? require('../../assets/jilianguanl_slogo.png') : require('../../assets/jilianguanl_slogo_LNRD.svg'),
+          },
+        ]
+      : [
+          {
+            childName: '数据服务',
+            path: '/dataservice',
+            url: require('../../assets/dataservice_slogo.svg'),
+          },
+          {
+            childName: '数据资产',
+            path: '/dataasset',
+            url: require('../../assets/dataasset_slogo.svg'),
+          },
+          {
+            childName: '数据共享',
+            path: '/datasharing',
+            url: require('../../assets/datasharing_slogo.svg'),
+          },
+        ],
+  },
+  {
+    name: '数据应用',
+    url: stash !=='LNRD' ? require('../../assets/ic_shujuyingyong_m.svg') : require('../../assets/ic_shujuyingyong_m_LNRD.svg'),
+    // url: require('../../assets/ic_shujuyingyong_m.svg'),
+    children: [
+      {
+        childName: '数据标签',
+        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'),
+      },
+    ],
+  },
+  {
+    name: '公共模块',
+    url: stash !=='LNRD' ? require('../../assets/ic_gonggongmokuai_m.svg') : require('../../assets/ic_gonggongmokuai_m_LNRD.svg'),
+    // url: require('../../assets/ic_gonggongmokuai_m.svg'),
+    children: ['integration', 'LNRD', 'HBJK'].includes(stash)
+      ? [
+          {
+            childName: '运维中心',
+            path: '/operate',
+            // url: require('../../assets/operate_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/operate_slogo.svg') : require('../../assets/operate_slogo_LNRD.svg'),
+          },
+          {
+            childName: '系统管理',
+            path: '/#/admin/user/index',
+            // url: require('../../assets/admin_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/admin_slogo.svg') : require('../../assets/admin_slogo_LNRD.svg'),
+          },
+          {
+            childName: '工单管理',
+            // url: require('../../assets/workorder_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/workorder_slogo.svg') : require('../../assets/workorder_slogo_LNRD.svg'),
+          },
+          {
+            childName: '消息中心',
+            path: '/alert',
+            // url: require('../../assets/alert_slogo.svg'),
+            url: stash !=='LNRD' ? require('../../assets/alert_slogo.svg') : require('../../assets/alert_slogo_LNRD.svg'),
+          },
+          {
+            childName: '数据安全',
+            path: '/datasecurity',
+            // url: require('../../assets/datasecurity_slogo.png'),
+            url: stash !=='LNRD' ? require('../../assets/datasecurity_slogo.png') : require('../../assets/datasecurity_slogo_LNRD.svg'),
+            
+          },
+          {
+            childName: '平台运行总览',
+            path: '/overview',
+            url: require('../../assets/ic_zonglan.png'),
+          },
+        ]
+      : (stash === 'GZW'? 
+      [
+        {
+          childName: '运维中心',
+          path: '/operate',
+          url: require('../../assets/operate_slogo.svg'),
+        },
+        {
+          childName: '系统管理',
+          path: '/data-platform/#/admin/user/index',
+          url: require('../../assets/admin_slogo.svg'),
+        },
+        {
+          childName: '工单管理',
+          url: require('../../assets/workorder_slogo.svg'),
+        },
+        {
+          childName: '消息中心',
+          path: '/alert',
+          url: require('../../assets/alert_slogo.svg'),
+        },
+        {
+          childName: '数据安全',
+          path: '/datasecurity',
+          url: require('../../assets/datasecurity_slogo.png'),
+        },
+      ] : 
+      [
+          {
+            childName: '运维中心',
+            path: '/operate',
+            url: require('../../assets/operate_slogo.svg'),
+          },
+          {
+            childName: '系统管理',
+            path: '/#/admin/user/index',
+            url: require('../../assets/admin_slogo.svg'),
+          },
+          {
+            childName: '工单管理',
+            url: require('../../assets/workorder_slogo.svg'),
+          },
+          {
+            childName: '消息中心',
+            path: '/alert',
+            url: require('../../assets/alert_slogo.svg'),
+          },
+          {
+            childName: '数据安全',
+            path: '/datasecurity',
+            url: require('../../assets/datasecurity_slogo.png'),
+          },
+        ]),
+  },
+];
+export const menuIconSrc = require('../../assets/menuIcon.svg');
+// export const childIconSrc = require('../../assets/childIcon.svg');
+
+export const sysNameMap = (stash = '') => [
+  {
+    sysName: 'datacollection',
+    title: '数据集成',
+    logoSrc: require('../../assets/datacollection_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/datacollection_logo.svg'): require('../../assets/datacollection_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'dataManager',
+    title: '数据治理',
+    // logoSrc: require('../../assets/dataManager_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/dataManager_logo.svg'): require('../../assets/dataManager_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'metadata',
+    title: '元数据管理',
+    // logoSrc: require('../../assets/metadata_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/metadata_logo.svg'): require('../../assets/metadata_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'quality',
+    title: '数据质量',
+    // logoSrc: require('../../assets/quality_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/quality_logo.svg'): require('../../assets/quality_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'datadev',
+    title: '离线开发',
+    // logoSrc: require('../../assets/datadev_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/datadev_logo.svg'): require('../../assets/datadev_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'dataanalytic',
+    title: '实时开发',
+    // logoSrc: require('../../assets/dataanalytic_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/dataanalytic_logo.svg'): require('../../assets/dataanalytic_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'dataservice',
+    title: '数据服务',
+    // logoSrc: require('../../assets/dataservice_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/dataservice_logo.svg'): require('../../assets/dataservice_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'dataasset',
+    title: '数据资产',
+    // logoSrc: require('../../assets/dataasset_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/dataasset_logo.svg'): require('../../assets/dataasset_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'datasharing',
+    title: '数据共享',
+    // logoSrc: require('../../assets/datasharing_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/datasharing_logo.svg'): require('../../assets/datasharing_logo_LNRD.svg'),
+  },
+  {
+      sysName: 'datatag',
+      title: '数据标签',
+      logoSrc: require('../../assets/biaoqian_logo.png'),
+  },
+  {
+    sysName: 'operate',
+    title: '运维中心',
+    // logoSrc: require('../../assets/operate_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/operate_logo.svg'): require('../../assets/operate_logo_LNRD.svg'),
+  },
+  {
+    sysName: 'admin',
+    title: '系统管理',
+    // logoSrc: require('../../assets/admin_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/admin_logo.svg'): require('../../assets/admin_logo_LNRD.svg'),
+  },
+  // {
+  //     sysName: 'dataManager',
+  //     title: '工单管理',
+  //     logoSrc: require('../../assets/wordorder_logo.svg'),
+  // },
+  {
+    sysName: 'alert',
+    title: '消息中心',
+    // logoSrc: require('../../assets/alert_logo.svg'),
+    logoSrc: stash !=='LNRD'? require('../../assets/alert_logo.svg'): require('../../assets/alert_logo_LNRD.svg'),
+  },
+];

package/src/pages/ModuleMenu/constData.jsx

@@ -5,27 +5,31 @@ export const menuList = (stash = '') => [
     children: [],
   },
   {
-    name: '数据汇聚',
-    url: stash !=='LNRD' ? require('../../assets/ic_shujuhuiju_m.svg') : require('../../assets/ic_shujuhuiju_m_LNRD.svg'),
-    // url: require('../../assets/ic_shujuhuiju_m.svg'),
+    name: '分析能力',
+    // url: stash !=='LNRD' ? require('../../assets/ic_shujuhuiju_m.svg') : require('../../assets/ic_shujuhuiju_m_LNRD.svg'),
+    url: require('../../assets/ic_shujuhuiju_m.svg'),
     children: [
       {
-        childName: '数据集成',
-        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datacollect' : '/datacollection',
-        // url: require('../../assets/datacollection_slogo.svg'),
-        url: stash !=='LNRD' ? require('../../assets/datacollection_slogo.svg') : require('../../assets/datacollection_slogo_LNRD.svg'),
+        childName: '数据标签',
+        path: '/datatag',
+        url: require('../../assets/datalabel_slogo.svg'),
+        // url: stash !=='LNRD' ? require('../../assets/datalabel_slogo.svg') : require('../../assets/datalabel_slogo_LNRD.svg'),
       },
       {
-        childName: "数据填报",
-        path: "/datafill",
-        url: require('../../assets/dataApp/datafill.png'),
-    }
+        childName: "数据可视化",
+        path: "/dataview",
+        url: require("../../assets/dataApp/dataview.png"),
+      },
+
+
+      
+      
     ],
   },
   {
-    name: '数据治理',
-    url: stash !=='LNRD' ? require('../../assets/ic_shujuzhili_m.svg') : require('../../assets/ic_shujuzhili_m_LNRD.svg'),
-    // url: require('../../assets/ic_shujuzhili_m.svg'),
+    name: '治理能力',
+    // url: stash !=='LNRD' ? require('../../assets/ic_shujuzhili_m.svg') : require('../../assets/ic_shujuzhili_m_LNRD.svg'),
+    url: require('../../assets/ic_shujuzhili_m.svg'),
     children: [
       {
         childName: '数据治理',
@@ -34,233 +38,245 @@ export const menuList = (stash = '') => [
         url: stash !=='LNRD' ? require('../../assets/datamanager_slogo.svg') : require('../../assets/datamanager_slogo_LNRD.svg'),
       },
       {
-        childName: '元数据管理',
-        path: '/metadata',
-        // url: require('../../assets/metadata_slogo.svg'),
-        url: stash !=='LNRD' ? require('../../assets/metadata_slogo.svg') : require('../../assets/metadata_slogo_LNRD.svg'),
+        childName: '数据资产',
+        path: '/dataasset',
+        url: require('../../assets/dataasset_slogo.svg'),
       },
       {
         childName: '数据质量',
-        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/quality' : '/quality/',
-        // url: require('../../assets/quality_slogo.svg'),
-        url: stash !=='LNRD' ? require('../../assets/quality_slogo.svg') : require('../../assets/quality_slogo_LNRD.svg'),
+        // path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/quality' : '/quality/',
+        path: '/quality',
+        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'),
+        childName: '离线开发',
+        // path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datadev' : '/datadev/',
+        path: '/datadev',
+        url: require('../../assets/datadev_slogo.svg'),
+        // url: stash !=='LNRD' ? require('../../assets/datadev_slogo.svg') : require('../../assets/datadev_slogo_LNRD.svg'),
       },
       {
-        childName: "知识图谱",
-        path: "/knowledge",
-        url: require('../../assets/ic_zhishitupu.png'),
-      }
+            childName: '数据安全',
+            path: '/datasecurity',
+            url: require('../../assets/datasecurity_slogo.png'),
+            // url: stash !=='LNRD' ? require('../../assets/datasecurity_slogo.png') : require('../../assets/datasecurity_slogo_LNRD.svg'),
+            
+          },
+          {
+          childName: '运维中心',
+          path: '/operate',
+          url: require('../../assets/operate_slogo.svg'),
+        },
+      {
+        childName: '元数据管理',
+        path: '/metadata',
+        // url: require('../../assets/metadata_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/metadata_slogo.svg') : require('../../assets/metadata_slogo_LNRD.svg'),
+      },
+      
+      // {
+      //   childName: "指标管理",
+      //   path: "/indicator",
+      //   url: require('../../assets/dataApp/indicator.png'),
+      // },
+      // {
+      //   childName: "知识图谱",
+      //   path: "/knowledge",
+      //   url: require('../../assets/ic_zhishitupu.png'),
+      // }
     ],
   },
   {
-    name: '数据开发',
-    url: stash !=='LNRD' ? require('../../assets/ic_shujukaifa_m.svg') : require('../../assets/ic_shujukaifa_m_LNRD.svg'),
-    // url: require('../../assets/ic_shujukaifa_m.svg'),
+    name: '服务能力',
+    // url: stash !=='LNRD' ? require('../../assets/ic_shujukaifa_m.svg') : require('../../assets/ic_shujukaifa_m_LNRD.svg'),
+    url: require('../../assets/ic_shujukaifa_m.svg'),
     children: [
       {
-        childName: '离线开发',
-        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datadev' : '/datadev/',
-        // url: require('../../assets/datadev_slogo.svg'),
-        url: stash !=='LNRD' ? require('../../assets/datadev_slogo.svg') : require('../../assets/datadev_slogo_LNRD.svg'),
+        childName: '数据集成',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datacollect' : '/datacollection',
+        // url: require('../../assets/datacollection_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/datacollection_slogo.svg') : require('../../assets/datacollection_slogo_LNRD.svg'),
       },
       {
-        childName: '实时开发',
-        path: '/dataanalytic',
-        // url: require('../../assets/dataanalytic_slogo.svg'),
-        url: stash !=='LNRD' ? require('../../assets/dataanalytic_slogo.svg') : require('../../assets/dataanalytic_slogo_LNRD.svg'),
-      },
-    ],
-  },
-  {
-    name: '数据共享',
-    url: stash !=='LNRD' ? require('../../assets/ic_shujukaifang_m.svg') : require('../../assets/ic_shujukaifang_m_LNRD.svg'),
-    // url: require('../../assets/ic_shujukaifang_m.svg'),
-    children: ['integration', 'LNRD'].includes(stash)
-      ? [
-          {
+        childName: "数据填报",
+        path: "/datafill",
+        url: require('../../assets/dataApp/datafill.png'),
+    },
+    {
             childName: '数据服务',
             path: '/dataservice',
             // url: require('../../assets/dataservice_slogo.svg'),
             url: stash !=='LNRD' ? require('../../assets/dataservice_slogo.svg') : require('../../assets/dataservice_slogo_LNRD.svg'),
           },
-          {
-            childName: '数据资产',
-            path: '/dataasset',
-            // url: require('../../assets/dataasset_slogo.svg'),
-            url: stash !=='LNRD' ? require('../../assets/dataasset_slogo.svg') : require('../../assets/dataasset_slogo_LNRD.svg'),
-          },
-          {
-            childName: '数据共享',
-            path: '/datasharing',
-            // url: require('../../assets/datasharing_slogo.svg'),
-            url: stash !=='LNRD' ? require('../../assets/datasharing_slogo.svg') : require('../../assets/datasharing_slogo_LNRD.svg'),
-          },
           {
             childName: '目录管理',
             path: '/catalog',
             // url: require('../../assets/muluguanli_slogo.png'),
             url: stash !=='LNRD' ? require('../../assets/muluguanli_slogo.png') : require('../../assets/muluguanli_slogo_LNRD.svg'),
           },
-          {
-            childName: '资源管理',
-            path: '/ziyuanguanli',
-            url: require('../../assets/ziyuanguanli_slogo.png'),
-          },
-          {
-            childName: '供需对接',
-            path: '/supply-and-demand-docking',
-            // url: require('../../assets/gongxuduijie_slogo.png'),
-            url: stash !=='LNRD' ? require('../../assets/gongxuduijie_slogo.png') : require('../../assets/gongxuduijie_slogo_LNRD.svg'),
-          },
-          {
-            childName: '数据直达',
-            path: '/cascade',
-            // url: require('../../assets/jilianguanl_slogo.png'),
-            url: stash !=='LNRD' ? require('../../assets/jilianguanl_slogo.png') : require('../../assets/jilianguanl_slogo_LNRD.svg'),
-          },
-        ]
-      : [
-          {
-            childName: '数据服务',
-            path: '/dataservice',
-            url: require('../../assets/dataservice_slogo.svg'),
-          },
-          {
-            childName: '数据资产',
-            path: '/dataasset',
-            url: require('../../assets/dataasset_slogo.svg'),
-          },
-          {
-            childName: '数据共享',
-            path: '/datasharing',
-            url: require('../../assets/datasharing_slogo.svg'),
-          },
-        ],
-  },
-  {
-    name: '数据应用',
-    url: stash !=='LNRD' ? require('../../assets/ic_shujuyingyong_m.svg') : require('../../assets/ic_shujuyingyong_m_LNRD.svg'),
-    // url: require('../../assets/ic_shujuyingyong_m.svg'),
-    children: [
-      {
-        childName: '数据标签',
-        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'),
-      },
+
+
+      
+      // {
+      //   childName: '实时开发',
+      //   path: '/dataanalytic',
+      //   // url: require('../../assets/dataanalytic_slogo.svg'),
+      //   url: stash !=='LNRD' ? require('../../assets/dataanalytic_slogo.svg') : require('../../assets/dataanalytic_slogo_LNRD.svg'),
+      // },
     ],
   },
-  {
-    name: '公共模块',
-    url: stash !=='LNRD' ? require('../../assets/ic_gonggongmokuai_m.svg') : require('../../assets/ic_gonggongmokuai_m_LNRD.svg'),
-    // url: require('../../assets/ic_gonggongmokuai_m.svg'),
-    children: ['integration', 'LNRD', 'HBJK'].includes(stash)
-      ? [
-          {
-            childName: '运维中心',
-            path: '/operate',
-            // url: require('../../assets/operate_slogo.svg'),
-            url: stash !=='LNRD' ? require('../../assets/operate_slogo.svg') : require('../../assets/operate_slogo_LNRD.svg'),
-          },
-          {
-            childName: '系统管理',
-            path: '/#/admin/user/index',
-            // url: require('../../assets/admin_slogo.svg'),
-            url: stash !=='LNRD' ? require('../../assets/admin_slogo.svg') : require('../../assets/admin_slogo_LNRD.svg'),
-          },
-          {
-            childName: '工单管理',
-            // url: require('../../assets/workorder_slogo.svg'),
-            url: stash !=='LNRD' ? require('../../assets/workorder_slogo.svg') : require('../../assets/workorder_slogo_LNRD.svg'),
-          },
-          {
-            childName: '消息中心',
-            path: '/alert',
-            // url: require('../../assets/alert_slogo.svg'),
-            url: stash !=='LNRD' ? require('../../assets/alert_slogo.svg') : require('../../assets/alert_slogo_LNRD.svg'),
-          },
-          {
-            childName: '数据安全',
-            path: '/datasecurity',
-            // url: require('../../assets/datasecurity_slogo.png'),
-            url: stash !=='LNRD' ? require('../../assets/datasecurity_slogo.png') : require('../../assets/datasecurity_slogo_LNRD.svg'),
-            
-          },
-          {
-            childName: '平台运行总览',
-            path: '/overview',
-            url: require('../../assets/ic_zonglan.png'),
-          },
-        ]
-      : (stash === 'GZW'? 
-      [
-        {
-          childName: '运维中心',
-          path: '/operate',
-          url: require('../../assets/operate_slogo.svg'),
-        },
-        {
-          childName: '系统管理',
-          path: '/data-platform/#/admin/user/index',
-          url: require('../../assets/admin_slogo.svg'),
-        },
-        {
-          childName: '工单管理',
-          url: require('../../assets/workorder_slogo.svg'),
-        },
-        {
-          childName: '消息中心',
-          path: '/alert',
-          url: require('../../assets/alert_slogo.svg'),
-        },
-        {
-          childName: '数据安全',
-          path: '/datasecurity',
-          url: require('../../assets/datasecurity_slogo.png'),
-        },
-      ] : 
-      [
-          {
-            childName: '运维中心',
-            path: '/operate',
-            url: require('../../assets/operate_slogo.svg'),
-          },
-          {
-            childName: '系统管理',
-            path: '/#/admin/user/index',
-            url: require('../../assets/admin_slogo.svg'),
-          },
-          {
-            childName: '工单管理',
-            url: require('../../assets/workorder_slogo.svg'),
-          },
-          {
-            childName: '消息中心',
-            path: '/alert',
-            url: require('../../assets/alert_slogo.svg'),
-          },
-          {
-            childName: '数据安全',
-            path: '/datasecurity',
-            url: require('../../assets/datasecurity_slogo.png'),
-          },
-        ]),
-  },
+  // {
+  //   name: '数据共享',
+  //   url: stash !=='LNRD' ? require('../../assets/ic_shujukaifang_m.svg') : require('../../assets/ic_shujukaifang_m_LNRD.svg'),
+  //   // url: require('../../assets/ic_shujukaifang_m.svg'),
+  //   children: ['integration', 'LNRD'].includes(stash)
+  //     ? [
+          
+  //         {
+  //           childName: '数据资产',
+  //           path: '/dataasset',
+  //           // url: require('../../assets/dataasset_slogo.svg'),
+  //           url: stash !=='LNRD' ? require('../../assets/dataasset_slogo.svg') : require('../../assets/dataasset_slogo_LNRD.svg'),
+  //         },
+  //         {
+  //           childName: '数据共享',
+  //           path: '/datasharing',
+  //           // url: require('../../assets/datasharing_slogo.svg'),
+  //           url: stash !=='LNRD' ? require('../../assets/datasharing_slogo.svg') : require('../../assets/datasharing_slogo_LNRD.svg'),
+  //         },
+          
+  //         {
+  //           childName: '资源管理',
+  //           path: '/ziyuanguanli',
+  //           url: require('../../assets/ziyuanguanli_slogo.png'),
+  //         },
+  //         {
+  //           childName: '供需对接',
+  //           path: '/supply-and-demand-docking',
+  //           // url: require('../../assets/gongxuduijie_slogo.png'),
+  //           url: stash !=='LNRD' ? require('../../assets/gongxuduijie_slogo.png') : require('../../assets/gongxuduijie_slogo_LNRD.svg'),
+  //         },
+  //         {
+  //           childName: '数据直达',
+  //           path: '/cascade',
+  //           // url: require('../../assets/jilianguanl_slogo.png'),
+  //           url: stash !=='LNRD' ? require('../../assets/jilianguanl_slogo.png') : require('../../assets/jilianguanl_slogo_LNRD.svg'),
+  //         },
+  //       ]
+  //     : [
+  //         {
+  //           childName: '数据服务',
+  //           path: '/dataservice',
+  //           url: require('../../assets/dataservice_slogo.svg'),
+  //         },
+          
+  //         {
+  //           childName: '数据共享',
+  //           path: '/datasharing',
+  //           url: require('../../assets/datasharing_slogo.svg'),
+  //         },
+  //       ],
+  // },
+  // {
+  //   name: '数据应用',
+  //   url: stash !=='LNRD' ? require('../../assets/ic_shujuyingyong_m.svg') : require('../../assets/ic_shujuyingyong_m_LNRD.svg'),
+  //   // url: require('../../assets/ic_shujuyingyong_m.svg'),
+  //   children: [
+      
+  //     {
+  //       childName: '综合评价系统',
+  //       path: '/evaluate',
+  //       url: stash !=='LNRD' ? require('../../assets/ic_pingjia.png') : require('../../assets/ic_pingjia_LNRD.svg'),
+  //     },
+  //   ],
+  // },
+  // {
+  //   name: '公共模块',
+  //   url: stash !=='LNRD' ? require('../../assets/ic_gonggongmokuai_m.svg') : require('../../assets/ic_gonggongmokuai_m_LNRD.svg'),
+  //   // url: require('../../assets/ic_gonggongmokuai_m.svg'),
+  //   children: ['integration', 'LNRD', 'HBJK'].includes(stash)
+  //     ? [
+  //         {
+  //           childName: '运维中心',
+  //           path: '/operate',
+  //           // url: require('../../assets/operate_slogo.svg'),
+  //           url: stash !=='LNRD' ? require('../../assets/operate_slogo.svg') : require('../../assets/operate_slogo_LNRD.svg'),
+  //         },
+  //         {
+  //           childName: '系统管理',
+  //           path: '/#/admin/user/index',
+  //           // url: require('../../assets/admin_slogo.svg'),
+  //           url: stash !=='LNRD' ? require('../../assets/admin_slogo.svg') : require('../../assets/admin_slogo_LNRD.svg'),
+  //         },
+  //         {
+  //           childName: '工单管理',
+  //           // url: require('../../assets/workorder_slogo.svg'),
+  //           url: stash !=='LNRD' ? require('../../assets/workorder_slogo.svg') : require('../../assets/workorder_slogo_LNRD.svg'),
+  //         },
+  //         {
+  //           childName: '消息中心',
+  //           path: '/alert',
+  //           // url: require('../../assets/alert_slogo.svg'),
+  //           url: stash !=='LNRD' ? require('../../assets/alert_slogo.svg') : require('../../assets/alert_slogo_LNRD.svg'),
+  //         },
+          
+  //         {
+  //           childName: '平台运行总览',
+  //           path: '/overview',
+  //           url: require('../../assets/ic_zonglan.png'),
+  //         },
+  //       ]
+  //     : (stash === 'GZW'? 
+  //     [
+        
+  //       {
+  //         childName: '系统管理',
+  //         path: '/data-platform/#/admin/user/index',
+  //         url: require('../../assets/admin_slogo.svg'),
+  //       },
+  //       {
+  //         childName: '工单管理',
+  //         url: require('../../assets/workorder_slogo.svg'),
+  //       },
+  //       {
+  //         childName: '消息中心',
+  //         path: '/alert',
+  //         url: require('../../assets/alert_slogo.svg'),
+  //       },
+  //       {
+  //         childName: '数据安全',
+  //         path: '/datasecurity',
+  //         url: require('../../assets/datasecurity_slogo.png'),
+  //       },
+  //     ] : 
+  //     [
+  //         {
+  //           childName: '运维中心',
+  //           path: '/operate',
+  //           url: require('../../assets/operate_slogo.svg'),
+  //         },
+  //         {
+  //           childName: '系统管理',
+  //           path: '/#/admin/user/index',
+  //           url: require('../../assets/admin_slogo.svg'),
+  //         },
+  //         {
+  //           childName: '工单管理',
+  //           url: require('../../assets/workorder_slogo.svg'),
+  //         },
+  //         {
+  //           childName: '消息中心',
+  //           path: '/alert',
+  //           url: require('../../assets/alert_slogo.svg'),
+  //         },
+  //         {
+  //           childName: '数据安全',
+  //           path: '/datasecurity',
+  //           url: require('../../assets/datasecurity_slogo.png'),
+  //         },
+  //       ]),
+  // },
 ];
 export const menuIconSrc = require('../../assets/menuIcon.svg');
 // export const childIconSrc = require('../../assets/childIcon.svg');

package/src/pages/ModuleMenu/index.jsx

@@ -16,7 +16,7 @@ import cn from 'classnames'
      轻量级-国资委 GZW
 *
 */
-const ModuleMenu = ({ sysName, stash = '' }) => {
+const ModuleMenu = ({ sysName, stash = 'integration' }) => {
   const [sessionMenu, setSessionMenu] = useState([]);
   const [showMenuList, setshowMenuList] = useState(false);
   const [menuList, setMenuList] = useState([]);
@@ -223,7 +223,8 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   // 跳转首页
   const toHomePage = (index) => {
     if (index === 0) {
-      window.location.href = ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
+      // window.location.href = ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
+      window.location.href = '/data-capability'
     }
   };
   const getNewMenuList = (menuGet) => {

package/src/pages/ModuleMenu/index.less

@@ -113,7 +113,7 @@
 }
 .menuIcon_size{
   width: 60px;
-  height: 49px;
+  height: 48px;
 }
 .menuIcon_size_LNRD{
   width: 75px;

package/src/pages/ModuleUser/index.jsx

@@ -208,10 +208,10 @@ const ModuleUser = ({ stash = '' }) => {
   return (
     <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
       {['integration', 'LNRD', 'HBJK'].includes(stash) && [
-        <Button type="link" onClick={jumpToExterHome} 
-        className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
-          服务门户
-        </Button>,
+        // <Button type="link" onClick={jumpToExterHome} 
+        // className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
+        //   服务门户
+        // </Button>,
         <Select
           defaultValue={curTenantId}
           className={stash === 'LNRD'? 'right-select_LNRD': stash === 'HBJK'? 'right-select_HBJK' : 'right-select'}

package/src/pages/ModuleUser/index.less

@@ -59,6 +59,7 @@
   border: none !important;
   box-shadow: none !important;
   background-color: #ffffff00 !important;
+  text-align: end !important;
 }
 :global(.right-select_LNRD> .ant-select-arrow>.anticon) {
   color: #FFFFFF !important;
@@ -69,6 +70,9 @@
 .right-select_LNRD .ant-select-selection-item{
   color: #FFFFFF !important;
 }
+.right-select_HBJK .ant-select-selection-item{
+  color: #FFFFFF !important;
+}
 
 .menu {
   :global(.anticon) {

package/src/pages/util/axios.js

@@ -4,7 +4,7 @@ import baseCof from './config';
 import getStore from './userInfo';
 import { checkToken} from './permessionUtils';
 
-let tokenValue='a1a2a1b747f644acb6e26c0e1ea79fe8';
+let tokenValue='5de3ef8171364d6ba756221655fe1310';
 // 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
 const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
 // stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级