ソースを参照

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

chenrui 3 年 前
コミット
19d8c1812a
3 ファイル変更50 行追加24 行削除
  1. 1 1
      src/components/MultiTab/MultiTab.vue
  2. 2 1
      src/store/getters.js
  3. 47 22
      src/store/modules/app.js

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -144,13 +144,13 @@ export default {
     },
     activeKey: function (newPathKey) {
       const row = this.pages.find(item => item.name == newPathKey)
-      // console.log(row, '+++', row.fullPath)
       if (row.fullPath.indexOf('/list') == -1) {
         this.$router.push({ path: row.fullPath })
       } else {
         // this.$router.push({ path: row.fullPath, query: { closeLastOldTab: true } })  //  需求:切换页签需关掉子页面
         this.$router.push({ path: row.path }) //  需求:切换页签不需关掉子页面
       }
+      this.$store.state.app.routeList = this.tabsList
     }
   },
   render () {

+ 2 - 1
src/store/getters.js

@@ -15,7 +15,8 @@ const getters = {
   multiTab: state => state.app.multiTab,
   lang: state => state.i18n.lang,
   nowRoute: state => state.app.nowRoute,
-  isShowVideo: state => state.app.isShowVideo
+  isShowVideo: state => state.app.isShowVideo,
+  routeList: state => state.app.routeList
 }
 
 export default getters

+ 47 - 22
src/store/modules/app.js

@@ -25,8 +25,9 @@ const app = {
     color: null,
     weak: false,
     multiTab: true,
-	nowRoute: '', // 当前路由
-	isShowVideo: false // 是否显示视频弹窗
+    nowRoute: '', // 当前路由
+    isShowVideo: false ,// 是否显示视频弹窗
+    routeList: [] // 路由数组
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -77,53 +78,77 @@ const app = {
       Vue.ls.set(DEFAULT_MULTI_TAB, bool)
       state.multiTab = bool
     },
-	// 当前路由
-	TOGGLE_NOW_ROUTER: (state, bool) => {
-	  state.nowRoute = bool
-	},
-	// 是否显示视频弹窗
-	IS_ShOW_VIDEO: (state, bool) => {
-		state.isShowVideo = bool
-	}
+    // 当前路由
+    TOGGLE_NOW_ROUTER: (state, bool) => {
+      state.nowRoute = bool
+    },
+    // 是否显示视频弹窗
+    IS_ShOW_VIDEO: (state, bool) => {
+      state.isShowVideo = bool
+    }
   },
   actions: {
-    setSidebar ({ commit }, type) {
+    setSidebar({
+      commit
+    }, type) {
       commit('SET_SIDEBAR_TYPE', type)
     },
-    CloseSidebar ({ commit }) {
+    CloseSidebar({
+      commit
+    }) {
       commit('CLOSE_SIDEBAR')
     },
-    ToggleDevice ({ commit }, device) {
+    ToggleDevice({
+      commit
+    }, device) {
       commit('TOGGLE_DEVICE', device)
     },
-    ToggleTheme ({ commit }, theme) {
+    ToggleTheme({
+      commit
+    }, theme) {
       commit('TOGGLE_THEME', theme)
     },
-    ToggleLayoutMode ({ commit }, mode) {
+    ToggleLayoutMode({
+      commit
+    }, mode) {
       commit('TOGGLE_LAYOUT_MODE', mode)
     },
-    ToggleFixedHeader ({ commit }, fixedHeader) {
+    ToggleFixedHeader({
+      commit
+    }, fixedHeader) {
       if (!fixedHeader) {
         commit('TOGGLE_FIXED_HEADER_HIDDEN', false)
       }
       commit('TOGGLE_FIXED_HEADER', fixedHeader)
     },
-    ToggleFixSiderbar ({ commit }, fixSiderbar) {
+    ToggleFixSiderbar({
+      commit
+    }, fixSiderbar) {
       commit('TOGGLE_FIXED_SIDERBAR', fixSiderbar)
     },
-    ToggleFixedHeaderHidden ({ commit }, show) {
+    ToggleFixedHeaderHidden({
+      commit
+    }, show) {
       commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
     },
-    ToggleContentWidth ({ commit }, type) {
+    ToggleContentWidth({
+      commit
+    }, type) {
       commit('TOGGLE_CONTENT_WIDTH', type)
     },
-    ToggleColor ({ commit }, color) {
+    ToggleColor({
+      commit
+    }, color) {
       commit('TOGGLE_COLOR', color)
     },
-    ToggleWeak ({ commit }, weakFlag) {
+    ToggleWeak({
+      commit
+    }, weakFlag) {
       commit('TOGGLE_WEAK', weakFlag)
     },
-    ToggleMultiTab ({ commit }, bool) {
+    ToggleMultiTab({
+      commit
+    }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
     }
   }