From 1b4716cb868bfdaad1d0dd0db2e1e8c9750e2091 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 23 Feb 2022 15:19:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/basicInfoMain.scss | 2 +- .../regionalParty/activitysForm.vue | 15 +++++++-------- .../modules/visual/communityParty/community.vue | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 2426483c..5729b473 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -380,7 +380,7 @@ } .div_agency_list { - z-index: 9999; + z-index: 1000; position: absolute; top: 50px; right: 600px; diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 57a6575e..04312f90 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -11,7 +11,7 @@ + prop="serviceMatterList"> + v-model="formData.unitIdList"> {{item.label}} @@ -225,10 +225,9 @@ export default { activityId: '', formData: { serviceMatter: '',//服务事项 - serviceMatterList: [], unitId: '',//单位ID - unitList: [], + unitIdList: [], title: '',//活动标题 target: '',//活动目标 content: '',//活动内容 @@ -480,7 +479,7 @@ export default { serviceMatter: '',//服务事项 serviceMatterList: [], unitId: '',//单位ID - unitList: [], + unitIdList: [], title: '',//活动标题 target: '',//活动目标 content: '',//活动内容 @@ -511,10 +510,10 @@ export default { computed: { dataRule () { return { - serviceMatter: [ + serviceMatterList: [ { required: true, message: '服务事项不能为空', trigger: 'blur' } ], - unitId: [ + unitIdList: [ { required: true, message: '单位名称不能为空', trigger: 'blur' }, ], title: [ diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index bbfb1970..c0fce993 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -143,8 +143,8 @@ export default { warningList: [], headerList: [ { title: "序号", coulmn: 'index' }, - { title: "区域化党建单位名称", coulmn: 'unitName' }, { title: "活动标题", coulmn: 'title' }, + { title: "单位名称", coulmn: 'unitName' }, { title: "活动地址", coulmn: 'address' }, { title: "服务事项", coulmn: 'serviceMatterName' }, { title: "服务人数", coulmn: 'peopleCount' }, From bf6a5ed27a1ba15fd25fb13cfab8edb256b8753c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 23 Feb 2022 15:50:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/communityParty/community.vue | 2 ++ src/views/modules/visual/communityParty/dialogInfo.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index c0fce993..67aead48 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -388,6 +388,8 @@ export default { if (code === 0) { this.detailInfo = data + this.detailInfo.serviceMatterNameShow = data.serviceMatterNameList.join(',') + this.detailInfo.unitNameShow = data.unitNameList.join(',') } else { this.$message.error(msg) } diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue index 4a521290..60db4c68 100644 --- a/src/views/modules/visual/communityParty/dialogInfo.vue +++ b/src/views/modules/visual/communityParty/dialogInfo.vue @@ -19,11 +19,11 @@ -->
服务事项： - {{ info.serviceMatterName }} + {{ info.serviceMatterNameShow }}
单位名称： - {{ info.unitName }} + {{ info.unitNameShow }}
活动标题： From 08547860d019086d02bcbe7f156cce990a130372 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 23 Feb 2022 16:14:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/communityParty/community.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index bbfb1970..3e7b5597 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -143,8 +143,8 @@ export default { warningList: [], headerList: [ { title: "序号", coulmn: 'index' }, - { title: "区域化党建单位名称", coulmn: 'unitName' }, { title: "活动标题", coulmn: 'title' }, + { title: "区域化党建单位名称", coulmn: 'unitName' }, { title: "活动地址", coulmn: 'address' }, { title: "服务事项", coulmn: 'serviceMatterName' }, { title: "服务人数", coulmn: 'peopleCount' }, @@ -756,6 +756,11 @@ export default { } .box-right { flex: 1; + // width: calc(100% - 400px); + overflow: hidden; + .pagination { + margin-top: 0; + } .box-map { height: 400px; // border: 1px solid #2865fa; From 7f377643362fd06417d12b7edaafcd1481959587 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 23 Feb 2022 16:16:22 +0800 Subject: [PATCH 4/5] dd --- src/views/modules/visual/communityParty/community.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 67aead48..816af10f 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -758,6 +758,10 @@ export default { } .box-right { flex: 1; + overflow: hidden; + .pagination { + margin-top: 0; + } .box-map { height: 400px; // border: 1px solid #2865fa; From 5f85ce33617054cf3ca8464b998b3350b85ef8f7 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 24 Feb 2022 10:00:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 18b13ef6..d5dc1da0 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -16,7 +16,7 @@ -