From 10b85352f5702d22eebdf516ece0f85cac6d1906 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 09:51:54 +0800 Subject: [PATCH 01/12] select --- .../orgActivity/activivityList/yearplanList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue index f7993d734..681757bd9 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue @@ -30,10 +30,10 @@ --> - 查询 + class="diy-button--search" + @click="handleSearch">查询--> From 8828fd0afb76b3cdbef3201ac85049dbca720f47 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 10:14:43 +0800 Subject: [PATCH 02/12] default time --- .../communityParty/orgActivity/activivityList/addActivity.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index 004df42c6..f78ec5ce3 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -220,7 +220,7 @@ export default { actType: '',// 活动类型，来源于活动类型接口value holdYearId: '',//活动开始时间所属年份：yyyy holdMonthId: '',//活动开始时间所属月份：yyyyMM - holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss + holdTime: new Date(),//活动开始时间：yyyy-MM-dd HH:mm:ss topic: '',// 活动主题 address: '',// 活动地址 latitude: '',//活动地点纬度 From e5d0af3f0512a9473bcc4437a89f77eb21859a2f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 10:19:50 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/calendar/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index dc3df019a..a51334f0f 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -63,6 +63,7 @@
发布 Date: Thu, 1 Sep 2022 14:08:39 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=87=A0=E4=B8=AA=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgActivity/activivityList/addRule.vue | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue index b4792926c..9fcdc3068 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue @@ -528,28 +528,28 @@ export default { } let obj = { - icPartyActId: '',//编辑活动时必传 - actType: this.actType,// 活动类型，来源于活动类型接口value - holdYearId: '',//活动开始时间所属年份：yyyy - holdMonthId: '',//活动开始时间所属月份：yyyyMM - holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss - topic: '',// 活动主题 - address: '',// 活动地址 - latitude: '',//活动地点纬度 - longitude: '',// 活动地点经度 - autoPublicType: '',//自动发布时间key; 来源于字典表接口 - publishPartyOrgId: this.defaultPublishParty.defaultPartyOrgId,// 发布活动党组织id - publishPartyOrgName: this.defaultPublishParty.defaultPartyOrgName,// 发布活动党组织名称 - publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,// 参加活动党组织ID的上级节点 - publishOrgType: this.defaultPublishParty.orgType,//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 - publishOrgPathShow: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 - joinUserType: '',//参加人员类型，0：全体党员；1：支部委员 - isAutoInform: '',// 是否自动通知参加人员，0否；1是 + icPartyActId: '',//编辑活动时必传 + actType: this.actType,// 活动类型，来源于活动类型接口value + holdYearId: '',//活动开始时间所属年份：yyyy + holdMonthId: '',//活动开始时间所属月份：yyyyMM + holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss + topic: '',// 活动主题 + address: '',// 活动地址 + latitude: '',//活动地点纬度 + longitude: '',// 活动地点经度 + autoPublicType: this.autoTimeArray[1].value ||'',//自动发布时间key; 来源于字典表接口 默认 3天 + publishPartyOrgId: this.defaultPublishParty.defaultPartyOrgId,// 发布活动党组织id + publishPartyOrgName: this.defaultPublishParty.defaultPartyOrgName,// 发布活动党组织名称 + publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,// 参加活动党组织ID的上级节点 + publishOrgType: this.defaultPublishParty.orgType,//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + publishOrgPathShow: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + joinUserType: this.joinArray[0].value ||'',//参加人员类型，0：全体党员；1：支部委员 默认 全体 + isAutoInform: '',// 是否自动通知参加人员，0否；1是 introduce: '',// 活动介绍 attachmentList: [], joinOrgList: [], - publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'), + publichIdArray: this.defaultPublishParty.defaultPartyOrgId.split(':') || [],//默认 顶级党组织 // publichIdArray: ['1536584227130798081'], joinIdArray: [], isAutoInformShow: true From 7acedbad5b0f75cb74d191e612666b44f410c418 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 1 Sep 2022 14:16:47 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=82=A8=E7=A1=AE=E5=AE=9A=E8=A6=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=A5=E6=9D=A1=E6=B4=BB=E5=8A=A8=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=90=97=E5=92=8C=E9=BB=98=E8=AE=A49=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/orgActivity/activivityList/addRule.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue index 9fcdc3068..727301384 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue @@ -60,6 +60,7 @@ format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd hh:mm:ss" type="datetime" + default-time="09:00:00" placeholder="选择日期"> @@ -471,7 +472,7 @@ export default { async handleDelete (row, tableIndex) { - this.$confirm("活动删除后不可恢复，您确定要删除吗？", "提示", { + this.$confirm("您确定要删除该条活动计划吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" From d0285ab3b4a1f0bbccf5ca5020dab941320c761d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 15:25:27 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activivityList/scheduleList.vue | 593 ++++++++++++++++++ 1 file changed, 593 insertions(+) create mode 100644 src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue new file mode 100644 index 000000000..092687a8c --- /dev/null +++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue @@ -0,0 +1,593 @@ + + + + + From 0ad302aaacd2e3d2d24783d91febced340204a75 Mon Sep 17 00:00:00 2001 From: huxiaolei <286388969@qq.com> Date: Thu, 1 Sep 2022 15:49:10 +0800 Subject: [PATCH 07/12] add styles --- .../img/modules/communityparty/ding.png | Bin 0 -> 583 bytes .../img/modules/communityparty/rili1.png | Bin 0 -> 836 bytes .../img/modules/communityparty/rili2.png | Bin 0 -> 752 bytes .../communityParty/calendar/cpts/calendar.vue | 19 ++- .../modules/communityParty/calendar/index.vue | 115 +++++++++++------- 5 files changed, 82 insertions(+), 52 deletions(-) create mode 100644 src/assets/img/modules/communityparty/ding.png create mode 100644 src/assets/img/modules/communityparty/rili1.png create mode 100644 src/assets/img/modules/communityparty/rili2.png diff --git a/src/assets/img/modules/communityparty/ding.png b/src/assets/img/modules/communityparty/ding.png new file mode 100644 index 0000000000000000000000000000000000000000..e6c2cf4d5d850eb532226d959be01bbca9243405 GIT binary patch literal 583 zcmV-N0=WH&P)Px%0ZBwbR7gv`)-h~MVH^PP->W7aBtjaYcP$buECvH66Dv_Q7z`3a6C`2~iyCPV zHi^NAL|7!6MkE#%(FKXH(B6rpQj#{BRG(b$p1ix>-TPi!-unIj|KIz6_y4|ok^lTe zS>8CidKt@#3tevuPB0X42{#Iy3oY6%t|gelM7-=_-#-J>Sb}uX*Uk8H(M26L!)nO2 z0_Rs0Y=bR05zjgqT+fH4!hbu=!cxHZn870Vmx3;UWp>28%~K%eN|6hBa%#I&O(}6b zVo%K897RSt7@ngqVoQ=2G1kH8My4BUEgG6hdVg^?TK<4c;lUhNH}NU;GR^xbF@gg* zx@{R6bGgV+-Ig{+PqA)>_t>xk=;H#1+k%zFFYI5%^W}h1br=VFc$W#*hUpA$E(LAG zg1{Pj2PgBO&9Go_k~OpZ2nAbV!C;Alcp3t>!-B!kYcC61QLuu=?8KYj4D|7_*^Xp> zVpNi{I!ro?IgX1FujUyjE}X3TCkQNY2#;F4aoss9GaOg1#TPRi-Nv_cUJ&?|)$`SV z`?U?pby%`i=2pyUjCRrA&Ckrcw6U8Kw{a?!*c40FQ}IuxIkKJE;GwAmer9WDZ4g4H zv655fZp;ZhEYP0|Oopd}%@|JZ#;mhB!M%uM*j?at&~KPkG;6)`MG<^?XBEr4{s%#b Vh#e@Wqa^?U002ovPDHLkV1m>H1pEL1 literal 0 HcmV?d00001 diff --git a/src/assets/img/modules/communityparty/rili1.png b/src/assets/img/modules/communityparty/rili1.png new file mode 100644 index 0000000000000000000000000000000000000000..9dcc8d36a8237adfe459b6ee058b77ab47289b8e GIT binary patch literal 836 zcmV-K1H1f*P)Px%{z*hZRA@u(nmuR~K@`W|n=P)gjD?L+5JV9LQ>X+qSO{WJENn!H95=HILBvAT z#)u*Y5wwum888Z_5fLF;SZS0AO!o5XbTLwS*|8s2w3f2wY1DW9(XrT@^xX$@*F)L@D(h z00z?=drXK4ZC(g5l#X$Q5UuqsBD#`Q+k-*?5hpq4mzRGE(m{t|IE{#>dql`m3z-?o zv{n+{GaQ0Q)kBLLi^EMOFSepV?m?7fhD2je0Uoysq0pM^WcBevY#B7D(gjh+V zMTo12#bjDRt-p#G#a2>h8In8?6|P8fe`Pt2j&SMQ6(^*lR9Z526){hRmXc`&<0|4R zVx^H*LtJaQ)^e@YJOge<+>E#xaWk^=Ff{$j)IC^rX+8|L@a0!2^&9|B8YA-xlXHHq zi*dD#R!YqPz-ZlYMhI~{fn?7|?h?_(`eK!cZu-9euw{>3Fwj~b0{}%to9cSh-jZh|29x_h$yon zmRhYDeQIiIU~zGAr;P|YWkgZ*X?%SAPa{rCe;DXAm~PrTA>GVwJM912ndDKHq>mW@ O0000Px%s!2paRA@u(n$L?)Q5eTR=Vfa-ntO)KC^eBNvp`c!7D^_vun~=aK(Y`vMkJDA zAz8>28%b)$!iupP3!^EbY`o08_ev?Ts}h zG7vc%!mdjgh{tLn;=%`@KWx}xM09Gi5{6=j!@r*{Tm(+X*>)fi{Rep2fm1=Q5k*|M z2OR1IA_D3T4EQ|~-daI=4LHR!h~`|$6i+~k=zwD?O+wrw?flZErVwjv5J)0KW%*N*0Nj6Zmsqe zusvdX#P*2ok?1fqJpZs4tBU$V!{#}D9|8xolYj{aj#ijgZfFlC6^#1%O**hI0Ev$k zt^z0g#kztEeQ-N>#0nff!(Iiq)Z&n9@wqPHcp8!2z>^B{r~)!F7H=87HQ=P422~N+ zAm$MXcf)vT!_Z*?R}^eD7`!x;f*Aof<0Sl^Nyqn~=O=6^oq+)W0k2oV*EFbH9}F1C ir!ojjq_WZ$1pW=Cz)wQ`_@eUw0000 + placeholder="选择年度" + size="big" + style="width: 150px;">
@@ -134,8 +134,8 @@
批量生成年度报表 + size="big" + @click="handleAddYearPlan">生成年度活动计划
Date: Thu, 1 Sep 2022 16:02:46 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgActivity/activivityList/scheduleList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue index 092687a8c..2448dcd7d 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue @@ -238,10 +238,10 @@ style="display: block"> From 6a69a632cd413e41e35e4fd7544e0a8408ab88d0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 16:17:10 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgActivity/activivityList/scheduleForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue index 342b2b3fb..ad1f5c561 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue @@ -50,10 +50,10 @@ style="display: block"> From 45190f816deb664e21342acd98c7b000c325ec64 Mon Sep 17 00:00:00 2001 From: huxiaolei <286388969@qq.com> Date: Thu, 1 Sep 2022 17:16:35 +0800 Subject: [PATCH 10/12] bug fixed --- .../communityParty/calendar/cpts/calendar.vue | 2 +- .../modules/communityParty/calendar/index.vue | 36 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue index f206e34dd..c653429eb 100644 --- a/src/views/modules/communityParty/calendar/cpts/calendar.vue +++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue @@ -198,7 +198,7 @@ export default { text-align: center; box-sizing: border-box; padding: 8px 0; - height: 90px; + height: 100px; background-color: #ffffff; opacity: 0.4; diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index 223c44bda..8fa6cbaf5 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -730,7 +730,7 @@ $red: #f33; .all-list { position: absolute; - z-index: 100; + z-index: 999999; padding: 0 10px; width: 300px; max-height: 200px; @@ -738,7 +738,7 @@ $red: #f33; background-color: rgba(#ffffff, 0.9); box-shadow: 0 0 10px 3px rgba(#000, 0.1); text-align: left; - color: #999; + color: #999999; transition: all ease 0.13s; transform: scale(0); @@ -769,26 +769,27 @@ $red: #f33; .tip { position: relative; - margin: 0 0px; - padding: 3px 2px 3px 12px; + margin: -15px 0px 0px 0px; + padding: 8px 2px 3px 12px; line-height: 18px; box-shadow: 0 0 10px 5px #eee; background-color: #ffffff; - font-size: 14px; + font-size: 12px; cursor: pointer; color: #666666; - z-index: 99999; + &:hover { .all-list { transform: scale(1); - background:#ffCC00; - color:#000000; + background:#f3ca7e; + color:#333333; font-size:14px; - border:2px #ff9900 solid; + border:1px #ffCC00 solid; border-radius:5px; line-height:20px; + z-index:9999; } } .tip-num { @@ -823,15 +824,16 @@ $red: #f33; &::before { position: absolute; - background: url("../../../../assets/img/modules/communityparty/ding.png"); + background-image: url("../../../../assets/img/modules/communityparty/ding.png"); + background-size: 26px 26px; content: ""; - left: -20px; - top: -23px; + left: 0px; + top: -56px; bottom: 0; margin: auto; display: block; - width: 28px; - height: 28px; + width: 26px; + height: 26px; } } @@ -846,10 +848,10 @@ $red: #f33; &:hover { .all-list { transform: scale(1); - background:#ffCC00; - color:#000000; + background:#f3ca7e; + color:#333333; font-size:14px; - border:2px #ff9900 solid; + border:1px #ffCC00 solid; border-radius:5px; line-height:20px; } From 020b85eff2ef41ae65c79581008fa1ccb048ba0c Mon Sep 17 00:00:00 2001 From: huxiaolei <286388969@qq.com> Date: Thu, 1 Sep 2022 17:29:57 +0800 Subject: [PATCH 11/12] style --- src/views/modules/communityParty/calendar/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index 8fa6cbaf5..0f083abe8 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -117,7 +117,7 @@ type="year" placeholder="选择年度" size="big" - style="width: 150px;"> + style="width: 100px;">
@@ -136,7 +136,7 @@
生成年度活动计划 + @click="handleAddYearPlan" style="padding-left:10px; padding-right:10px;">生成年度活动计划
Date: Thu, 1 Sep 2022 17:47:34 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/calendar/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index 0f083abe8..d703f51fe 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -604,6 +604,7 @@ export default { this.monthData[index] = parseInt(item.count); }); console.log("--------------monthData", this.monthData); + this.$forceUpdate() } } else { this.$message.error(msg); @@ -775,11 +776,11 @@ $red: #f33; box-shadow: 0 0 10px 5px #eee; background-color: #ffffff; font-size: 12px; - + cursor: pointer; color: #666666; - - + + &:hover { .all-list { transform: scale(1);