From 7c8516f5d63fb39dd404bb9de78c8a8f0c4baf02 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 18 Mar 2022 15:48:27 +0800 Subject: [PATCH 1/4] dd --- src/views/main-content.vue | 3 ++ .../modules/base/community/communityTable.vue | 31 +++++++++++++++++-- .../modules/secretaryLog/workLog/form.vue | 4 +-- .../modules/secretaryLog/workLog/index.vue | 4 +-- src/views/tips.vue | 2 +- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 569b149f..5d3efcbd 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -134,6 +134,9 @@ export default { this.loopTips() }, + destroyed() { + this.$store.dispatch('clearInter') + }, computed: { msgList() { return this.$store.state.tipsList diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index e14dd753..91079e08 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -33,6 +33,10 @@ class="diy-button--reset" size="small" @click="resetSearch">重置 +
+ 进入 --> 查看 + @click="handleDownQr(scope.row)">二维码 { + console.log('res----1r', res) + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + console.log('filename', fileName) + this.download(res.data, fileName) //释放掉blob对象 + } else this.$message.error('下载失败') + // this.download(res.data, '1.png') + }) + }, //导出表格 async handleExport () { let title = this.agencyObj.label diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue index b203816a..51e27374 100644 --- a/src/views/modules/secretaryLog/workLog/form.vue +++ b/src/views/modules/secretaryLog/workLog/form.vue @@ -16,7 +16,7 @@ type="textarea" maxlength="100" show-word-limit - :rows="3" + :rows="4" :disabled="disabled" placeholder="请输入内容" v-model="formData.content"> @@ -30,7 +30,7 @@ type="textarea" maxlength="100" show-word-limit - :rows="3" + :rows="4" :disabled="disabled" placeholder="请输入工作事项" v-model="formData.workType"> diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue index e448cb0c..04a33afd 100644 --- a/src/views/modules/secretaryLog/workLog/index.vue +++ b/src/views/modules/secretaryLog/workLog/index.vue @@ -150,7 +150,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" - width="70%" + width="50%" top="5vh" class="dialog-h" @closed="diaClose"> @@ -309,7 +309,7 @@ export default { }, async deleteDifficulty (row) { - const url = "/gov/project/memoDifficulty/delete" + const url = "/gov/project/memoWorkDiary/delete" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/delete" let ids = [row.id] let params = { diff --git a/src/views/tips.vue b/src/views/tips.vue index 5b350bd5..b7b451d9 100644 --- a/src/views/tips.vue +++ b/src/views/tips.vue @@ -70,7 +70,7 @@ export default { } .tips-wr-desc { width: 100%; - height: 33px; + height: 32px; margin-top: 10px; padding-left: 20px; display: -webkit-box; From fc1f1c9613a7ef5d3dfdee18b745b45983ed3c4a Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 18 Mar 2022 16:40:44 +0800 Subject: [PATCH 2/4] dd --- .../secretaryLog/difficulty/difficultyForm.vue | 11 ++++++++--- .../modules/secretaryLog/humanisticCare/careForm.vue | 9 ++++++++- src/views/modules/secretaryLog/workLog/form.vue | 3 +++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue index 240a320a..3041886f 100644 --- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue +++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue @@ -17,7 +17,8 @@ type="textarea" maxlength="100" show-word-limit - :rows="3" + :rows="4" + clearable placeholder="请输入内容" v-model="formData.content"> @@ -30,7 +31,8 @@ type="textarea" maxlength="100" show-word-limit - :rows="3" + :rows="4" + clearable placeholder="请输入解决方式" v-model="formData.resolveWay"> @@ -44,6 +46,7 @@ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" + clearable placeholder="选择时间"> @@ -56,6 +59,7 @@ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" + clearable :picker-options="pickerOptions" @change="handleTime" placeholder="选择时间"> @@ -70,7 +74,8 @@ type="textarea" maxlength="100" show-word-limit - :rows="3" + :rows="4" + clearable placeholder="请输入备注" v-model="formData.remark"> diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue index 4c9fba45..27fff5c1 100644 --- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue +++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue @@ -15,6 +15,7 @@ style="display: block"> @@ -25,6 +26,7 @@ style="display: block"> @@ -35,6 +37,7 @@ style="display: block"> @@ -44,6 +47,7 @@ style="display: block"> @@ -56,7 +60,8 @@ type="textarea" maxlength="100" show-word-limit - :rows="3" + :rows="4" + clearable placeholder="请输入关怀事项" v-model="formData.content"> @@ -70,6 +75,7 @@ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" + clearable placeholder="选择时间"> @@ -82,6 +88,7 @@ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" + clearable :picker-options="pickerOptions" @change="handleTime" placeholder="选择时间"> diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue index 51e27374..56a4b6f6 100644 --- a/src/views/modules/secretaryLog/workLog/form.vue +++ b/src/views/modules/secretaryLog/workLog/form.vue @@ -17,6 +17,7 @@ maxlength="100" show-word-limit :rows="4" + clearable :disabled="disabled" placeholder="请输入内容" v-model="formData.content"> @@ -31,6 +32,7 @@ maxlength="100" show-word-limit :rows="4" + clearable :disabled="disabled" placeholder="请输入工作事项" v-model="formData.workType"> @@ -44,6 +46,7 @@ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" + clearable :disabled="disabled" :picker-options="pickerOptions" @change="handleTime" From d0c277cb20d1ccf1a818eff70755b022e2bf3e8d Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 18 Mar 2022 17:06:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/buttonstyle.scss | 12 ++++++- .../modules/base/community/communityTable.vue | 32 ++++++++++++++----- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index a5f6b533..92a5b2e3 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -81,7 +81,11 @@ background-color: #3e8ef7 !important; border-color: #3e8ef7 !important; } - +.diy-button--qrcode { + color: #fff !important; + background-color: #4ec591 !important; + border-color: #4ec591 !important; +} //table按钮样式 //查看 @@ -101,3 +105,9 @@ color: #d51010 !important; text-decoration: underline !important; } + +// +.div-table-button--qr { + color: #4ec591 !important; + text-decoration: underline !important; +} \ No newline at end of file diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 91079e08..901ec305 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -103,6 +103,10 @@ class="diy-button--reset" size="small" @click="handleExport">导出 + 社区二维码
@@ -123,11 +127,11 @@ -