From 3da320db774e76fc11eae350ff7e0be786294c3a Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 8 Feb 2023 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=B3=BB=E7=BB=9F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/navbar/index.vue | 2 +- src/pages/exp/index.vue | 11 ++- src/pages/news/index.vue | 9 +- src/pages/science/index.vue | 18 ++-- src/pages/sfel/index.vue | 170 +++++++++++++++++++------------- src/pages/talent/index.vue | 75 ++++++++++---- src/pages/userSharing/index.vue | 23 +++-- src/setting.js | 4 +- 8 files changed, 203 insertions(+), 109 deletions(-) diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 022e270..31d7df2 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -63,7 +63,7 @@ export default { }).then(({ data }) => { this.menus = data if (data.length) { - if (!this.$route.query.id && this.$route.path !== '/column/result') this.$router.replace(`/column?id=${data[0].id}&siteId=${data[0].siteId}`) + if (!this.$route.query.id && !this.$route.query.articleId && this.$route.path !== '/column/result') this.$router.replace(`/column?id=${data[0].id}&siteId=${data[0].siteId}`) if (!this.active) this.active = data[0].id this.$nextTick(() => { const menu = document.querySelectorAll('.el-submenu') diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue index 894e4ca..c5a6d43 100644 --- a/src/pages/exp/index.vue +++ b/src/pages/exp/index.vue @@ -13,8 +13,8 @@
EXPERIMENT STATIONS
+EXPERIMENT STATIONS