From 7d09f592f260be9eee48814d281d4fcb3f0e4b4e Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 14 Apr 2023 11:27:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=87=BA=E7=89=88=E7=89=A9=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/overviewSetup/index.vue | 2 +- src/pages/publication/monograph.vue | 10 +++++----- src/pages/publication/patent.vue | 7 ++++--- src/pages/publication/thesis.vue | 24 +++++++++++++----------- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue index 3b0bc4f..0792552 100644 --- a/src/pages/overviewSetup/index.vue +++ b/src/pages/overviewSetup/index.vue @@ -22,7 +22,7 @@
- +
diff --git a/src/pages/publication/monograph.vue b/src/pages/publication/monograph.vue index efb099a..d9bffb9 100644 --- a/src/pages/publication/monograph.vue +++ b/src/pages/publication/monograph.vue @@ -5,7 +5,7 @@ 出版时间：
- + @@ -43,8 +43,8 @@ export default { patentClasses: ColumnConst.patentClasses, searchTimer: null, form: { - patentClassId: '', - applicationDate: '' + monographQueryKeyWord: '', + publicationTime: '' }, classifications: [], list: [], @@ -57,7 +57,7 @@ export default { id() { this.id && this.initData() }, - 'form.title': function (val) { + 'form.monographQueryKeyWord': function (val) { clearTimeout(this.searchTimer); this.searchTimer = setTimeout(() => { this.initData(); diff --git a/src/pages/publication/patent.vue b/src/pages/publication/patent.vue index 4bd0fdd..76dd69e 100644 --- a/src/pages/publication/patent.vue +++ b/src/pages/publication/patent.vue @@ -3,7 +3,7 @@
专利类别： - +
- + @@ -60,6 +60,7 @@ export default { patentClasses: ColumnConst.patentClasses, searchTimer: null, form: { + patentQueryKeyWord: '', patentClassId: '', applicationDate: '' }, @@ -74,7 +75,7 @@ export default { id() { this.id && this.initData() }, - 'form.title': function (val) { + 'form.patentQueryKeyWord': function (val) { clearTimeout(this.searchTimer); this.searchTimer = setTimeout(() => { this.initData(); diff --git a/src/pages/publication/thesis.vue b/src/pages/publication/thesis.vue index d42040b..5cf1652 100644 --- a/src/pages/publication/thesis.vue +++ b/src/pages/publication/thesis.vue @@ -3,17 +3,18 @@
发表年度： - - - - + +
- + @@ -39,7 +40,8 @@ export default { return { searchTimer: null, form: { - + paperQueryKeyWord: '', + publicationYear: '' }, classifications: [], articles: [], @@ -52,7 +54,7 @@ export default { id() { this.id && this.initData() }, - 'form.title': function (val) { + 'form.paperQueryKeyWord': function (val) { clearTimeout(this.searchTimer); this.searchTimer = setTimeout(() => { this.initData(); 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 2/4] =?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 @@
    -
  • +
  • {{ item.title }}

    作者: {{ item.author }}

    期刊名称: {{ item.periodicalName }}

    @@ -92,7 +92,7 @@ export default { .forms { display: flex; align-items: center; - padding: 30px; + padding: 15px; margin-bottom: 20px; background-color: #fff; .item { @@ -146,6 +146,7 @@ export default { padding: 30px; margin-bottom: 15px; background-color: #fff; + cursor: pointer; } h6 { margin-bottom: 10px; From ea09b5f0bf5b2d821152f3c90a7322da6be38d95 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 14 Apr 2023 16:20:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/column/index.vue | 110 +++++++++++++++++++--------- src/pages/newsPress/index.vue | 2 +- src/pages/newsProcurement/index.vue | 2 +- 3 files changed, 79 insertions(+), 35 deletions(-) diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index f7b1f39..4cd8806 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -63,36 +63,45 @@
      -
    • -
      -

      - {{ item.classificationName }} -

      -
      {{ item.title }}
      - - {{ item.releaseTime }} {{ item.labelName && ' | ' + - item.labelName }} - -
      - +
    • + +