From deed4fd12c523bdcd711958a845e0cbfb9b63610 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 21 七月 2023 16:21:16 +0800
Subject: [PATCH] 路由还原
---
Source/UBCS-WEB/public/src/store/modules/tags.js | 1 -
Source/UBCS-WEB/src/permission.js | 13 ++-----------
Source/UBCS-WEB/src/page/index/index.vue | 11 +++++------
Source/UBCS-WEB/src/router/avue-router.js | 20 ++++++++------------
Source/UBCS-WEB/public/src/permission.js | 2 +-
5 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/Source/UBCS-WEB/public/src/permission.js b/Source/UBCS-WEB/public/src/permission.js
index ce2cc25..87a450b 100644
--- a/Source/UBCS-WEB/public/src/permission.js
+++ b/Source/UBCS-WEB/public/src/permission.js
@@ -36,7 +36,7 @@
if (to.query.target) {
window.open(value)
} else if (meta.isTab !== false && !validatenull(value) && !validatenull(label)) {
- store.commit('', {
+ store.commit('ADD_TAG', {
label: label,
value: value,
params: to.params,
diff --git a/Source/UBCS-WEB/public/src/store/modules/tags.js b/Source/UBCS-WEB/public/src/store/modules/tags.js
index e2d4571..72cf878 100644
--- a/Source/UBCS-WEB/public/src/store/modules/tags.js
+++ b/Source/UBCS-WEB/public/src/store/modules/tags.js
@@ -47,7 +47,6 @@
setStore({name: 'tagList', content: state.tagList})
},
DEL_TAG: (state, action) => {
- console.log('779',state,action)
state.tagList = state.tagList.filter(item => {
return !diff(item, action);
})
diff --git a/Source/UBCS-WEB/src/page/index/index.vue b/Source/UBCS-WEB/src/page/index/index.vue
index e109214..0ee7d19 100644
--- a/Source/UBCS-WEB/src/page/index/index.vue
+++ b/Source/UBCS-WEB/src/page/index/index.vue
@@ -18,9 +18,9 @@
<!-- 涓讳綋瑙嗗浘灞� -->
<div style="height:100%;overflow-y:auto;overflow-x:hidden;" id="avue-view" v-show="!isSearch">
<keep-alive>
- <router-view class="avue-view" v-if="$route.meta.keepAlive" :key="$route.fullPath"></router-view>
+ <router-view class="avue-view" v-if="$route.meta.keepAlive" :key="$route.fullPath"/>
</keep-alive>
- <router-view class="avue-view" v-if="!$route.meta.keepAlive" :key="$route.fullPath" ></router-view>
+ <router-view class="avue-view" v-if="!$route.meta.keepAlive" :key="$route.fullPath"/>
</div>
</div>
</div>
@@ -38,7 +38,7 @@
import {validatenull} from "@/util/validate";
import {calcDate} from "@/util/date.js";
import {getStore} from "@/util/store.js";
- import {getRoutes} from "@/api/system/menu"
+
export default {
components: {
top,
@@ -60,15 +60,14 @@
refreshLock: false,
//鍒锋柊token鐨勬椂闂�
refreshTime: "",
- loading:true,
- routeList:[],
- ids:[]
+ loading:true
};
},
created() {
//瀹炴椂妫�娴嬪埛鏂皌oken
this.refreshToken();
+
},
mounted() {
this.init();
diff --git a/Source/UBCS-WEB/src/permission.js b/Source/UBCS-WEB/src/permission.js
index 0a625cd..b6ca71d 100644
--- a/Source/UBCS-WEB/src/permission.js
+++ b/Source/UBCS-WEB/src/permission.js
@@ -7,8 +7,7 @@
import {validatenull} from '@/util/validate'
import {getToken} from '@/util/auth'
import NProgress from 'nprogress' // progress bar
-import 'nprogress/nprogress.css'
-import Store from "@/store"; // progress bar style
+import 'nprogress/nprogress.css' // progress bar style
NProgress.configure({showSpinner: false});
const lockPage = store.getters.website.lockPage; //閿佸睆椤�
router.beforeEach((to, from, next) => {
@@ -30,16 +29,8 @@
next({path: '/login'})
})
} else {
- const fullPath = to.fullPath
- const queryString = fullPath.split('?')[1];
const value = to.query.src || to.fullPath;
- const label = queryString === 'wupin'
- ? '鐗╁搧涓绘暟鎹�'
- : (queryString === 'renyuan'
- ? '浜哄憳涓绘暟鎹�'
- : (queryString === 'gongyingshang'
- ? '渚涘簲鍟嗕富鏁版嵁'
- : (to.query.name || to.name)));
+ const label = to.query.name || to.name;
const meta = to.meta || router.$avueRouter.meta || {};
const i18n = to.query.i18n;
if (to.query.target) {
diff --git a/Source/UBCS-WEB/src/router/avue-router.js b/Source/UBCS-WEB/src/router/avue-router.js
index 6548d8e..0e68bda 100644
--- a/Source/UBCS-WEB/src/router/avue-router.js
+++ b/Source/UBCS-WEB/src/router/avue-router.js
@@ -23,23 +23,18 @@
return result.join('&');
}
- let titileName;
this.$router.$avueRouter = {
//鍏ㄥ眬閰嶇疆
$website: this.$store.getters.website,
group: '',
meta: {},
safe: this,
- tianyuan:'',
// 璁剧疆鏍囬
setTitle: (title) => {
- titileName=title
const defaultTitle = this.$vue.$t('title');
- this.$router.$avueRouter.tianyuan=title
title = title ? `${title}-${defaultTitle}` : defaultTitle;
document.title = title;
},
-
closeTag: (value) => {
let tag = value || this.$store.getters.tag;
if (typeof value === 'string') {
@@ -90,11 +85,13 @@
},
//鍔ㄦ�佽矾鐢�
// 璺敱鏄笓闂ㄧ殑涓�涓帴鍙ｈ幏鍙�
- /**
- * aMenu: 鎺ュ彈鍒扮殑鍔ㄦ�佽矾鐢辨暟鎹� menu鐨勭粨鏋勫灞傛湁鐖剁骇path 閲岄潰鏈変竴涓猚hilden 璁板綍椤甸潰鐨勮矾鐢�
- * first: 涓轰簡鍖哄垎澶栫晫 璋冪敤formatRoutes 鍜� 褰撳墠鏂囦欢璋冪敤 formatRoutes
- */
+ /**
+ * aMenu: 鎺ュ彈鍒扮殑鍔ㄦ�佽矾鐢辨暟鎹� menu鐨勭粨鏋勫灞傛湁鐖剁骇path 閲岄潰鏈変竴涓猚hilden 璁板綍椤甸潰鐨勮矾鐢�
+ * first: 涓轰簡鍖哄垎澶栫晫 璋冪敤formatRoutes 鍜� 褰撳墠鏂囦欢璋冪敤 formatRoutes
+ */
formatRoutes: function (aMenu = [], first) {
+ // window.console.log('aMenu')
+ // window.console.log(aMenu)
const aRouter = []
// 鑾峰彇鍒板叏灞�閰嶇疆涓殑 props
const propsConfig = this.$website.menu.props;
@@ -127,7 +124,7 @@
icon = oMenu[propsDefault.icon],
children = oMenu[propsDefault.children],
meta = oMenu[propsDefault.meta] || {};
- // meta涓� keepalive 鐨勫鐞�
+ // meta涓� keepalive 鐨勫鐞�
meta = Object.assign(meta, (function () {
if (option.keepAlive === true) {
return {
@@ -182,12 +179,11 @@
/**
* 杩欓噷鏄噸鐐癸紝褰撴湁瀛愯矾鐢辩殑鏃跺�� 浼氬啀鍘绘墽琛� formatRoutes 鏂规硶锛岀劧鍚庡張浼氭湁涓�涓柊鐨� aMenu for寰幆銆�
* 鏈�鍚庤繑鍥炵殑鏄竴涓暟缁� aRouter 杩欎釜鏁扮粍灏变細浣滀负 childen鐨勫�艰 return
- */
+ */
return this.formatRoutes(children, false)
})()
}
aRouter.push(oRouter)
- // console.log(aRouter)
}
// for寰幆缁撴潫
// 杩欎釜first 鍗＄殑鍏跺疄灏辨槸棣栬矾鐢�
--
Gitblit v1.9.3