diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 9b90b5434..77c1ae80e 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -201,6 +201,11 @@ export default { }, rules: { type: Array + }, + // 单位 M + size: { + type: Number, + default: 200 } }, watch: { @@ -322,8 +327,8 @@ export default { return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 > 200) {// eslint-disable-line - this.$message.error('文件' + file.name + '大小不超过200M') + if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line + this.$message.error('文件' + file.name + `大小不超过${ this.size }M`) return false } return true diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 50cfaa927..9a4a55234 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -253,6 +253,11 @@ title: '内外部会议', path: '/meeting', menuId: 'e5681c5ccbef386fcf50e217afdd3ff4' + }, + { + title: '政策课题', + path: '/policyTopics', + menuId: '627f66cd6746234edd4722e20d8c01bb' } ] }, diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue index 57565f70d..28fa32f6d 100644 --- a/src/pages/policyRegulation/meeting/index.vue +++ b/src/pages/policyRegulation/meeting/index.vue @@ -4,13 +4,22 @@
- + - + - + + 0) { this.data = res.data.list diff --git a/src/pages/policyRegulation/policyTopics/components/advancedSearch.vue b/src/pages/policyRegulation/policyTopics/components/advancedSearch.vue new file mode 100644 index 000000000..3c63e6987 --- /dev/null +++ b/src/pages/policyRegulation/policyTopics/components/advancedSearch.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue new file mode 100644 index 000000000..7d211f694 --- /dev/null +++ b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue @@ -0,0 +1,632 @@ + + + + + diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue new file mode 100644 index 000000000..9a29293c8 --- /dev/null +++ b/src/pages/policyRegulation/policyTopics/index.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 8fe85a36b..32a8b3e42 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3983,6 +3983,16 @@ const routes = [ title: '内外部会议', menuId: 'e5681c5ccbef386fcf50e217afdd3ff4' } + }, + { + path: '/policyTopics', + name: 'policyTopics', + component: () => import('@/pages/policyRegulation/policyTopics'), + meta: { + requireAuth: true, + title: '政策课题', + menuId: '627f66cd6746234edd4722e20d8c01bb' + } } ] },