From a8fb7ae2dbb61a94141ed5e73d3bb2632b7b84df Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 15:25:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/store/index.js | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/admin/src/store/index.js b/admin/src/store/index.js
index c66e8e3..eae17b4 100644
--- a/admin/src/store/index.js
+++ b/admin/src/store/index.js
@@ -1,15 +1,25 @@
import Vue from 'vue'
import Vuex from 'vuex'
+import router from '../router'
Vue.use(Vuex)
const state = {
// 鐧诲綍鐢ㄦ埛淇℃伅
userInfo: null,
+ tableHeightNew: 300,
primaryColor: '#2080f7',
// 棣栭〉
homePage: null,
// 鑿滃崟
menuData: {
+ // 鑿滃崟鍒楄〃
+ list: [],
+ // 鏄惁鏀惰捣
+ collapse: false
+ },
+ topMenuCurrent: {
+ },
+ topMenuList: {
// 鑿滃崟鍒楄〃
list: [],
// 鏄惁鏀惰捣
@@ -38,7 +48,9 @@
...data
}
},
-
+ setTableHeightNew: (state, data) => {
+ state.tableHeightNew = data
+ },
clearUserInfo: (state) => {
state.userInfo = null
},
@@ -47,19 +59,34 @@
setHomePage (state, homePage) {
state.homePage = homePage
},
+ // 璁剧疆棣栭〉璺敱淇℃伅
+ setTopMenuCurrent (state, current) {
+ console.log("setTopMenuCurrent",current)
+ if(current.id !== state.topMenuCurrent.id){
+ state.topMenuList.list.forEach(item => {
+ console.log(item.id, item.id)
+ if (current.id == item.id) {
+ state.topMenuCurrent = current
+ state.menuData.list = item.children
+ }
+ })
+ }
+ },
// 閲嶇疆鑿滃崟
resetMenus: (state) => {
+ state.topMenuId=null
state.menuData.list = []
},
// tags
pushtags (state, val) {
// 濡傛灉绛変簬-1璇存槑tabs涓嶅瓨鍦ㄩ偅涔堟彃鍏ワ紝鍚﹀垯浠�涔堥兘涓嶅仛
// findindex鎵捐鏍囷紝寰幆鍒ゆ柇涓�涓嬶紝濡傛灉绛変簬閭ｄ箞灏变唬琛ㄦ湁鐩稿悓鐨勶紝灏变笉蹇呮坊鍔狅紝濡傛灉鎵句笉鍒伴偅灏辨槸-1.灏辨坊鍔�
+ // state.tags = [{ ...val, keepAlive: false }]
const result = state.tags.findIndex(item => item.index === val.index)
- if (result === -1) {
+ if (result === -1) {
state.tags.push({ ...val, keepAlive: false })
} else {
- state.tags[result] = { ...val, keepAlive: true }
+ state.tags[result] = { ...val, keepAlive: false }
}
// result === -1 ? state.tags.push(val) : (state.tags[result]==val)
},
--
Gitblit v1.9.3