diff --git a/ant-design-vue-jeecg/src/assets/Frame@2x.png b/ant-design-vue-jeecg/src/assets/Frame@2x.png new file mode 100644 index 0000000..346471c Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/Frame@2x.png differ diff --git a/ant-design-vue-jeecg/src/assets/Group 14@2x.png b/ant-design-vue-jeecg/src/assets/Group 14@2x.png new file mode 100644 index 0000000..8915561 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/Group 14@2x.png differ diff --git a/ant-design-vue-jeecg/src/assets/Group 14@2x1.png b/ant-design-vue-jeecg/src/assets/Group 14@2x1.png new file mode 100644 index 0000000..8cc5139 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/Group 14@2x1.png differ diff --git a/ant-design-vue-jeecg/src/assets/Group 14@2x2.png b/ant-design-vue-jeecg/src/assets/Group 14@2x2.png new file mode 100644 index 0000000..361a389 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/Group 14@2x2.png differ diff --git a/ant-design-vue-jeecg/src/assets/Group 20@2x.png b/ant-design-vue-jeecg/src/assets/Group 20@2x.png new file mode 100644 index 0000000..5e0248c Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/Group 20@2x.png differ diff --git a/ant-design-vue-jeecg/src/assets/Group 37@2x3.png b/ant-design-vue-jeecg/src/assets/Group 37@2x3.png new file mode 100644 index 0000000..21b7ff3 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/Group 37@2x3.png differ diff --git a/ant-design-vue-jeecg/src/components/menu/Contextmenu.vue b/ant-design-vue-jeecg/src/components/menu/Contextmenu.vue index f88f7b4..f968012 100644 --- a/ant-design-vue-jeecg/src/components/menu/Contextmenu.vue +++ b/ant-design-vue-jeecg/src/components/menu/Contextmenu.vue @@ -43,7 +43,9 @@ export default { }, methods: { 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) } }, @@ -52,7 +54,7 @@ export default { this.top = e.clientY this.target = e.target }, - handleClick ({key}) { + handleClick ({ key }) { this.$emit('select', key, this.target) this.$emit('update:visible', false) } @@ -61,11 +63,11 @@ export default { diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 87fa550..f6b1172 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -550,7 +550,7 @@ export const constantRouterMap = [ { path: '/atlas', - component: () => import(/* webpackChunkName: "fail" */ '@/views/xmtp/SeKnowAtlasList'), + component: () => import(/* webpackChunkName: "fail" */ '@/views/xmtp/SeKnowAtlasList'), }, //cms首页,免登录,单独访问页面 @@ -568,6 +568,28 @@ export const constantRouterMap = [ path: '/cms/detail',//这里是你需要设置新窗口打开的页面的路径 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') + + } + + ] + }, ] diff --git a/ant-design-vue-jeecg/src/permission.js b/ant-design-vue-jeecg/src/permission.js index d9de25c..e33b27a 100644 --- a/ant-design-vue-jeecg/src/permission.js +++ b/ant-design-vue-jeecg/src/permission.js @@ -29,6 +29,7 @@ const whiteList = [ '/cms/home', '/cms/major', '/cms/detail', + '/newLayout/dayu', ] // no redirect whitelist router.beforeEach((to, from, next) => { diff --git a/ant-design-vue-jeecg/src/views/newLayout/module/Demo4NewLayoutList.vue b/ant-design-vue-jeecg/src/views/newLayout/module/Demo4NewLayoutList.vue index ae92558..09e1ebf 100644 --- a/ant-design-vue-jeecg/src/views/newLayout/module/Demo4NewLayoutList.vue +++ b/ant-design-vue-jeecg/src/views/newLayout/module/Demo4NewLayoutList.vue @@ -1,13 +1,245 @@ + name: "Demo4NewLayoutList", + data () { + return { + show2: true,//图标文字的显示状态 + menus: [], + isCollapse: true, //保持折叠状态 + show: false,//保持文字的隐藏状态 + asideMenu: [ + { + path: '/home/lnfo', //地址 + label: '首页', // 菜单标识 + icon: 'menu', //图标选取的是element图表,然后拼接到上面 + }, + { + path: "/home/lnfos", + label: '视频管理', + icon: 'menu' + }, + { + path: "/user", + label: '用户管理', + icon: 'menu' + }, + ] + } + }, + methods: { + // popTimeline () { + // // 改变show的值true/false + // this.lesteps = !this.lesteps + // }, + handleOpen (key, keyPath) { + console.log(key, keyPath) + }, + handleClose (key, keyPath) { + console.log(key, keyPath) + }, + toggleCollapse () { + this.isCollapse = !this.isCollapse + // 改变show的值true/false + this.show = !this.show + // 改变show2的值true/false + this.show2 = !this.show2 + + }, + // 退出功能 + logout () { + console.log('退出') + // 清空token + // window.sessionStorage.clear() + // this.$router.push('/login') + }, - + diff --git a/ant-design-vue-jeecg/src/views/newLayout/module/Main.vue b/ant-design-vue-jeecg/src/views/newLayout/module/Main.vue new file mode 100644 index 0000000..a001688 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/newLayout/module/Main.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/newLayout/module/Msg.vue b/ant-design-vue-jeecg/src/views/newLayout/module/Msg.vue new file mode 100644 index 0000000..74b1261 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/newLayout/module/Msg.vue @@ -0,0 +1,699 @@ + + + + + \ No newline at end of file