Skip to content

X
xzf_uniapp-wechat-web
Commit 3e22b568 authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com
Browse files
Options

Merge branch 'V1.7.3_report_feature' into develop

parents 2b65a617 266a0a23
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ 3e22b568
...@@ -2562,7 +2562,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2562,7 +2562,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
startDate, startDate,
endDate, endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code == 200) { if (data.code == 200) {
if (data.obj && data.obj.campusConsumerDetailList && Array.isArray(data.obj if (data.obj && data.obj.campusConsumerDetailList && Array.isArray(data.obj
...@@ -2690,7 +2690,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2690,7 +2690,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
startDate, startDate,
endDate, endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -2781,7 +2781,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2781,7 +2781,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
startDate: this.dataRangeArr[this.dataRangeIndex].startDate, startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: this.dataRangeArr[this.dataRangeIndex].endDate, endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -2864,7 +2864,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2864,7 +2864,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
startDate: this.dataRangeArr[this.dataRangeIndex].startDate, startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: this.dataRangeArr[this.dataRangeIndex].endDate, endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -2941,7 +2941,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2941,7 +2941,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
startDate: this.dataRangeArr[this.dataRangeIndex] startDate: this.dataRangeArr[this.dataRangeIndex]
.startDate, .startDate,
endDate: this.dataRangeArr[this.dataRangeIndex].endDate, endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -2993,7 +2993,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2993,7 +2993,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
studentId: getQueryParams('userId'), studentId: getQueryParams('userId'),
startDate: this.dataRangeArr[this.dataRangeIndex].startDate, startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: this.dataRangeArr[this.dataRangeIndex].endDate, endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -3052,7 +3052,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3052,7 +3052,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
startDate: this.dataRangeArr[this.dataRangeIndex].startDate, startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: this.dataRangeArr[this.dataRangeIndex].endDate, endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1 timeType: this.reportTypeIndex == 0 ? 2 : 1
}) })
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment