From ca6c5d6426e9c84a16c85c6d85f00861e0934286 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 14 Apr 2023 14:19:57 +0800 Subject: [PATCH] =?UTF-8?q?siteId=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/article/index.js | 7 +++---- src/mixins/overview/index.js | 2 +- src/pages/article/activity.vue | 6 +++--- src/pages/article/index.vue | 6 +++--- src/pages/column/index.vue | 12 ++++++------ src/pages/column/result.vue | 4 +--- src/pages/publication/monograph.vue | 2 +- src/pages/publication/patent.vue | 2 +- src/pages/publication/thesis.vue | 5 +++-- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js index 22b5ac2..617704d 100644 --- a/src/mixins/article/index.js +++ b/src/mixins/article/index.js @@ -1,6 +1,5 @@ import Setting from '@/setting' import Util from '@/libs/util' -import { mapState } from 'vuex' export default { data() { return { @@ -8,9 +7,9 @@ export default { } }, computed: { - ...mapState('content', [ - 'site' - ]) + site() { + return this.$route.query.siteId || this.$store.state.content.site + } }, mounted() { diff --git a/src/mixins/overview/index.js b/src/mixins/overview/index.js index b256d1f..1bac983 100644 --- a/src/mixins/overview/index.js +++ b/src/mixins/overview/index.js @@ -27,7 +27,7 @@ export default { if (i == 1) path = '/overviewDevHistory?id=214' if (i == 2) path = '/overviewTrailer?id=215' if (i == 3) path = '/overviewLocation?id=216' - if (i == 4) path = '/overviewSetup?id=217' + if (i == 4) path = '/overviewSetup?id=229' this.$router.push(path + '&siteId=3') }, } diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue index 2685145..292d707 100644 --- a/src/pages/article/activity.vue +++ b/src/pages/article/activity.vue @@ -125,7 +125,7 @@ export default { // 资讯 getColumn() { this.$post(this.api.listWithTreeMenuVisible, { - siteId: this.$route.query.siteId || this.$store.state.content.site, + siteId: this.site, columnName: '', templateId: '', typeId : '', @@ -135,7 +135,7 @@ export default { this.getInfo() }).catch(err => {}) - this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => { + this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => { this.hots = Util.removeTag(data) }).catch(err => {}) }, @@ -144,7 +144,7 @@ export default { this.$post(this.api.newlyPublishedArticles, { pageNum: 1, pageSize: 5, - siteId: this.$route.query.siteId || this.$store.state.content.site + siteId: this.site }).then(({ data }) => { this.news = Util.removeTag(data.records) }).catch(res => {}) diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 398a75b..4ac59fc 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -140,7 +140,7 @@ export default { // 资讯 getColumn() { this.$post(this.api.listWithTreeMenuVisible, { - siteId: this.$route.query.siteId || this.$store.state.content.site, + siteId: this.site, columnName: '', templateId: '', typeId : '', @@ -150,7 +150,7 @@ export default { this.getInfo() }).catch(err => {}) - this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => { + this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => { this.hots = Util.removeTag(data) }).catch(err => {}) }, @@ -159,7 +159,7 @@ export default { this.$post(this.api.newlyPublishedArticles, { pageNum: 1, pageSize: 5, - siteId: this.$route.query.siteId || this.$store.state.content.site + siteId: this.site }).then(({ data }) => { this.news = Util.removeTag(data.records) }).catch(res => {}) diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index 964c7ea..f7b1f39 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -260,7 +260,7 @@ export default { }, // 获取标签 getLabel() { - this.$post(`${this.api.queryLabel}?siteId=${this.$route.query.siteId || this.site}`) + this.$post(`${this.api.queryLabel}?siteId=${this.site}`) .then(({ data }) => { this.labels = data; // 修改placeholder @@ -334,7 +334,7 @@ export default { // 右边资讯 getColumn() { this.$post(this.api.listWithTreeMenuVisible, { - siteId: this.$route.query.siteId || this.$store.state.content.site, + siteId: this.site, columnName: '', templateId: '', typeId: '', @@ -345,7 +345,7 @@ export default { }) .catch((err) => { }); - this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`) + this.$post(`${this.api.hotContent}?siteId=${this.site}`) .then(({ data }) => { this.hots = Util.removeTag(data); }) @@ -356,7 +356,7 @@ export default { this.$post(this.api.newlyPublishedArticles, { pageNum: 1, pageSize: 5, - siteId: this.$route.query.siteId || this.$store.state.content.site + siteId: this.site }) .then(({ data }) => { this.news = Util.removeTag(data.records); @@ -375,7 +375,7 @@ export default { if (left && to.level === 1 && (typeId === 2 || typeId === 3)) return false; // 出版物则跳转到出版物列表 if (to.templateId === 8) { - this.$router.replace(`/publish?id=${this.id}&siteId=${this.$route.query.siteId || this.site}`); + this.$router.replace(`/publish?id=${this.id}&siteId=${this.site}`); return; } // 跳转链接 @@ -427,7 +427,7 @@ export default { if (this.lableId.includes(e.id)) labelName.push(e.labelName); }); this.$post(this.api.newlyPublishedArticles, { - siteId: this.$route.query.siteId || this.site, + siteId: this.site, columnIds, pageNum: this.page, pageSize: this.info.pageSize, diff --git a/src/pages/column/result.vue b/src/pages/column/result.vue index 69a489c..65fc712 100644 --- a/src/pages/column/result.vue +++ b/src/pages/column/result.vue @@ -61,9 +61,7 @@ export default { getArticle() { this.setKeyword('') this.$post(this.api.newlyPublishedArticles, { - - - siteId: this.$route.query.siteId || this.site, + siteId: this.site, pageNum: 1, pageSize: 1000, title: this.title diff --git a/src/pages/publication/monograph.vue b/src/pages/publication/monograph.vue index d9bffb9..c7f83a8 100644 --- a/src/pages/publication/monograph.vue +++ b/src/pages/publication/monograph.vue @@ -99,7 +99,7 @@ export default { .forms { display: flex; align-items: center; - padding: 30px; + padding: 15px; margin-bottom: 20px; background-color: #fff; .item { diff --git a/src/pages/publication/patent.vue b/src/pages/publication/patent.vue index 76dd69e..db4fd21 100644 --- a/src/pages/publication/patent.vue +++ b/src/pages/publication/patent.vue @@ -117,7 +117,7 @@ export default { .forms { display: flex; align-items: center; - padding: 30px; + padding: 15px; margin-bottom: 20px; background-color: #fff; .item { diff --git a/src/pages/publication/thesis.vue b/src/pages/publication/thesis.vue index 5cf1652..563d72a 100644 --- a/src/pages/publication/thesis.vue +++ b/src/pages/publication/thesis.vue @@ -22,7 +22,7 @@