@@ -51,35 +52,59 @@
宣发明细
-
筛选
+
+ 近七天
+ 近30天
+ 近1年
+
-
+
+
+
+
@@ -97,25 +122,113 @@ export default {
brokenEcharts3: null,
columnarEcharts: null,
filterShow: false,
+ customShow: false,
+ timeList: ['近7天', '近30天', '近1年','自定义'],
+ timeSelect: 0,
+ start: '',
+ end: '',
+ deptList: [],
+ nowDate: '',
+ calendarList: [],
+ colData: {},
+ detailType: 0,
+ timeType: '',
+ departId: '',
+ startTime: '',
+ endTime: '',
}
},
onShow() {
document.title = '宣发统计'
+ this.getData()
+ this.getNowDate()
},
mounted() {
this.getBrokenEcharts1()
this.getBrokenEcharts2()
this.getBrokenEcharts3()
this.getColumnarEcharts()
+ this.getColData()
},
methods: {
showMore() {},
+
+ checkTime(index) {
+ if(index == 3) {
+ this.timeSelect = index
+ this.customShow = true
+ } else {
+ this.timeSelect = index
+ }
+ },
readMore() {
uni.navigateTo({url: `./calendarInfo`})
},
- // 折线图
+ // 重置
+ reset() {
+ this.timeType = 0
+ this.startTime = ''
+ this.endTime = ''
+ this.departId = ''
+ },
+
+ selectConfirm() {
+ if(this.timeSelect == 3) {
+ this.timeType = this.timeSelect
+ this.startTime = this.start
+ this.endTime = this.end
+ this.getBrokenDate()
+ } else {
+ this.timeType = this.timeSelect
+ this.getBrokenDate()
+ }
+ this.filterShow = false
+
+ },
+
+ handleTime() {
+ this.startTime = this.start
+ this.endTime = this.end
+ this.customShow = false
+ },
+
+ getNowDate() {
+ let date = new Date()
+ this.nowDate = date.getDate()
+ // console.log(this.nowDate);
+ },
+ // 宣发日历
+ getData() {
+ this.$http.post(`/app/appmasssendingtask/statisticsCalendar`, null, {
+ params: {
+
+ }
+ }).then((res)=> {{
+ if(res?.data) {
+ this.calendarList = res.data
+ }
+ }})
+ },
+
+
+ // 宣发效果
+ getBrokenDate() {
+ this.$http.post(`/app/appmasssendingtask/statisticsEffect`, null, {
+ params: {
+ type: this.timeSelect,
+ startTime: this.startTime,
+ endTime: this.endTime,
+ departId: this.departId
+ }
+ }).then(res=>{
+ if(res?.data) {
+ console.log(res);
+ }
+ })
+ },
+ // 触发人数
getBrokenEcharts1() {
this.brokenEcharts1 = echarts.init(document.getElementById('brokenEcharts1'))
this.brokenEcharts1.setOption({
@@ -170,6 +283,7 @@ export default {
]
})
},
+ // 宣发次数
getBrokenEcharts2() {
this.brokenEcharts2 = echarts.init(document.getElementById('brokenEcharts2'))
this.brokenEcharts2.setOption({
@@ -224,6 +338,7 @@ export default {
]
})
},
+ // 宣发任务数
getBrokenEcharts3() {
this.brokenEcharts3 = echarts.init(document.getElementById('brokenEcharts3'))
this.brokenEcharts3.setOption({
@@ -278,7 +393,20 @@ export default {
]
})
},
- // 柱状图
+ // 宣发明细
+ getColData() {
+ this.$http.post(`/app/appmasssendingtask/statisticsDepart`, null, {
+ params: {
+ type: this.detailType
+ }
+ }).then(res=> {
+ console.log(res);
+ if(res?.data) {
+ console.log(res);
+ this.colData = res.data
+ }
+ })
+ },
getColumnarEcharts() {
this.columnarEcharts = echarts.init(document.getElementById('columnarEcharts'))
this.columnarEcharts.setOption({
@@ -314,6 +442,8 @@ export default {
]
})
},
+
+
}
}
@@ -376,7 +506,7 @@ export default {
display: flex;
justify-content: space-between;
height: 96px;
- line-height: 96px;
+ align-items: center;
.broken_left {
font-size: 32px;
@@ -385,7 +515,24 @@ export default {
.broken_right {
font-size: 24px;
- color: #3399FF;
+ // color: #3399FF;
+
+ img {
+ width: 28px;
+ height: 28px;
+ }
+
+ span {
+ margin-right: 12px;
+ padding: 8px 10px;
+ display: inline-block;
+ border: 1px solid #DDD;
+ border-radius: 8px;
+ }
+ .active {
+ background: #3399FF;
+ color: #FFF;
+ }
}
}
@@ -435,13 +582,15 @@ export default {
}
.popup{
- padding: 0 32px;
- padding-bottom: 60px;
+ 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{
@@ -451,6 +600,8 @@ export default {
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;
@@ -475,6 +626,8 @@ export default {
overflow-y: scroll;
}
.type-list{
+ padding: 0 32px;
+ box-sizing: border-box;
margin-bottom: 32px;
.type-title{
line-height: 108px;
@@ -490,7 +643,6 @@ export default {
line-height: 64px;
background: #F3F4F7;
border-radius: 4px;
- // padding: 0 80px;
margin: 0 16px 16px 0;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
@@ -500,11 +652,46 @@ export default {
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;
+ }
}
}
- ::v-deep .popup{
- height: 800px;
+ .customPop {
+ padding: 80px 32px 20px 32px;
+ box-sizing: border-box;
+
+ .startTime,
+ .endTime {
+ border-bottom: 1px solid #DDD;
+ margin-bottom: 20px;
+ }
+
+ .timeBtn {
+ width: 100%;
+ background: #3399FF;
+ height: 80px;
+ line-height: 80px;
+ text-align: center;
+ border-radius: 16px;
+ color: #FFF;
+ }
}
}
diff --git a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
index 55de9744..51ef945d 100644
--- a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
+++ b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
@@ -5,18 +5,18 @@
-
筛选
+

筛选
@@ -27,16 +27,31 @@ export default {
data() {
return {
current: 1,
- name: ''
+ name: '',
+ list: [],
}
},
methods: {
toDetail() {
uni.navigateTo({url: `./groupSendDetail`})
+ },
+ getList() {
+ this.$http.post(`/app/appmasssendingtask/list`, null, {
+ params: {
+ current: this.current,
+
+ }
+ }).then(res=> {
+ if(res?.data) {
+ this.list = this.current == 1? res.data.records : [...res.data.records, ...this.list]
+ }
+ console.log(res);
+ })
}
},
onShow() {
document.title = '群发居民群'
+ this.getList()
},
onReachBottom() {
this.current ++
@@ -56,7 +71,10 @@ export default {
width: 562px;
}
.filterBtn {
- width: calc( 100% - 562px);
+ img {
+ width: 28px;
+ height: 28px;
+ }
}
}
.resident_list {
@@ -66,6 +84,7 @@ export default {
background: #FFF;
border-radius: 16px;
padding: 30px;
+ margin-bottom: 24px;
& > div {
padding: 10px 0;
}
diff --git a/src/project/saas/AppPropagandaStatistics/images/gird--select-icon.png b/src/project/saas/AppPropagandaStatistics/images/gird--select-icon.png
new file mode 100644
index 00000000..205144d2
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/gird--select-icon.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/images/local-icon.png b/src/project/saas/AppPropagandaStatistics/images/local-icon.png
new file mode 100644
index 00000000..3e23aff6
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/local-icon.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/images/right-icon.png b/src/project/saas/AppPropagandaStatistics/images/right-icon.png
new file mode 100644
index 00000000..e1c626b7
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/right-icon.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/images/shaixuan.png b/src/project/saas/AppPropagandaStatistics/images/shaixuan.png
new file mode 100644
index 00000000..88015ea5
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/shaixuan.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/images/tx@2x.png b/src/project/saas/AppPropagandaStatistics/images/tx@2x.png
new file mode 100644
index 00000000..d9620e08
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/tx@2x.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/images/xz.png b/src/project/saas/AppPropagandaStatistics/images/xz.png
new file mode 100644
index 00000000..98f78cda
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/xz.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/images/xzh.png b/src/project/saas/AppPropagandaStatistics/images/xzh.png
new file mode 100644
index 00000000..967fa399
Binary files /dev/null and b/src/project/saas/AppPropagandaStatistics/images/xzh.png differ
diff --git a/src/project/saas/AppPropagandaStatistics/selectDeptUser.vue b/src/project/saas/AppPropagandaStatistics/selectDeptUser.vue
new file mode 100644
index 00000000..dfaff442
--- /dev/null
+++ b/src/project/saas/AppPropagandaStatistics/selectDeptUser.vue
@@ -0,0 +1,288 @@
+