Skip to content

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

校园报告提交更新1

parent a3919494
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 41 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ 88460f17
......@@ -219,11 +219,11 @@
<text>早餐</text>
</view>
<view class="school-report-context-card-two-details-meal-logo">
<view v-if="diningSituations.notRepastDetails.breakfastStatus"
<view v-if="diningSituations.notRepastDetails.breakfastStatus==1"
class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image>
</view>
<view v-else class="school-report-context-card-two-details-meal-noeat">
<view v-else-if="diningSituations.notRepastDetails.breakfastStatus==0" class="school-report-context-card-two-details-meal-noeat">
<text>缺</text>
</view>
</view>
......@@ -232,11 +232,11 @@
</view>
<view
class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-two">
<view v-if="diningSituations.notRepastDetails.lunchStatus"
<view v-if="diningSituations.notRepastDetails.lunchStatus==1"
class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image>
</view>
<view v-else class="school-report-context-card-two-details-meal-noeat">
<view v-else-if="diningSituations.notRepastDetails.lunchStatus==0" class="school-report-context-card-two-details-meal-noeat">
<text>缺</text>
</view>
</view>
......@@ -245,11 +245,11 @@
</view>
<view
class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-three">
<view v-if="diningSituations.notRepastDetails.supperStatus"
<view v-if="diningSituations.notRepastDetails.supperStatus==1"
class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image>
</view>
<view v-else class="school-report-context-card-two-details-meal-noeat">
<view v-else-if="diningSituations.notRepastDetails.supperStatus==0" class="school-report-context-card-two-details-meal-noeat">
<text>缺</text>
</view>
</view>
......@@ -900,8 +900,13 @@
let tmpDate = this.formatDateTwo(this.minDate);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate).then(() => {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate === tmpDate)[0];
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate === tmpDate)[
0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
});
this.queryConsumerTrend();
},
......@@ -1121,9 +1126,13 @@
let tmpDate = this.formatDateTwo(this.minDate);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate).then(() => {
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate ===
tmpDate)[0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
});
this.queryConsumerTrend();
if (this.isOpen) {
......@@ -1155,6 +1164,7 @@
const datestr = date < 10 ? '0' + date : date;
const sum = year + '-' + monthstr + '-' + datestr;
if (this.tabIndex == 1) { // 消费报告
if (this.diningSituations.notRepastDetailsDTOS) {
const contrastList = this.diningSituations.notRepastDetailsDTOS.filter(e => e
.dayNotEatNumber != 0);
contrastList.forEach(item => {
......@@ -1166,6 +1176,7 @@
day.className = 'notice-day'
}
})
}
} else if (this.tabIndex == 2) { // 门禁报告
if (this.attendanceReport.abnomalDateList.length) {
const abnomalList = this.attendanceReport.abnomalDateList.filter(e => e.abnomalType == 2 || e
......@@ -1195,11 +1206,6 @@
}
})
}
// Todos 样式调整
if (sum == '2021-11-11') {
day.topInfo = '冠军';
day.className = 'champion-day';
}
}
return day;
},
......@@ -1213,8 +1219,12 @@
this.diningSituations.diningSituationsDate = this.formatDate(date);
var dateStr =
`${date.getFullYear()}-${date.getMonth()<9?'0'+(date.getMonth()+1):date.getMonth()+1}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`;
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate === dateStr)[0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
},
attendanceDateSelect(date) {
this.attendanceSituations.attendanceDate = this.formatDate(date);
......@@ -1686,6 +1696,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
})
return
}
if (!data.obj) {
this.diningSituations = {};
return;
}
this.diningSituations.notRepastDay = data.obj.notRepastDay;
this.diningSituations.notRepastDetailsDTOS = data.obj.notRepastDetailsDTOS;
this.diningSituations.cateringLevel = data.obj.cateringLevel;
......@@ -1728,6 +1742,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
})
return
}
if (!data.obj) return;
const tmpObj = data.obj;
this.isEatLow = tmpObj.canteenAmount / tmpObj.grossAmount < 0.5 ? true : false;
if (num) {
......@@ -1774,6 +1789,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
})
return
}
if (!data.obj) return;
this.consumerAmountObj = data.obj;
this.isReasonable = this.consumerAmountObj.exceedRate >= 40 && this
.consumerAmountObj.exceedRate <=
......@@ -1815,6 +1831,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
})
return
}
if (!data.obj) return;
var exceptionDate = data.obj.exceptionDate;
this.isAbnormal = exceptionDate.length ? true : false;
var clues = '';
......@@ -1887,7 +1904,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
userId: getQueryParams('userId'),
startTime: this.dataRangeArr[this.dataRangeIndex].startDate,
endTime: this.dataRangeArr[this.dataRangeIndex].endDate,
classId:this.userInfo.classId
classId: this.userInfo.classId
})
if (data.code != 200) {
uni.showToast({
......@@ -1918,7 +1935,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'),
currentDate,
classId:this.userInfo.classId
classId: this.userInfo.classId
})
if (data.code != 200) {
uni.showToast({
......@@ -1929,7 +1946,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
return
}
var tempList = data.data;
if (tempList.length) {
if (tempList && tempList.length) {
tempList.forEach(e => {
e.attendDetailReportDTOList.forEach(c => {
c.border = c.describeContent && c.describeContent != '当日早到冠军' ?
......@@ -2047,7 +2064,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
})
return
}
this.memberInfo.leastAmount = data.obj.leastAmount;
this.memberInfo.leastAmount = data.obj.leastAmount || '';
} catch (e) {
//TODO handle the exception
console.log(e);
......@@ -2079,6 +2096,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}
this.memberInfo.differDay = data.obj.differDay;
this.memberInfo.invalidDate = data.obj.invalidDate;
if (data.obj.invalidDate) {
let month = data.obj.invalidDate.slice(5, 6) == 0 ? data
.obj.invalidDate.slice(6, 7) : data.obj
.invalidDate.slice(5, 7);
......@@ -2087,6 +2105,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.invalidDate.slice(8);
this.memberInfo.invalidDateStr = data.obj.invalidDate
.slice(0, 4) + '年' + month + '月' + date + '日';
} else {
this.memberInfo.invalidDateStr = '';
}
} catch (e) {
//TODO handle the exception
console.log(e);
......
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