From 58a57a126afc689b32bcfcfe42a0d3fc1f9c8f51 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Mon, 27 Jul 2020 17:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E4=BC=98=E5=8C=96bu?= =?UTF-8?q?g=E3=80=91-=E3=80=90=E7=BB=9F=E4=B8=80=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=AD=89bug=E3=80=91-=EF=BC=88=E9=AD=8F?= =?UTF-8?q?=E5=87=AF=EF=BC=89-2020/07/27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/analysis/export/operation.vue | 47 ++++++++-- .../issue/issue-classified-statistic.vue | 8 +- .../modules/analysis/user/gridopening.vue | 53 ++++++++--- src/views/modules/analysis/user/party.vue | 61 ++++++++---- src/views/modules/analysis/user/register.vue | 58 +++++++++--- src/views/modules/case/typicalcase-list.vue | 20 ++-- src/views/modules/custom/epidemic.vue | 8 +- .../modules/custom/evaluatedeptcount.vue | 8 +- src/views/modules/custom/evaluateofficer.vue | 4 +- .../events/issue-close-detail-view.vue | 37 +++++--- .../events/issue-process-detail-view.vue | 4 +- .../modules/events/item-close-detail-view.vue | 37 +++++--- .../modules/events/item-deal-detail-view.vue | 4 + src/views/modules/group/leaderboard.vue | 8 +- src/views/modules/group/topic-list.vue | 8 +- src/views/modules/heart/actphrase.vue | 4 +- .../modules/job/schedule-add-or-update.vue | 22 ++++- src/views/modules/news/allnews.vue | 50 ++++++++-- src/views/modules/news/news.vue | 52 +++++++--- src/views/modules/news/newsdraft.vue | 94 +++++++++---------- src/views/modules/organize/deptofficer.vue | 18 +++- src/views/modules/oss/oss-config.vue | 42 +++++++++ .../modules/sys/app-menu-add-or-update.vue | 13 ++- src/views/modules/sys/dept-add-or-update.vue | 4 + src/views/modules/sys/dict-add-or-update.vue | 25 ++++- src/views/modules/sys/menu-add-or-update.vue | 7 +- .../modules/sys/params-add-or-update.vue | 17 +++- src/views/modules/sys/params.vue | 4 +- .../modules/sys/totalconfig-add-or-update.vue | 17 +++- src/views/modules/sys/totalconfig-list.vue | 4 +- src/views/modules/sys/user-add-or-update.vue | 13 ++- src/views/modules/sys/user.vue | 4 +- 32 files changed, 543 insertions(+), 212 deletions(-) diff --git a/src/views/modules/analysis/export/operation.vue b/src/views/modules/analysis/export/operation.vue index b15653e5..7ce5a4a0 100644 --- a/src/views/modules/analysis/export/operation.vue +++ b/src/views/modules/analysis/export/operation.vue @@ -27,16 +27,27 @@ - - + + + + + + format="yyyy-MM-dd" + placeholder="选择日期时间" + style="width:250px;"> @@ -94,7 +105,23 @@ export default { options: [], categorys: [], loading: false, - timeFlag: '1' + timeFlag: '1', + pickerBeginDateBefore: { + disabledDate: (time) => { + let beginDateVal = this.dataForm.operationEndTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.operationStartTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, } }, activated () { diff --git a/src/views/modules/analysis/issue/issue-classified-statistic.vue b/src/views/modules/analysis/issue/issue-classified-statistic.vue index 15e3fed6..16b171dd 100644 --- a/src/views/modules/analysis/issue/issue-classified-statistic.vue +++ b/src/views/modules/analysis/issue/issue-classified-statistic.vue @@ -103,17 +103,17 @@ export default { }, pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } }, diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue index 4d6843e0..09c16598 100644 --- a/src/views/modules/analysis/user/gridopening.vue +++ b/src/views/modules/analysis/user/gridopening.vue @@ -25,18 +25,31 @@
- - + + + + + + - {{ $t('query') }} + {{ $t('query') }} { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, } }, created () { diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue index 23fca7a5..564accb9 100644 --- a/src/views/modules/analysis/user/party.vue +++ b/src/views/modules/analysis/user/party.vue @@ -23,16 +23,29 @@
- - - - + + + + + + + + {{ $t('query') }} @@ -148,7 +161,9 @@ export default { exportURL: '/analysis/user/export/party' }, dataForm: { - partyFlag: '1' + partyFlag: '1', + startTime:'', + endTime:'' }, time: '', options: [], @@ -181,7 +196,23 @@ export default { onLine: { id: '', onLineState: '' - } + }, + pickerBeginDateBefore: { + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, } }, created () { @@ -300,11 +331,7 @@ export default { this.dataForm.dept = choosenItem.name this.dataForm.deptId = choosenItem.id }, - setRegistTime () { - console.log(this.time[0]) - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, + // getListCategory () { // this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => { // if (res.code !== 0) { diff --git a/src/views/modules/analysis/user/register.vue b/src/views/modules/analysis/user/register.vue index 9b1f916d..c55043b2 100644 --- a/src/views/modules/analysis/user/register.vue +++ b/src/views/modules/analysis/user/register.vue @@ -11,16 +11,6 @@ :props="{ checkStrictly: true }" clearable> -
- 提交时间   - -     +
+ + + + + + + + - {{ $t('query') }} + {{ $t('query') }} { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } + } + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } + } + }, } }, created () { diff --git a/src/views/modules/case/typicalcase-list.vue b/src/views/modules/case/typicalcase-list.vue index d4d06309..063541fd 100644 --- a/src/views/modules/case/typicalcase-list.vue +++ b/src/views/modules/case/typicalcase-list.vue @@ -90,20 +90,20 @@ export default { endTime: '' }, pickerBeginDateBefore: { - disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime - if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() - } + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } + } }, pickerBeginDateAfter: { - disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime - if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() - } + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } + } } } }, diff --git a/src/views/modules/custom/epidemic.vue b/src/views/modules/custom/epidemic.vue index a41fec82..51d3340d 100644 --- a/src/views/modules/custom/epidemic.vue +++ b/src/views/modules/custom/epidemic.vue @@ -96,17 +96,17 @@ export default { options: [], pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } } diff --git a/src/views/modules/custom/evaluatedeptcount.vue b/src/views/modules/custom/evaluatedeptcount.vue index 2669b5a3..c7b719ae 100644 --- a/src/views/modules/custom/evaluatedeptcount.vue +++ b/src/views/modules/custom/evaluatedeptcount.vue @@ -97,17 +97,17 @@ export default { }, pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } } diff --git a/src/views/modules/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue index 2682c779..1bde6c4d 100644 --- a/src/views/modules/custom/evaluateofficer.vue +++ b/src/views/modules/custom/evaluateofficer.vue @@ -35,10 +35,10 @@ - {{ $t('query') }} + {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} {{ $t('export') }} diff --git a/src/views/modules/events/issue-close-detail-view.vue b/src/views/modules/events/issue-close-detail-view.vue index 04feac69..a00dbc08 100644 --- a/src/views/modules/events/issue-close-detail-view.vue +++ b/src/views/modules/events/issue-close-detail-view.vue @@ -260,19 +260,30 @@ export default { }) }, deleteComment (val) { - this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.getCommentList() - } - }) - }).catch(() => { }) + this.$confirm('是否屏蔽评论?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.getCommentList() + } + }) + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消屏蔽' + }); + }); }, clickImg (url) { this.previewImgList = [] diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue index 71dfb672..9b1a7ab9 100644 --- a/src/views/modules/events/issue-process-detail-view.vue +++ b/src/views/modules/events/issue-process-detail-view.vue @@ -122,7 +122,9 @@ prop="advice"> + maxlength="500" + placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内" + > { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.getCommentList() - } - }) - }).catch(() => {}) + this.$confirm('是否屏蔽评论?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.getCommentList() + } + }) + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消屏蔽' + }); + }); }, getInfo () { this.$http.get(`/events/item/contentDetail/${this.dataForm.id}`).then(({ data: res }) => { diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index 8e112949..719aec5c 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -146,12 +146,16 @@ prop="outHandleAdvice"> { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } }, diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue index 7141c5fc..f8275868 100644 --- a/src/views/modules/group/topic-list.vue +++ b/src/views/modules/group/topic-list.vue @@ -115,17 +115,17 @@ export default { }, pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } }, diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue index 13048726..ae3e0471 100644 --- a/src/views/modules/heart/actphrase.vue +++ b/src/views/modules/heart/actphrase.vue @@ -35,10 +35,10 @@ - {{ $t('query') }} + {{ $t('query') }} - {{ $t('add') }} diff --git a/src/views/modules/job/schedule-add-or-update.vue b/src/views/modules/job/schedule-add-or-update.vue index dde02159..78df360f 100644 --- a/src/views/modules/job/schedule-add-or-update.vue +++ b/src/views/modules/job/schedule-add-or-update.vue @@ -1,17 +1,29 @@ @@ -81,31 +103,43 @@ @@ -148,16 +184,22 @@ diff --git a/src/views/modules/sys/app-menu-add-or-update.vue b/src/views/modules/sys/app-menu-add-or-update.vue index c6ef7762..dea2ef2e 100644 --- a/src/views/modules/sys/app-menu-add-or-update.vue +++ b/src/views/modules/sys/app-menu-add-or-update.vue @@ -9,7 +9,6 @@ :model="dataForm" :rules="dataRule" ref="dataForm" - @keyup.enter.native="dataFormSubmitHandle()" label-width="120px" > @@ -22,18 +21,24 @@ - + - + - + - + - + - +