From 6579b7d16671053b51fb7caf4ed32f411a15637a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Oct 2021 00:52:07 +0800 Subject: [PATCH] feat: There is no way the --- src/components/navMenu/index.vue | 10 +- .../pages/attributeCustom/components/laws.vue | 14 +- .../config/pages/attributeCustom/index.vue | 4 +- .../details/otherLawsStandDetails/index.vue | 2369 ++++++++ .../components/CollectionLaws.vue | 29 +- .../personal/pages/my-collection/index.vue | 10 +- .../foreignRegulationsDatabase/index.vue | 5023 ++++++++++++++--- .../js/foreignRegulationsDatabase.js | 2 + src/router/index.js | 13 +- 9 files changed, 6641 insertions(+), 833 deletions(-) create mode 100644 src/pages/details/otherLawsStandDetails/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index aa23dabc5..90a5e4c11 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -130,11 +130,11 @@ export default { menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, - // { - // title: '国内外政策', - // path: '/foreignRegulationsDatabase', - // menuId: '4DB4Y2H3NH' - // }, + { + title: '国内外政策', + path: '/foreignRegulationsDatabase', + menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' + }, // // // { // // // title: '标准制修订管理', // // // path: '/demo2One' diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue index ddb33e2fe..0282e8977 100644 --- a/src/pages/config/pages/attributeCustom/components/laws.vue +++ b/src/pages/config/pages/attributeCustom/components/laws.vue @@ -2,8 +2,8 @@ + + diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue index 2bb479f84..bf6fa495d 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue @@ -50,10 +50,10 @@
标题:{{ item.collectTitle }}
- 创建时间:{{item.creationTime}} + 创建时间:{{getDate(item.creationTime)}} - {{$t('m.cancelCollection')}} + {{$t('m.cancelCollection')}} @@ -144,6 +144,9 @@ export default { } }, methods: { + getDate (date) { + return date != null ? date.substring(0, date.indexOf(' ')) : '' + }, // 对话框关闭清除表单 noteChange (type) { if (!type) { @@ -271,33 +274,17 @@ export default { this.$http.get('person/personCollect/page', { pageNo: this.page, pageSize: this.$store.getters.userInfo.configContent, - modeType: 'LAWS', + modeType: 'LAWS_STAND', collectTitle: this.search.collectionLaws, userId: this.$store.getters.userInfo.userId }, { _this: this, loading: 'loading' }, res => { - // for (let i = 0; i < res.data.list.length; i++) { - // res.data.list[i].check = false - // res.data.list[i].checked = false - // res.data.list[i].seeBtn = '查看笔记' - // } this.lawsList = [] - res.data.list.map((item, index) => { - item.checked = false - }) - this.lawsList = res.data.list - this.total = res.data.count + this.lawsList = res.data.records + this.total = res.data.total this.contentOpen = true - // if (this.saveNote !== '') { - // this.lawsList[this.saveNote].check = true - // if (this.lawsList[this.saveNote].check === true) { - // this.lawsList[this.saveNote].seeBtn = '关闭笔记' - // } else { - // this.lawsList[this.saveNote].seeBtn = '查看笔记' - // } - // } }, e => {}) }, // 取消收藏 diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue index 2f383b30e..191b8146c 100644 --- a/src/pages/personal/pages/my-collection/index.vue +++ b/src/pages/personal/pages/my-collection/index.vue @@ -25,10 +25,12 @@ export default { // { // title: '已收藏的动态&资料 ', // name: 'CollectionDynamics' - // }, { - // title: '已收藏的政策', - // name: 'CollectionLaws' - // }, { + // }, + { + title: '已收藏的政策', + name: 'CollectionLaws' + }, + // { // title: '已收藏的标准拆分', // name: 'CollectionBreak' // } diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 58011f326..8b84c1756 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -1,521 +1,643 @@ - +