From 07eb9d0333e30c0c7807a0e03d477bc85c5333f6 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 4 Mar 2022 09:51:43 +0800 Subject: [PATCH 1/4] dd --- src/views/modules/base/resi.vue | 4 ++-- src/views/modules/communityParty/elegant/index.vue | 4 ++-- src/views/modules/communityService/sqzzz/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index b062a50a..0c86748f 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -542,13 +542,13 @@ export default { .post('/epmetuser/icresiuser/importExcel', formData).then(res => { console.log('res-up', res) if (res.data.code == 0 && res.data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') this.getTableData() } else this.$message.error(res.data.msg) }).catch(err => { console.log('失败', err) file.onError() //上传失败的文件会从文件列表中删除 - this.$message.error('导入失败') + // this.$message.error('导入失败') }) // await axios({ // url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel', diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index 3d8d394f..5095431e 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -385,7 +385,7 @@ export default { .post('/resi/partymember/icpartymemberstyle/import', formData).then(res => { console.log('res-up', res) if (res.data.code == 0 && res.data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') this.getTableData() } else { this.$message.error(res.data.msg) @@ -393,7 +393,7 @@ export default { }).catch(err => { console.log('失败', err) file.onError() //上传失败的文件会从文件列表中删除 - this.$message.error('导入失败') + // this.$message.error('导入失败') }) // await axios({ // url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import', diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 0524e4f5..c64bb3b1 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -284,13 +284,13 @@ export default { .post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => { console.log('res-up', res) if (res.data.code == 0 && res.data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') this.getTableData() } else this.$message.error(res.data.msg) }).catch(err => { console.log('失败', err) file.onError() //上传失败的文件会从文件列表中删除 - this.$message.error('导入失败') + // this.$message.error('导入失败') }) // axios({ // url: From 8c83da3c4eb6cb6ebafe7f148e26a30f8b01e15f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 4 Mar 2022 10:06:43 +0800 Subject: [PATCH 2/4] dd --- src/views/modules/visual/communityParty/community.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 1146ca2d..a9d7e3a5 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -436,9 +436,9 @@ export default { const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); console.log('time-rtt', this.timeFormat(start), this.timeFormat(end)) - this.timeRange = [this.timeFormat(start), this.timeFormat(end)] + this.timeRange = [this.timeFormat(start, '00:00:00'), this.timeFormat(end, '23:59:59')] }, - timeFormat (date) { + timeFormat (date, h) { if (!date || typeof date === 'string') { return false } @@ -448,7 +448,7 @@ export default { var d = date.getDate() //日 if (d < 10) d = '0' + d - return y + '-' + m + '-' + d + ' 00:00:00' + return y + '-' + m + '-' + d + ' ' + h }, async loadUnit () { const url = "/heart/serviceitem/dict-list" From 714c80b8c2051973ae745d5780f74dfd1d85903a Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 4 Mar 2022 10:31:18 +0800 Subject: [PATCH 3/4] dd --- src/views/modules/base/resi.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 0c86748f..dcdb3760 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -94,8 +94,9 @@
全选 - 删除 @@ -370,6 +371,10 @@ export default { } }, handleSelectAll (selectAllFlag) { + // if (this.tableData.length == 0) { + // this.selAllFlag = false + // return + // } this.$refs.ref_table.clearSelection(); if (selectAllFlag) { this.tableData.forEach(row => { @@ -407,7 +412,7 @@ export default { }); } else { - this.$message.warning('请先选择要删除的小区') + this.$message.warning('请先选择要删除的居民') } }, handleSizeChange (val) { From 1d05ab6b15d2eb2e898dec0b0236dc18f61ee185 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 14:23:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 10 ++++++++-- src/views/modules/base/community/communityTable.vue | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 80d8118e..c248f009 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -2,8 +2,9 @@ | 请求接口封装 | ---------------------------------------------------------------*/ import axios from "axios"; -import message from "dai-js/modules/message/message"; +// import message from "dai-js/modules/message/message"; import curry from "dai-js/tools/curry"; +import { Message } from "element-ui"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -36,7 +37,12 @@ const request = curry( // retData = Vue.$afterRequestHook(retData); // } if (res.data.code > 8000 && res.data.code < 10000) { - message.error(res.data.msg); + // message.error(res.data.msg); + Message({ + showClose: true, + message: res.data.msg, + duration: 0 + }) } reslove(retData); diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 574cc7f7..61834588 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -441,9 +441,10 @@ export default { this.loadTable() } else if (code > 8000) { // this.$message({ - // type: "success", - // message: msg - // }); + // showClose: true, + // message: msg, + // duration: 0 + // }) this.$emit('refreshTree') this.loadTable() } else {