module-menu-vue 0.1.3 → 0.1.5

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -1,12 +1,12 @@
 <template>
-    <div>
+    <div :style = "{ background: stash === 'HBJK' ? '#1890ff' : '#fff' }">
         <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">
                 <img class="menuIcon_img" :src="menuIconSrc" :style="{verticalAlign: stash === 'LNRD' ? 'bottom': 'middle'}"/>
             </div>
-            <div :class="'menu_title_content'" v-show="showCollapse" @click="toHref()" :style="{lineHeight: stash === 'LNRD' ? '53px' : '49px'}">
-                <img class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" :style="{verticalAlign: stash === 'LNRD' ? 'bottom': 'middle'}"/>
-                <span class='menu_title' :style="{color: stash === 'LNRD' ? '#fff' : '#1890ff',verticalAlign: stash === 'LNRD' ? 'bottom': 'middle'}">{{getLogoAndTitle().title}}</span>
+            <div :class="'menu_title_content'" v-show="showCollapse" @click="toHref()" :style="{lineHeight: stash === 'LNRD' ? '53px' : '49px' }">
+                <img v-if="stash !== 'HBJK'" class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" :style="{verticalAlign: stash === 'LNRD' ? 'bottom': 'middle'}"/>
+                <span class='menu_title' :style="{color: stash === 'LNRD' || stash === 'HBJK'? '#fff' : '#1890ff',verticalAlign: stash === 'LNRD' ? 'bottom': 'middle'}">{{getLogoAndTitle().title}}</span>
             </div>
         </div>
         <div class='menu_list_content' :style="{ display: showMenuList ? 'block' : 'none', top: stash === 'LNRD' ? '75px' : '50px'}" @mouseenter="showMenuList = true" @mouseleave="showMenuList = false">
@@ -90,7 +90,7 @@ export default {
   },
   created () {
     this.getSessionMenu();
-    if (!["integration", 'LNRD'].includes(this.stash)) {
+    if (!["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
         this.getNewMenuList();
     }
   },
@@ -112,7 +112,7 @@ export default {
                 url = `/data-platform/#${this.systemPath}`
             } else if (this.stash === 'PANWEI') {
                 url = `/bigdata-portal/#${this.systemPath}`
-            } else if (!["integration", 'LNRD'].includes(this.stash)) {
+            } else if (!["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                 url = `/#${this.systemPath}`
             }
             location.href = url
@@ -120,7 +120,7 @@ export default {
     },
     async getSessionMenu () {
         // 一体化
-        if (["integration", 'LNRD'].includes(this.stash)) {
+        if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
             const rsp = await getMenuList()
             const rspData = rsp.data.data
             if (rspData && rspData.length > 0) {
@@ -191,7 +191,7 @@ export default {
                 thirdPartyServiceJumpPath = '/dataadmin/#/overview'
                 return;
             case '知识图谱':
-                thirdPartyServiceJumpPath = await getUrl('knowledge')
+                thirdPartyServiceJumpPath = 'http://192.168.113.235:8088'
                 break;
             case '数据可视化':
                 thirdPartyServiceJumpPath = await this.getUrl('dataview')
@@ -256,7 +256,7 @@ export default {
             default:
                 break;
         }
-        if (['平台运行总览', '知识图谱', '数据可视化', '数据填报', '知识图谱'].includes(nameStr)) {
+        if (['平台运行总览', '知识图谱', '数据可视化', '数据填报'].includes(nameStr)) {
             window.open(thirdPartyServiceJumpPath, '_blank')
         } else {
             location.href = thirdPartyServiceJumpPath
@@ -266,7 +266,7 @@ export default {
     toHomePage (index)  {
         if (index === 0) {
             let url = ''
-            if (["integration", 'LNRD'].includes(this.stash)) {
+            if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                 url = '/dataadmin/#/index'
             } else if (this.stash === "GZW") {
                 url = '/data-platform/#/index'

package/src/components/Tenant/TenantList.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dropdown @command="handleCommand" :style="{color: color, marginRight: '30px'}">
-        <span class="el-dropdown-link">
-            {{tenantName}}<i class="el-icon-arrow-down el-icon--right"></i>
+        <span class="el-dropdown-link" :style="{color: stash === 'HBJK' ? '#ffffff' : '#646669'}">
+            {{tenantName}}<i class="el-icon-arrow-down el-icon--right" :style="{color: stash === 'HBJK' ? '#ffffff' : '#646669'}"></i>
         </span>
         <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :command="item.id" v-for="item in options" :key="item.value">{{item.name}}</el-dropdown-item>
@@ -22,7 +22,11 @@ export default {
         color: {
             type: String,
             default: '#606266'
-        }
+        },
+        stash: {
+            type: String,
+            default: ''
+        
     },
     created () {
         // 每次都获取最新的租户列表

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: stash === 'LNRD' ? '#fff' : '#000000d9'}">{{getName()}}</span>
-                <i class="el-icon-arrow-down el-icon--right"></i>
+                <span :style="{color: stash === 'LNRD' || stash === 'HBJK' ? '#fff' : '#000000d9'}">{{getName()}}</span>
+                <i :style="{color: stash === 'HBJK' ? '#fff' : '#000000d9'}" 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>{{["integration", 'LNRD'].includes(stash) ? '用户中心' : '个人中心'}}</span>
+                    <span>{{["integration", 'LNRD', 'HBJK'].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 ["integration", 'LNRD'].includes(this.stash) ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
+            return ["integration", 'LNRD', 'HBJK'].includes(this.stash) ? true : this.sysName !== 'admin' && this.isHaveSystemManagementPermission
         },
     },
     props: {
@@ -63,7 +63,7 @@ export default {
         }
     },
     created() {
-        if (["integration", 'LNRD'].includes(this.stash)) {
+        if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
             this.isShowAppFunc()
         }
         if (this.stash === 'GZW') {
@@ -92,7 +92,7 @@ export default {
         handleClickmenu (flag){
             let url = ''
             if (flag === 'single') {
-                if (["integration", 'LNRD'].includes(this.stash)) {
+                if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                     url = '/admin-ui/data-share-portal/personal/info'
                 } else if (this.stash === "GZW") {
                     url = '/data-platform/#/info/index'
@@ -103,7 +103,7 @@ export default {
                 }
                 location.href = url;
             } else if (flag === 'systerm') {
-                if (["integration", 'LNRD'].includes(this.stash)) {
+                if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                     // 查询 系统管理 需要跳转的页面
                     getSysUrl().then(rsp => {
                         const data = rsp.data.data
@@ -144,19 +144,19 @@ export default {
         },
         async logoutFunc () {
             console.log('开始调用退出接口...')
-            if (["integration", 'LNRD'].includes(this.stash)) {
+            if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                 await integrationLogout();
                 this.logoutUrl()
             } else {
                 let url = ''
-                if (["integration", 'LNRD'].includes(this.stash)) {
+                if (["integration", 'LNRD', 'HBJK'].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'
+                const method = ["integration", 'LNRD', 'HBJK'].includes(this.stash) ? 'post' : 'delete'
                 Axios(url, method).then(() => {
                     this.logoutUrl();
                 })
@@ -169,7 +169,7 @@ export default {
             localStorage.clear();
             sessionStorage.clear();
             let url = ''
-            if (["integration", 'LNRD'].includes(this.stash)) {
+            if (["integration", 'LNRD', 'HBJK'].includes(this.stash)) {
                 url = '/admin-ui/login'
             } else if (this.stash === 'GZW') {
                 url = '/data-platform/#/login'