From 936ba62f1cb2888797ea354f47078c5228ab0cb4 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 15 Jul 2022 10:44:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPropagandaStatistics.vue | 602 +++++++++++------- .../AppPropagandaStatistics/calendarInfo.vue | 44 +- .../groupSendDetail.vue | 2 +- .../groupSendResident.vue | 164 ++++- 4 files changed, 573 insertions(+), 239 deletions(-) diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 9b32b4c4..9f5f28b8 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -1,47 +1,115 @@ diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue index 29644ea2..00397e5a 100644 --- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue +++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue @@ -29,23 +29,61 @@ export default { data() { return { date: '', - selected: [{date: '2022-07-12'}], + selected: [], list: [{ time: '11:00', info: '晴风小区志愿者活动' - }] + }], + calendarList: {}, + year: '', + month: '', + day: '', } }, components: { uniCalendar }, + created() { + this.getNowDay() + this.getData() + + }, methods: { change(val) { this.date = `${val.year} + '-' + ${val.month} + '-' + ${val.day}` }, + getNowDay() { + const date = new Date() + this.year = date.getFullYear() + this.month = date.getMonth() + 1 + }, toGroup() { uni.navigateTo({url: './groupSendResident'}) - } + }, + getData() { + this.$http.post(`/app/appmasssendingtask/statisticsCalendar`, null, { + params: {}, + }) + .then((res) => { + if (res?.data) { + this.calendarList = res.data; + var arr = Object.keys(res.data).map(key => (res.data[key])) + var calList = arr.filter(item=> (item.taskList && item.taskList.length > 0)) + this.selected = calList.map(item=> { + if(item.day>=1 && item.day<=9) { + if(this.month>=1 && this.month <=9) { + return this.year + '-' + '0' + this.month + '-' + '0' + item.day + } + } else if(item.day> 9) { + if(this.month > 9) { + return this.year + '-' + this.month + '-' + item.day + } + } + }) + console.log(this.selected); + } + }); + }, }, onShow() { document.title = '宣发日历' diff --git a/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue b/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue index de0934a6..4a7c76c6 100644 --- a/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue +++ b/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue @@ -119,7 +119,7 @@ export default { {value: 10, name: '群发送达率', label:{ normal:{ show:true, - formatter: '{d}%\n群发送达率', + formatter: `{d}%\n群发居民群`, textStyle: { fontSize: 16, }, diff --git a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue index 51ef945d..01629e5d 100644 --- a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue +++ b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue @@ -5,7 +5,7 @@
-
筛选
+
筛选
@@ -19,6 +19,57 @@
创建部门：{{ item.createUserDept }}
+ +
+
+
+
+ 取消 +
+

筛选条件

+
确定
+
+ +
+
创建人
+ +
+
+
群发时间
+
+
开始时间
+
+ + +
+
+
+
结束时间
+
+ + +
+
+
+ + + +
+
重置
+
确认
+
+
+ @@ -29,6 +80,11 @@ export default { current: 1, name: '', list: [], + filterShow: false, + startTime: '', + endTime: '', + showStart: false, + showEnd: false, } }, methods: { @@ -39,7 +95,6 @@ export default { this.$http.post(`/app/appmasssendingtask/list`, null, { params: { current: this.current, - } }).then(res=> { if(res?.data) { @@ -47,14 +102,28 @@ export default { } console.log(res); }) - } + }, + filterBtn() {}, + reset() { + this.startTime = '', + this.endTime = '' + }, + selectConfirm() {}, + confirmStart(val) { + this.startTime = val.year + '-' + val.month + '-' + val.day + }, + confirmEnd(val) { + this.endTime = val.year + '-' + val.month + '-' + val.day + }, }, onShow() { document.title = '群发居民群' + this.current = 1 this.getList() }, onReachBottom() { this.current ++ + this.getList() }, } @@ -112,5 +181,94 @@ export default { } } } + .popup { + box-sizing: border-box; + // height: 800px; + .tips { + width: 80px; + height: 6px; + background: #dddddd; + border-radius: 4px; + padding: 0 32px; + box-sizing: border-box; + margin: 32px auto 8px auto; + } + .title { + height: 48px; + line-height: 48px; + font-size: 34px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #222; + padding: 0 32px; + box-sizing: border-box; + padding-bottom: 32px; + .cancel { + display: inline-block; + width: 200px; + color: #aaa; + } + .confirm { + display: inline-block; + width: 200px; + text-align: right; + color: #333; + } + p { + display: inline-block; + width: calc(100% - 400px); + text-align: center; + font-size: 28px; + } + } + .select-content { + height: calc(100% - 100px); + overflow-y: scroll; + } + .type-list { + padding: 0 32px; + box-sizing: border-box; + margin-bottom: 32px; + .type-title { + line-height: 108px; + font-size: 32px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #333; + } + .item { + display: flex; + justify-content: space-between; + & > div:last-child { + ::v-deep .uni-input-input, + ::v-deep .uni-input-placeholder { + text-align: right; + } + } + } + .active { + background: #1365dd; + color: #fff; + } + } + .popBtn { + display: flex; + height: 98px; + line-height: 98px; + div { + width: 50%; + border: 2px solid #3399ff; + text-align: center; + } + div:first-child { + color: #3399ff; + } + div:last-child { + color: #fff; + background: #3399ff; + } + } + } + } \ No newline at end of file