Explorar el Código

3368 网络图

tyler hace 2 años
padre
commit
ec2b98a00a

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-element-admin",
-  "version": "4.3.2",
+  "version": "4.3.1",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "scripts": {

+ 1 - 7
src/components/TreeChart/index.vue

@@ -37,12 +37,6 @@ export default {
     myChart.on('click', (e) => {
       console.log('e:', e)
       this.$emit('clickNode', e)
-      if(e.type == 'click' && e.data.children == null){
-        setTimeout(() => {
-          // console.log(this.clickNodeList)
-          // e.data.children = this.clickNodeList
-        }, 1000)
-      }
     })
   },
   methods: {
@@ -82,7 +76,7 @@ export default {
               '<span>' +
               that.$t('atlas.highest') +
               ': ' +
-              params.data.EMP_LV_NAME + params.data.CROWN_LV_NAME +
+              params.data.EMP_LV_NAME + ',' + params.data.CROWN_LV_NAME +
               '</span>' +
               '<span>' +
               params.data.PERIOD_AT +

+ 2 - 0
src/lang/en.js

@@ -114,7 +114,9 @@ export default {
     resetPassword: 'Reset Password',
     // 二级菜单/接口-networkChart
     placementNetwork: 'Placement Network',
+    placementNetworkEx: 'Placement Network Ex',
     sponsorNetwork: 'Sponsor Network',
+    sponsorNetworkEx: 'Sponsor Network Ex',
     brandAmbassadorList: 'Brand Ambassador List',
     // 二级菜单/接口-bonusManagement
     myAccount: 'My Account',

+ 2 - 0
src/lang/zh.js

@@ -114,7 +114,9 @@ export default {
     resetPassword: '重设密码',
     // 二级菜单/接口-networkChart
     placementNetwork: '安置网络',
+    placementNetworkEx: '安置网络Ex',
     sponsorNetwork: '推荐网路',
+    sponsorNetworkEx: '推荐网路Ex',
     brandAmbassadorList: 'BA会员',
     // 二级菜单/接口-bonusManagement
     myAccount: '我的账户',

+ 3 - 3
src/layout/components/Sidebar/SidebarItem.vue

@@ -25,12 +25,12 @@
 </template>
 
 <script>
-import path from 'path'
-import { generateTitle,generateTitleWiki } from '@/utils/i18n'
+import { generateTitle, generateTitleWiki } from '@/utils/i18n'
 import { isExternal } from '@/utils/validate'
+import path from 'path'
+import FixiOSBug from './FixiOSBug'
 import Item from './Item'
 import AppLink from './Link'
-import FixiOSBug from './FixiOSBug'
 
 export default {
   name: 'SidebarItem',

+ 2 - 2
src/router/modules/atlas.js

@@ -21,13 +21,13 @@ const atlasRouter = {
     {
       path: 'network-ex', // 安置网络Ex
       component: () => import('@/views/atlas/placement-network-ex'),
-      name: 'PlacementNetworkEx',
+      name: 'placementNetworkEx',
       meta: { title: 'Placement Network Ex', icon: 'user', noCache: true }
     },
     {
       path: 'relation-ex', // 推荐网络Ex
       component: () => import('@/views/atlas/sponsor-network-ex'),
-      name: 'SponsorNetworkEx',
+      name: 'sponsorNetworkEx',
       meta: { title: 'Sponsor Network Ex', icon: 'user', noCache: true }
     },
     {

+ 8 - 5
src/store/modules/user.js

@@ -1,8 +1,8 @@
-import {backendQuickLogin, getBaseInfo, getMessageData, getUserInfo, isLoginVerify, login} from '@/api/user'
-import {getToken, removeToken, setToken} from '@/utils/auth'
-import router, {resetRouter} from '@/router'
-import usersInfo from '@/utils/usersInfo'
-import {Message} from "element-ui";
+import { backendQuickLogin, getBaseInfo, getMessageData, getUserInfo, isLoginVerify, login } from '@/api/user';
+import router, { resetRouter } from '@/router';
+import { getToken, removeToken, setToken } from '@/utils/auth';
+import usersInfo from '@/utils/usersInfo';
+import { Message } from "element-ui";
 
 const state = {
   token: getToken(),
@@ -128,6 +128,9 @@ const actions = {
     return new Promise((resolve, reject) => {
       getBaseInfo({version: 'v2'}).then(response => {
         let ret = response.data
+        console.log(ret)
+        ret.menu[3].child[2].routePath = 'atlas/network-ex'
+        ret.menu[3].child[3].routePath = 'atlas/relation-ex'
         usersInfo.clearBaseInfo()
         usersInfo.setBaseInfo(ret)
         resolve(response)

+ 1 - 1
src/views/atlas/placement-network-ex.vue

@@ -44,7 +44,7 @@ import treeChart from '@/components/TreeChart/index.vue'
 import tool from '@/utils/tool'
 
 export default {
-  name: 'PlacementNetworkEx',
+  name: 'placementNetworkEx',
   components: {
     treeChart
   },

+ 1 - 1
src/views/atlas/sponsor-network-ex.vue

@@ -45,7 +45,7 @@ import treeChart from '@/components/TreeChart/index.vue'
 import tool from '@/utils/tool'
 
 export default {
-  name: 'SponsorNetworkEx',
+  name: 'sponsorNetworkEx',
   components: {
     treeChart
   },