|
@@ -1,19 +1,11 @@
|
|
<template>
|
|
<template>
|
|
- <global-layout @dynamicRouterShow="dynamicRouterShow">
|
|
|
|
|
|
+ <global-layout @dynamicRouterShow="dynamicRouterShow" @removeTab="remove">
|
|
<!-- update-begin- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
|
|
<!-- update-begin- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
|
|
- <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect"/>
|
|
|
|
|
|
+ <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect" />
|
|
<!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
|
|
<!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
|
|
- <a-tabs
|
|
|
|
- @contextmenu.native="e => onContextmenu(e)"
|
|
|
|
- v-if="multipage"
|
|
|
|
- :active-key="activePage"
|
|
|
|
- class="tab-layout-tabs"
|
|
|
|
- style="height:52px"
|
|
|
|
- :hide-add="true"
|
|
|
|
- type="editable-card"
|
|
|
|
- @change="changePage"
|
|
|
|
- @tabClick="tabCallBack"
|
|
|
|
- @edit="editPage">
|
|
|
|
|
|
+ <a-tabs @contextmenu.native="e => onContextmenu(e)" v-if="multipage" :active-key="activePage"
|
|
|
|
+ class="tab-layout-tabs" style="height:52px" :hide-add="true" type="editable-card" @change="changePage"
|
|
|
|
+ @tabClick="tabCallBack" @edit="editPage">
|
|
<a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList">
|
|
<a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList">
|
|
<span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
|
|
<span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
|
|
</a-tab-pane>
|
|
</a-tab-pane>
|
|
@@ -21,10 +13,10 @@
|
|
<div style="margin: 12px 12px 0;">
|
|
<div style="margin: 12px 12px 0;">
|
|
<transition name="page-toggle">
|
|
<transition name="page-toggle">
|
|
<keep-alive v-if="multipage">
|
|
<keep-alive v-if="multipage">
|
|
- <router-view v-if="reloadFlag"/>
|
|
|
|
|
|
+ <router-view v-if="reloadFlag" @removeTab="remove" />
|
|
</keep-alive>
|
|
</keep-alive>
|
|
<template v-else>
|
|
<template v-else>
|
|
- <router-view v-if="reloadFlag"/>
|
|
|
|
|
|
+ <router-view v-if="reloadFlag" @removeTab="remove" />
|
|
</template>
|
|
</template>
|
|
</transition>
|
|
</transition>
|
|
</div>
|
|
</div>
|
|
@@ -34,8 +26,13 @@
|
|
<script>
|
|
<script>
|
|
import GlobalLayout from '@/components/page/GlobalLayout'
|
|
import GlobalLayout from '@/components/page/GlobalLayout'
|
|
import Contextmenu from '@/components/menu/Contextmenu'
|
|
import Contextmenu from '@/components/menu/Contextmenu'
|
|
- import { mixin, mixinDevice } from '@/utils/mixin.js'
|
|
|
|
- import { triggerWindowResizeEvent } from '@/utils/util'
|
|
|
|
|
|
+ import {
|
|
|
|
+ mixin,
|
|
|
|
+ mixinDevice
|
|
|
|
+ } from '@/utils/mixin.js'
|
|
|
|
+ import {
|
|
|
|
+ triggerWindowResizeEvent
|
|
|
|
+ } from '@/utils/util'
|
|
|
|
|
|
const indexKey = '/dashboard/analysis'
|
|
const indexKey = '/dashboard/analysis'
|
|
|
|
|
|
@@ -52,19 +49,34 @@
|
|
linkList: [],
|
|
linkList: [],
|
|
activePage: '',
|
|
activePage: '',
|
|
menuVisible: false,
|
|
menuVisible: false,
|
|
- menuItemList: [
|
|
|
|
- { key: '4', icon: 'reload', text: '刷 新' },
|
|
|
|
- { key: '1', icon: 'arrow-left', text: '关闭左侧' },
|
|
|
|
- { key: '2', icon: 'arrow-right', text: '关闭右侧' },
|
|
|
|
- { key: '3', icon: 'close', text: '关闭其它' }
|
|
|
|
|
|
+ menuItemList: [{
|
|
|
|
+ key: '4',
|
|
|
|
+ icon: 'reload',
|
|
|
|
+ text: '刷 新'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ key: '1',
|
|
|
|
+ icon: 'arrow-left',
|
|
|
|
+ text: '关闭左侧'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ key: '2',
|
|
|
|
+ icon: 'arrow-right',
|
|
|
|
+ text: '关闭右侧'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ key: '3',
|
|
|
|
+ icon: 'close',
|
|
|
|
+ text: '关闭其它'
|
|
|
|
+ }
|
|
],
|
|
],
|
|
- reloadFlag:true
|
|
|
|
|
|
+ reloadFlag: true
|
|
}
|
|
}
|
|
},
|
|
},
|
|
/* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用 ->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
/* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用 ->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
- provide(){
|
|
|
|
- return{
|
|
|
|
- closeCurrent:this.closeCurrent
|
|
|
|
|
|
+ provide() {
|
|
|
|
+ return {
|
|
|
|
+ closeCurrent: this.closeCurrent
|
|
}
|
|
}
|
|
},
|
|
},
|
|
/* update_end author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
/* update_end author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
@@ -79,6 +91,7 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
|
|
+ this.$bus.$on('remove', this.remove)
|
|
if (this.$route.path != indexKey) {
|
|
if (this.$route.path != indexKey) {
|
|
this.addIndexToFirst()
|
|
this.addIndexToFirst()
|
|
}
|
|
}
|
|
@@ -93,36 +106,36 @@
|
|
this.linkList.push(this.$route.fullPath)
|
|
this.linkList.push(this.$route.fullPath)
|
|
this.activePage = this.$route.fullPath
|
|
this.activePage = this.$route.fullPath
|
|
|
|
|
|
- if(!this.linkList.includes("/account/stepForm")){
|
|
|
|
-
|
|
|
|
- localStorage.removeItem("step")
|
|
|
|
- localStorage.removeItem("campaignId")
|
|
|
|
- localStorage.removeItem("pans")
|
|
|
|
- localStorage.removeItem("pansKey")
|
|
|
|
- localStorage.removeItem("appId")
|
|
|
|
|
|
+ if (!this.linkList.includes("/account/stepForm")) {
|
|
|
|
+
|
|
|
|
+ localStorage.removeItem("step")
|
|
|
|
+ localStorage.removeItem("campaignId")
|
|
|
|
+ localStorage.removeItem("pans")
|
|
|
|
+ localStorage.removeItem("pansKey")
|
|
|
|
+ localStorage.removeItem("appId")
|
|
}
|
|
}
|
|
- if(!this.linkList.includes("/account/advertisingGroup")&&!this.linkList.includes("/account/stepForm")){
|
|
|
|
- localStorage.removeItem("advertisingGroup")
|
|
|
|
- localStorage.removeItem("advertisingGroupKey")
|
|
|
|
|
|
+ if (!this.linkList.includes("/account/advertisingGroup") && !this.linkList.includes("/account/stepForm")) {
|
|
|
|
+ localStorage.removeItem("advertisingGroup")
|
|
|
|
+ localStorage.removeItem("advertisingGroupKey")
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
- '$route': function(newRoute) {
|
|
|
|
|
|
+ '$route': function (newRoute) {
|
|
//console.log("新的路由",newRoute)
|
|
//console.log("新的路由",newRoute)
|
|
this.activePage = newRoute.fullPath
|
|
this.activePage = newRoute.fullPath
|
|
if (!this.multipage) {
|
|
if (!this.multipage) {
|
|
this.linkList = [newRoute.fullPath]
|
|
this.linkList = [newRoute.fullPath]
|
|
- this.pageList = [Object.assign({},newRoute)]
|
|
|
|
- // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
|
|
- } else if(indexKey==newRoute.fullPath) {
|
|
|
|
|
|
+ this.pageList = [Object.assign({}, newRoute)]
|
|
|
|
+ // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
|
|
+ } else if (indexKey == newRoute.fullPath) {
|
|
//首页时 判断是否缓存 没有缓存 刷新之
|
|
//首页时 判断是否缓存 没有缓存 刷新之
|
|
if (newRoute.meta.keepAlive === false) {
|
|
if (newRoute.meta.keepAlive === false) {
|
|
this.routeReload()
|
|
this.routeReload()
|
|
}
|
|
}
|
|
- // update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
|
|
- }else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
|
|
|
|
|
|
+ // update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
|
|
|
|
+ } else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
|
|
this.linkList.push(newRoute.fullPath)
|
|
this.linkList.push(newRoute.fullPath)
|
|
- this.pageList.push(Object.assign({},newRoute))
|
|
|
|
|
|
+ this.pageList.push(Object.assign({}, newRoute))
|
|
// update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由,那么就强制刷新一遍
|
|
// update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由,那么就强制刷新一遍
|
|
if (newRoute.meta.keepAlive) {
|
|
if (newRoute.meta.keepAlive) {
|
|
this.routeReload()
|
|
this.routeReload()
|
|
@@ -131,32 +144,34 @@
|
|
} else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
|
|
} else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
|
|
let oldIndex = this.linkList.indexOf(newRoute.fullPath)
|
|
let oldIndex = this.linkList.indexOf(newRoute.fullPath)
|
|
let oldPositionRoute = this.pageList[oldIndex]
|
|
let oldPositionRoute = this.pageList[oldIndex]
|
|
- this.pageList.splice(oldIndex, 1, Object.assign({}, newRoute, {meta: oldPositionRoute.meta}))
|
|
|
|
|
|
+ this.pageList.splice(oldIndex, 1, Object.assign({}, newRoute, {
|
|
|
|
+ meta: oldPositionRoute.meta
|
|
|
|
+ }))
|
|
}
|
|
}
|
|
- if(!this.linkList.includes("/account/stepForm")){
|
|
|
|
|
|
+ if (!this.linkList.includes("/account/stepForm")) {
|
|
localStorage.removeItem("step")
|
|
localStorage.removeItem("step")
|
|
localStorage.removeItem("campaignId")
|
|
localStorage.removeItem("campaignId")
|
|
localStorage.removeItem("pans")
|
|
localStorage.removeItem("pans")
|
|
localStorage.removeItem("pansKey")
|
|
localStorage.removeItem("pansKey")
|
|
localStorage.removeItem("appId")
|
|
localStorage.removeItem("appId")
|
|
}
|
|
}
|
|
- if(!this.linkList.includes("/account/advertisingGroup")&&!this.linkList.includes("/account/stepForm")){
|
|
|
|
|
|
+ if (!this.linkList.includes("/account/advertisingGroup") && !this.linkList.includes("/account/stepForm")) {
|
|
localStorage.removeItem("advertisingGroup")
|
|
localStorage.removeItem("advertisingGroup")
|
|
localStorage.removeItem("advertisingGroupKey")
|
|
localStorage.removeItem("advertisingGroupKey")
|
|
}
|
|
}
|
|
- if(!this.linkList.includes("/account/originality")&&!this.linkList.includes("/account/stepForm")){
|
|
|
|
|
|
+ if (!this.linkList.includes("/account/originality") && !this.linkList.includes("/account/stepForm")) {
|
|
localStorage.removeItem("originality")
|
|
localStorage.removeItem("originality")
|
|
localStorage.removeItem("originalityKey")
|
|
localStorage.removeItem("originalityKey")
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- 'activePage': function(key) {
|
|
|
|
|
|
+ 'activePage': function (key) {
|
|
let index = this.linkList.lastIndexOf(key)
|
|
let index = this.linkList.lastIndexOf(key)
|
|
let waitRouter = this.pageList[index]
|
|
let waitRouter = this.pageList[index]
|
|
- this.$router.push(Object.assign({},waitRouter));
|
|
|
|
|
|
+ this.$router.push(Object.assign({}, waitRouter));
|
|
this.changeTitle(waitRouter.meta.title)
|
|
this.changeTitle(waitRouter.meta.title)
|
|
},
|
|
},
|
|
- 'multipage': function(newVal) {
|
|
|
|
- if(this.reloadFlag){
|
|
|
|
|
|
+ 'multipage': function (newVal) {
|
|
|
|
+ if (this.reloadFlag) {
|
|
if (!newVal) {
|
|
if (!newVal) {
|
|
this.linkList = [this.$route.fullPath]
|
|
this.linkList = [this.$route.fullPath]
|
|
this.pageList = [this.$route]
|
|
this.pageList = [this.$route]
|
|
@@ -220,7 +235,28 @@
|
|
this.$message.warning('这是最后一页,不能再关闭了啦')
|
|
this.$message.warning('这是最后一页,不能再关闭了啦')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- console.log("this.pageList ",this.pageList );
|
|
|
|
|
|
+ console.log("this.pageList ", this.pageList);
|
|
|
|
+ // this.pageList = this.pageList.filter(item => item.fullPath !== key)
|
|
|
|
+ // let index = this.linkList.indexOf(key)
|
|
|
|
+ // this.linkList = this.linkList.filter(item => item !== key)
|
|
|
|
+ // index = index >= this.linkList.length ? this.linkList.length - 1 : index
|
|
|
|
+ // this.activePage = this.linkList[index]
|
|
|
|
+ if (key == "/account/advertisingGroup") {
|
|
|
|
+ localStorage.removeItem("advertisingGroup")
|
|
|
|
+ localStorage.removeItem("advertisingGroupKey")
|
|
|
|
+ }
|
|
|
|
+ if (key == "/account/stepForm") {
|
|
|
|
+ localStorage.removeItem("step")
|
|
|
|
+ localStorage.removeItem("pans")
|
|
|
|
+ localStorage.removeItem("pansKey")
|
|
|
|
+ }
|
|
|
|
+ if (key == "/account/originality") {
|
|
|
|
+ localStorage.removeItem("originality")
|
|
|
|
+ localStorage.removeItem("originalityKey")
|
|
|
|
+ }
|
|
|
|
+ if (key == "/modules/material/materialList") {
|
|
|
|
+ localStorage.removeItem("key")
|
|
|
|
+ }
|
|
this.pageList = this.pageList.filter(item => item.fullPath !== key)
|
|
this.pageList = this.pageList.filter(item => item.fullPath !== key)
|
|
let index = this.linkList.indexOf(key)
|
|
let index = this.linkList.indexOf(key)
|
|
this.linkList = this.linkList.filter(item => item !== key)
|
|
this.linkList = this.linkList.filter(item => item !== key)
|
|
@@ -240,7 +276,8 @@
|
|
return null
|
|
return null
|
|
}
|
|
}
|
|
let pageKey = target.getAttribute('pagekey')
|
|
let pageKey = target.getAttribute('pagekey')
|
|
- pageKey = pageKey || (target.previousElementSibling ? target.previousElementSibling.getAttribute('pagekey') : null)
|
|
|
|
|
|
+ pageKey = pageKey || (target.previousElementSibling ? target.previousElementSibling.getAttribute('pagekey') :
|
|
|
|
+ null)
|
|
return pageKey || (target.firstElementChild ? this.getPageKey(target.firstElementChild, ++depth) : null)
|
|
return pageKey || (target.firstElementChild ? this.getPageKey(target.firstElementChild, ++depth) : null)
|
|
},
|
|
},
|
|
onMenuSelect(key, target) {
|
|
onMenuSelect(key, target) {
|
|
@@ -263,13 +300,13 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
/* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
/* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
- closeCurrent(){
|
|
|
|
|
|
+ closeCurrent() {
|
|
this.remove(this.activePage);
|
|
this.remove(this.activePage);
|
|
},
|
|
},
|
|
/* update_end author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
/* update_end author:wuxianquan date:20190828 for: 关闭当前tab页,供子页面调用->望菜单能配置外链,直接弹出新页面而不是嵌入iframe #428 */
|
|
closeOthers(pageKey) {
|
|
closeOthers(pageKey) {
|
|
let index = this.linkList.indexOf(pageKey)
|
|
let index = this.linkList.indexOf(pageKey)
|
|
- if (pageKey == indexKey || pageKey.indexOf('?ticke=')>=0) {
|
|
|
|
|
|
+ if (pageKey == indexKey || pageKey.indexOf('?ticke=') >= 0) {
|
|
this.linkList = this.linkList.slice(index, index + 1)
|
|
this.linkList = this.linkList.slice(index, index + 1)
|
|
this.pageList = this.pageList.slice(index, index + 1)
|
|
this.pageList = this.pageList.slice(index, index + 1)
|
|
this.activePage = this.linkList[0]
|
|
this.activePage = this.linkList[0]
|
|
@@ -306,12 +343,16 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
//update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
|
|
//update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
|
|
- dynamicRouterShow(key,title){
|
|
|
|
|
|
+ dynamicRouterShow(key, title) {
|
|
let keyIndex = this.linkList.indexOf(key)
|
|
let keyIndex = this.linkList.indexOf(key)
|
|
- if(keyIndex>=0){
|
|
|
|
|
|
+ if (keyIndex >= 0) {
|
|
let currRouter = this.pageList[keyIndex]
|
|
let currRouter = this.pageList[keyIndex]
|
|
- let meta = Object.assign({},currRouter.meta,{title:title})
|
|
|
|
- this.pageList.splice(keyIndex, 1, Object.assign({},currRouter,{meta:meta}))
|
|
|
|
|
|
+ let meta = Object.assign({}, currRouter.meta, {
|
|
|
|
+ title: title
|
|
|
|
+ })
|
|
|
|
+ this.pageList.splice(keyIndex, 1, Object.assign({}, currRouter, {
|
|
|
|
+ meta: meta
|
|
|
|
+ }))
|
|
if (key === this.activePage) {
|
|
if (key === this.activePage) {
|
|
this.changeTitle(title)
|
|
this.changeTitle(title)
|
|
}
|
|
}
|
|
@@ -320,12 +361,12 @@
|
|
//update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
|
|
//update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
|
|
|
|
|
|
//update-begin-author:taoyan date:20191008 for:路由刷新
|
|
//update-begin-author:taoyan date:20191008 for:路由刷新
|
|
- routeReload(){
|
|
|
|
|
|
+ routeReload() {
|
|
this.reloadFlag = false
|
|
this.reloadFlag = false
|
|
let ToggleMultipage = "ToggleMultipage"
|
|
let ToggleMultipage = "ToggleMultipage"
|
|
- this.$store.dispatch(ToggleMultipage,false)
|
|
|
|
- this.$nextTick(()=>{
|
|
|
|
- this.$store.dispatch(ToggleMultipage,true)
|
|
|
|
|
|
+ this.$store.dispatch(ToggleMultipage, false)
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.$store.dispatch(ToggleMultipage, true)
|
|
this.reloadFlag = true
|
|
this.reloadFlag = true
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -335,7 +376,6 @@
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style lang="less">
|
|
<style lang="less">
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* The following styles are auto-applied to elements with
|
|
* The following styles are auto-applied to elements with
|
|
* transition="page-transition" when their visibility is toggled
|
|
* transition="page-transition" when their visibility is toggled
|
|
@@ -406,15 +446,14 @@
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- .ant-tabs.ant-tabs-card > .ant-tabs-bar {
|
|
|
|
|
|
+ .ant-tabs.ant-tabs-card>.ant-tabs-bar {
|
|
.ant-tabs-tab {
|
|
.ant-tabs-tab {
|
|
border: none !important;
|
|
border: none !important;
|
|
border-bottom: 1px solid transparent !important;
|
|
border-bottom: 1px solid transparent !important;
|
|
}
|
|
}
|
|
- .ant-tabs-tab-active {
|
|
|
|
- border-color: @primary-color!important;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
+ // .ant-tabs-tab-active {
|
|
|
|
+ // border-color: @primary-color!important;
|
|
|
|
+ // }
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|