module-menu-vue 0.0.88 → 0.0.90

package/package.json

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

package/src/App.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app">
     <ModuleMenu></ModuleMenu>
-    <!-- <TenantList></TenantList> -->
-    <!-- <PortalBtn></PortalBtn> -->
+    <TenantList></TenantList>
+    <PortalBtn></PortalBtn>
     <UserInfo></UserInfo>
   </div>
 </template>

package/src/components/Menu/ModuleMenu.vue

@@ -1,12 +1,13 @@
 <template>
+    <!-- :class="stash === 'LNRD' ? 'backGroundImg' : ''" -->
     <div>
         <div class='menuPopupAndTitle'>
-            <div class='menuIcon' @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
+            <div class='menuIcon' :style="{background: stash === 'LNRD' ? '#EA1A1A' : '#4091f7'}" @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
                 <img class="menuIcon_img" :src="menuIconSrc" />
             </div>
-            <div class="menu_title_content" v-show="showCollapse" @click="toHref()">
+            <div :class="'menu_title_content'" v-show="showCollapse" @click="toHref()">
                 <img class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" />
-                <span class="menu_title">{{getLogoAndTitle().title}}</span>
+                <span class="menu_title" :style="{color: stash === 'LNRD' ? '#fff' : '#1890ff'}">{{getLogoAndTitle().title}}</span>
             </div>
         </div>
         <div class='menu_list_content' :style="{ display: showMenuList ? 'block' : 'none' }" @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
@@ -17,7 +18,7 @@
                       height: item.children.length > 3 ? '96px' : '70px',
                       lineHeight: item.children.length > 3 ? '45px' : '70px',
                     }">
-                    <img :src="item.url" class="middle" />
+                    <img :src="item.url" class="middle imgWidth" />
                     <span class="middle textPad" @click="toHomePage(index)">{{item.name}}</span>
                 </div>
                 <div class='rightMenu'
@@ -40,11 +41,11 @@
             </div>
             </div>
         </div>
-    </div >
+    </div>
 </template>
 
 <script>
-import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constant.js'
+import { menuList as menuListInit, menuIconSrc, sysNameMap, lnrdMenuList, lnrdSysNameMap } from './constant.js'
 import './menu.css'
 import {getMenuList, isLogoutThird} from './service.js'
 export default {
@@ -79,6 +80,8 @@ export default {
       menuList: [],
       sessionMenu: [],
       menuListInit: menuListInit,
+      lnrdMenuList,
+      lnrdSysNameMap,
       sysNameMap: sysNameMap,
       showCollapse: true,
       isExist: false,
@@ -87,7 +90,7 @@ export default {
   },
   created () {
     this.getSessionMenu();
-    if (this.stash !== "integration") {
+    if (!["integration", 'LNRD'].includes(this.stash)) {
         this.getNewMenuList();
     }
   },
@@ -104,12 +107,12 @@ export default {
     },
     toHref () {
         if (this.sysName === 'admin') {
-            location.href = this.stash === "GZW" ? `/data-platform/#${this.systemPath}` : this.stash !== "integration" ? `/#${this.systemPath}` : ''
+            location.href = this.stash === "GZW" ? `/data-platform/#${this.systemPath}` : !["integration", 'LNRD'].includes(this.stash) ? `/#${this.systemPath}` : ''
         }
     },
     async getSessionMenu () {
         // 一体化
-        if (this.stash === "integration") {
+        if (["integration", 'LNRD'].includes(this.stash)) {
             const rsp = await getMenuList()
             const rspData = rsp.data.data
             if (rspData && rspData.length > 0) {
@@ -152,7 +155,8 @@ export default {
     },
     // 获取系统logo及title
     getLogoAndTitle () {
-        let sysInfo = this.sysNameMap.find(item  => item.sysName === this.sysName);
+        const newMap = this.stash === 'LNRD' ? this.lnrdSysNameMap : this.sysNameMap
+        let sysInfo = newMap.find(item  => item.sysName === this.sysName);
         let logoAndTitle = { logoSrc: "", title: "" };
         if (sysInfo) {
             logoAndTitle.logoSrc = sysInfo.logoSrc;
@@ -228,11 +232,11 @@ export default {
     // 跳转首页
     toHomePage (index)  {
         if (index === 0) {
-            location.href = this.stash === "integration" ? '/dataadmin/#/index' : this.stash === "GZW" ? '/data-platform/#/index' : '/#/index'
+            location.href = ["integration", 'LNRD'].includes(this.stash) ? '/dataadmin/#/index' : this.stash === "GZW" ? '/data-platform/#/index' : '/#/index'
         }
     },
     getNewMenuList () {
-        let newMenuList = [...this.menuListInit];
+        let newMenuList = this.stash === 'LNRD' ? [...lnrdMenuList] : [...this.menuListInit];
         if (this.sessionMenu) {
             const pathList = this.sessionMenu.map(item  => item.path)
             // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)
@@ -259,4 +263,7 @@ export default {
     width: 15px;
     height: 15px;
 }
+.imgWidth{
+    width: 20px;
+}
 </style>

package/src/components/Menu/constant.js

@@ -211,3 +211,217 @@ export const sysNameMap = [
         logoSrc: require('../../assets/alert_logo.svg'),
     },
 ];
+
+// 辽宁人大菜单图标集合
+export const lnrdMenuList = [{
+    name: '首页',
+    url: require('../../assets/LNRD_img/ic_shouye.png'),
+    children: [],
+},
+{
+    name: '数据汇聚',
+    url: require('../../assets/LNRD_img/ic_shujuhuiju.png'),
+    children: [{
+        childName: '数据集成',
+        path: token ? '/datacollect' : '/datacollection',
+        url: require('../../assets/LNRD_img/shujujicheng_logo.png'),
+    }]
+},
+{
+    name: '数据治理',
+    url: require('../../assets/LNRD_img/ic_shujuzhili.png'),
+    children: [{
+        childName: '数据治理',
+        path: token ? '/datamanage' : '/dataManager',
+        url:require('../../assets/LNRD_img/shujuzhili_logo.png'),
+    },
+    {
+        childName: '元数据管理',
+        path: '/metadata',
+        url:require('../../assets/LNRD_img/yuanshuju_logo.png'),
+    },
+    {
+        childName: '数据质量',
+        path: token ? '/quality' : '/quality/',
+        url:require('../../assets/LNRD_img/shujuzhiliang_logo.png'),
+    }]
+},
+{
+    name: '数据开发',
+    url: require('../../assets/LNRD_img/ic_shujukaifa.png'),
+    children: [{
+        childName: '离线开发',
+        path: token ? '/datadev' : '/datadev/',
+        url:require('../../assets/LNRD_img/lixiankaifa_logo.png'),
+    },
+    {
+        childName: '实时开发',
+        path: '/dataanalytic',
+        url:require('../../assets/LNRD_img/shishikaifa_logo.png'),
+    }]
+},
+{
+    name: '数据共享',
+    url: require('../../assets/LNRD_img/ic_shujukaifang.png'),
+    children: [{
+        childName: '数据服务',
+        path: '/dataservice',
+        url:require('../../assets/LNRD_img/shujufuwu_logo.png'),
+    },
+    {
+        childName: '数据资产',
+        path: '/dataasset',
+        url:require('../../assets/LNRD_img/shujuzichan_logo.png'),
+    },
+    {
+        childName: '数据共享',
+        path: '/datasharing',
+        url:require('../../assets/LNRD_img/shujugongxiang_logo.png'),
+    },
+    {
+        childName: "目录管理",
+        path: "/catalog",
+        url: require("../../assets/ic_muluguanli.png"),
+    },
+    // {
+    //     childName: "资源管理",
+    //     path: "/ziyuanguanli",
+    //     url: require("../../assets/ic_ziyuanguanli.png"),
+    // },
+    {
+        childName: "供需对接",
+        path: "/supply-and-demand-docking",
+        url: require("../../assets/ic_gongxuduijie.png"),
+    },
+    {
+        childName: "数据直达",
+        path: "/cascade",
+        url: require("../../assets/ic_jilianguanli.png"),
+    },
+    {
+        childName: '综合评价系统',
+        path: '/evaluate',
+        url: require("../../assets/ic_pingjia.png"),
+    }]
+},
+{
+    name: '数据应用',
+    url: require('../../assets/LNRD_img/ic_shujuyingyong.png'),
+    children: [{
+        childName: '数据标签',
+        path: '',
+        url:require('../../assets/LNRD_img/shujubiaoqian_logo.png'),
+    }]
+},
+{
+    name: '公共模块',
+    url: require('../../assets/LNRD_img/ic_gonggongmokuai.png'),
+    children: [{
+        childName: '运维中心',
+        path: '/operate',
+        url:require('../../assets/LNRD_img/yunweizhongxin_logo.png'),
+    },
+    {
+        childName: '系统管理',
+        path: '/',
+        url:require('../../assets/LNRD_img/xitongguanli_logo.png'),
+    },
+    {
+        childName: '工单管理',
+        url:require('../../assets/LNRD_img/gongdanguanli_logo.png'),
+    },
+    {
+        childName: '消息中心',
+        path: '/alert',
+        url:require('../../assets/LNRD_img/xiaoxizhongxin_logo.png'),
+    },
+    {
+        childName: '数据安全',
+        path: '/datasecurity',
+        url:require('../../assets/LNRD_img/shujuanquan_logo.png'),
+    },
+    {
+        childName: '平台运行总览',
+        path: '/overview',
+        url: require('../../assets/ic_zonglan.png'),
+    }]
+}];
+
+// 辽宁人大菜单各个模块icon集合
+export const lnrdSysNameMap = [
+    {
+        sysName: 'datasecurity',
+        title: '数据安全',
+        logoSrc: require('../../assets/LNRD_sys_img/shujuanquan_sys.png'),
+    },
+    {
+        sysName: 'datacollection',
+        title: '数据集成',
+        logoSrc: require('../../assets/LNRD_sys_img/shujujicheng_sys.png'),
+    },
+    {
+        sysName: 'dataManager',
+        title: '数据治理',
+        logoSrc: require('../../assets/LNRD_sys_img/shujuzhili_sys.png'),
+    },
+    {
+        sysName: 'metadata',
+        title: '元数据管理',
+        logoSrc: require('../../assets/LNRD_sys_img/yuanshuju_sys.png'),
+    },
+    {
+        sysName: 'quality',
+        title: '数据质量',
+        logoSrc: require('../../assets/LNRD_sys_img/shujuzhiliang_sys.png'),
+    },
+    {
+        sysName: 'datadev',
+        title: '离线开发',
+        logoSrc: require('../../assets/LNRD_sys_img/lixiankaifa_sys.png'),
+    },
+    {
+        sysName: 'dataanalytic',
+        title: '实时开发',
+        logoSrc: require('../../assets/LNRD_sys_img/shishikaifa_sys.png'),
+    },
+    {
+        sysName: 'dataservice',
+        title: '数据服务',
+        logoSrc: require('../../assets/LNRD_sys_img/shujufuwu_sys.png'),
+    },
+    {
+        sysName: 'dataasset',
+        title: '数据资产',
+        logoSrc: require('../../assets/LNRD_sys_img/shujuzichan_sys.png'),
+    },
+    {
+        sysName: 'datasharing',
+        title: '数据共享',
+        logoSrc: require('../../assets/LNRD_sys_img/shujugongxiang_sys.png'),
+    },
+    // {
+    //     sysName: 'dataManager',
+    //     title: '数据标签',
+    //     logoSrc: require('../../assets/LNRD_sys_img/shujubiaoqian_sys.png'),
+    // },
+    {
+        sysName: 'operate',
+        title: '运维中心',
+        logoSrc: require('../../assets/LNRD_sys_img/yunweizhongxin_sys.png'),
+    },
+    {
+        sysName: 'admin',
+        title: token ? '应用系统配置' : '系统管理',
+        logoSrc: require('../../assets/LNRD_sys_img/xitongguanli_sys.png'),
+    },
+    // {
+    //     sysName: 'dataManager',
+    //     title: '工单管理',
+    //     logoSrc: require('../../assets/LNRD_sys_img/gongdanguanli_sys.png'),
+    // },
+    {
+        sysName: 'alert',
+        title: '消息中心',
+        logoSrc: require('../../assets/LNRD_sys_img/xiaoxizhongxin_sys.png'),
+    },
+];

package/src/components/Menu/menu.css

@@ -1,3 +1,7 @@
+.backGroundImg{
+  background-image: url('../../assets/LNRD_img/bg_taitou.png');
+  background-size: cover;
+}
 .exchangeCss{
   width: 19px;
   height: 19px;
@@ -66,7 +70,6 @@
   cursor: pointer;
   width: 60px;
   height: 49px;
-  background-color: #4091f7;
 }
 .menuIcon_img {
   height: 25px;
@@ -88,7 +91,6 @@
   vertical-align: middle;
 }
 .menu_title {
-  color: #1890ff;
   height: 32px;
   margin: 0 0 0 12px;
   font-weight: 600;

package/src/components/User/UserInfo.vue

@@ -3,13 +3,13 @@
         <el-dropdown v-show="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);">{{getName()}}</span>
+                <span :style="{color: stash === 'LNRD' ? '#fff' : '#000000d9'}">{{getName()}}</span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="single">
                     <img :src="PersonalCenterSrc" alt="" class="menuItem" />
-                    <span>{{stash === "integration" ? '用户中心' : '个人中心'}}</span>
+                    <span>{{["integration", 'LNRD'].includes(stash) ? '用户中心' : '个人中心'}}</span>
                 </el-dropdown-item>
                 <el-dropdown-item v-show="isShowSys" command="systerm">
                     <img :src="SystemManageSrc" alt="" class="menuItem" />
@@ -49,7 +49,7 @@ export default {
     computed: {
         // 是否显示系统管理菜单项
         isShowSys () {
-            return this.stash === "integration" ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
+            return ["integration", 'LNRD'].includes(this.stash) ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
         },
     },
     props: {
@@ -63,7 +63,7 @@ export default {
         }
     },
     created() {
-        if (this.stash === 'integration') {
+        if (["integration", 'LNRD'].includes(this.stash)) {
             this.isShowAppFunc()
         }
         if (this.stash === 'GZW') {
@@ -90,10 +90,10 @@ export default {
         handleClickmenu (flag){
             let url = ''
             if (flag === 'single') {
-                url = this.stash === "integration" ? '/admin-ui/data-share-portal/personal/info' : this.stash === "GZW" ? '/data-platform/#/info/index' : '/#/info/index'
+                url = ["integration", 'LNRD'].includes(this.stash) ? '/admin-ui/data-share-portal/personal/info' : this.stash === "GZW" ? '/data-platform/#/info/index' : '/#/info/index'
                 location.href = url;
             } else if (flag === 'systerm') {
-                if (this.stash === "integration") {
+                if (["integration", 'LNRD'].includes(this.stash)) {
                     // 查询 系统管理 需要跳转的页面
                     getSysUrl().then(rsp => {
                         const data = rsp.data.data
@@ -124,12 +124,12 @@ export default {
         },
         async logoutFunc () {
             console.log('开始调用退出接口...')
-            if (this.stash === 'integration') {
+            if (["integration", 'LNRD'].includes(this.stash)) {
                 await integrationLogout();
                 this.logoutUrl()
             } else {
-                const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : this.stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout'
-                const method = this.stash === 'integration'? 'post' : 'delete'
+                const url = ["integration", 'LNRD'].includes(this.stash) ? '/admin-api/system/auth/logout' : this.stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout'
+                const method = ["integration", 'LNRD'].includes(this.stash) ? 'post' : 'delete'
                 Axios(url, method).then(() => {
                     this.logoutUrl();
                 })
@@ -141,7 +141,7 @@ export default {
         logoutUrl() {
             localStorage.clear();
             sessionStorage.clear();
-            location.href = this.stash === 'integration' ? '/admin-ui/login' : this.stash === 'GZW' ? '/data-platform/#/login' : '/#/login'
+            location.href = ["integration", 'LNRD'].includes(this.stash) ? '/admin-ui/login' : this.stash === 'GZW' ? '/data-platform/#/login' : '/#/login'
         },
         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 = '5bc3fbf3cafe4a6bb33860b48e839c4a';
+let tokenValue = '5176e4d51f0343b4aa8c3f6c476af9fa';
 axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {

package/vue.config.js

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