手动解决冲突(王家东)

dev_2307
gegeya 1 year ago
parent c0c17e091b
commit d9f93d7d90
  1. BIN
      ant-design-vue-jeecg/src/assets/Frame@2x.png
  2. BIN
      ant-design-vue-jeecg/src/assets/Group 14@2x.png
  3. BIN
      ant-design-vue-jeecg/src/assets/Group 14@2x1.png
  4. BIN
      ant-design-vue-jeecg/src/assets/Group 14@2x2.png
  5. BIN
      ant-design-vue-jeecg/src/assets/Group 20@2x.png
  6. BIN
      ant-design-vue-jeecg/src/assets/Group 37@2x3.png
  7. 4
      ant-design-vue-jeecg/src/components/menu/Contextmenu.vue
  8. 21
      ant-design-vue-jeecg/src/config/router.config.js
  9. 2
      ant-design-vue-jeecg/src/permission.js

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 847 B

@ -43,7 +43,9 @@ export default {
}, },
methods: { methods: {
closeMenu (e) { closeMenu (e) {
if (this.visible === true && ['menuitemicon', 'menuitem'].indexOf(e.target.getAttribute('role')) < 0) { if (e.target.href && e.target.href.indexOf('dayu') > 0) {
window.open(e.target.href, '_blank')
} else if (this.visible === true && ['menuitemicon', 'menuitem'].indexOf(e.target.getAttribute('role')) < 0) {
this.$emit('update:visible', false) this.$emit('update:visible', false)
} }
}, },

@ -568,6 +568,27 @@ export const constantRouterMap = [
path: '/cms/detail',//这里是你需要设置新窗口打开的页面的路径 path: '/cms/detail',//这里是你需要设置新窗口打开的页面的路径
component: () => import('@/views/cms/pages/Detail/DetailView'), component: () => import('@/views/cms/pages/Detail/DetailView'),
}, },
{
path: '/newLayout/dayu',//这里是你需要设置新窗口打开的页面的路径
redirect: '/home/lnfo',
component: () => import(/* webpackChunkName: "fail" */ '@/views/newLayout/module/Demo4NewLayoutList'),
children: [
{
path: '/home/lnfo',
// name: '学生列表',
// iconChildClass: 'el-icon-watermelon',
component: () => import('@/views/newLayout/module/Main')
},
{
path: '/home/lnfos',
// name: '列表',
// iconChildClass: 'el-icon-watermelon',
component: () => import('@/views/newLayout/module/Msg')
}
]
},
] ]

@ -29,6 +29,8 @@ const whiteList = [
'/cms/home', '/cms/home',
'/cms/major', '/cms/major',
'/cms/detail', '/cms/detail',
'/newLayout/dayu',
'/home/lnfo'
] // no redirect whitelist ] // no redirect whitelist
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {

Loading…
Cancel
Save