Skip to content

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

Merge branch 'V1.6.9_feature' into develop

parents 6661e85f e32b1e2f
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 81 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ c46e9339
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</view> </view>
<view class="school-report-context-card-two-conclusion"> <view class="school-report-context-card-two-conclusion">
<view class="school-report-context-card-two-conclusion-txt"> <view class="school-report-context-card-two-conclusion-txt">
<text>本月共<text <text>本{{['月','周'][reportTypeIndex]}}共<text
class="abnormal-days">{{diningSituations.notRepastDay}}</text>天就餐异常</text> class="abnormal-days">{{diningSituations.notRepastDay}}</text>天就餐异常</text>
</view> </view>
<view class="school-report-context-card-two-conclusion-logo"> <view class="school-report-context-card-two-conclusion-logo">
...@@ -477,7 +477,7 @@ ...@@ -477,7 +477,7 @@
this.queryConsumerTrend(); this.queryConsumerTrend();
if (this.isOpen) { if (this.isOpen) {
this.queryStudentConsumerPreference(1).then(e => this.piechart()); this.queryStudentConsumerPreference(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(1)); this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
} else { } else {
this.queryStudentConsumerPreference(); this.queryStudentConsumerPreference();
this.queryDayConsumerTrend(); this.queryDayConsumerTrend();
...@@ -495,7 +495,7 @@ ...@@ -495,7 +495,7 @@
let img = document.createElement("img"); let img = document.createElement("img");
img.setAttribute('src', this.imgUrl); img.setAttribute('src', this.imgUrl);
img.setAttribute('class', 'htmlCanvasImg'); img.setAttribute('class', 'htmlCanvasImg');
img.style.zoom = '50%'; img.style.width = '100vw';
htmlCanvas.appendChild(img); htmlCanvas.appendChild(img);
}) })
}) })
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
getDataRangeArr: function(num) { getDataRangeArr: function(num) {
if (num) { if (num) {
let tmpArr = [] let tmpArr = []
for (let i = 0; i <= 52; i++) { for (let i = 1; i <= 52; i++) {
let startWeek = dayjs().subtract(i, 'week').startOf('week'); let startWeek = dayjs().subtract(i, 'week').startOf('week');
let endWeek = dayjs().$d.getTime() > dayjs().subtract(i, 'week').endOf('week').$d.getTime() ? let endWeek = dayjs().$d.getTime() > dayjs().subtract(i, 'week').endOf('week').$d.getTime() ?
dayjs().subtract(i, 'week').endOf('week') : dayjs(); dayjs().subtract(i, 'week').endOf('week') : dayjs();
...@@ -531,54 +531,53 @@ ...@@ -531,54 +531,53 @@
}) })
} }
this.dataRangeArr = tmpArr; this.dataRangeArr = tmpArr;
this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate);
this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
.startDate;
this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
.diningSituationsRequestDate, 1);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate, 2);
this.queryConsumerTrend();
if (this.isOpen) {
this.queryStudentConsumerPreference(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(2));
} else {
this.queryStudentConsumerPreference();
this.queryDayConsumerTrend();
}
} else { } else {
let tmpArr = [] let tmpArr = []
for (let i = 0; i <= 11; i++) { if (new Date().getDate() > 5) {
let startWeek = dayjs().subtract(i, 'month').startOf('month'); for (let i = 0; i <= 11; i++) {
let endWeek = dayjs().$d.getTime() > dayjs().subtract(i, 'month').endOf('month').$d.getTime() ? let startWeek = dayjs().subtract(i, 'month').startOf('month');
dayjs().subtract(i, 'month').endOf('month') : dayjs(); let endWeek = dayjs().$d.getTime() > dayjs().subtract(i, 'month').endOf('month').$d
tmpArr.push({ .getTime() ?
week: (startWeek.format("YYYY/MM/DD")) + '~' + (endWeek.format("YYYY/MM/DD")), dayjs().subtract(i, 'month').endOf('month') : dayjs();
weekstr: (startWeek.format("MM/DD")) + '~' + (endWeek.format("MM/DD")), tmpArr.push({
startDate: startWeek.format("YYYY-MM-DD"), week: (startWeek.format("YYYY/MM/DD")) + '~' + (endWeek.format("YYYY/MM/DD")),
endDate: endWeek.format("YYYY-MM-DD") weekstr: (startWeek.format("MM/DD")) + '~' + (endWeek.format("MM/DD")),
}) startDate: startWeek.format("YYYY-MM-DD"),
} endDate: endWeek.format("YYYY-MM-DD")
this.dataRangeArr = tmpArr; })
this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate); }
this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
.startDate;
this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
.diningSituationsRequestDate, 1);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate, 2);
this.queryConsumerTrend();
if (this.isOpen) {
this.queryStudentConsumerPreference(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(1));
} else { } else {
this.queryStudentConsumerPreference(); for (let i = 1; i <= 11; i++) {
this.queryDayConsumerTrend(); let startWeek = dayjs().subtract(i, 'month').startOf('month');
let endWeek = dayjs().$d.getTime() > dayjs().subtract(i, 'month').endOf('month').$d
.getTime() ?
dayjs().subtract(i, 'month').endOf('month') : dayjs();
tmpArr.push({
week: (startWeek.format("YYYY/MM/DD")) + '~' + (endWeek.format("YYYY/MM/DD")),
weekstr: (startWeek.format("MM/DD")) + '~' + (endWeek.format("MM/DD")),
startDate: startWeek.format("YYYY-MM-DD"),
endDate: endWeek.format("YYYY-MM-DD")
})
}
} }
this.dataRangeArr = tmpArr;
}
this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate);
this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
.startDate;
this.queryNotRepastDetails(this.diningSituations.diningSituationsRequestDate, this.diningSituations
.diningSituationsRequestDate, 1);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate, 2);
this.queryConsumerTrend();
if (this.isOpen) {
this.queryStudentConsumerPreference(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
} else {
this.queryStudentConsumerPreference();
this.queryDayConsumerTrend();
} }
}, },
formatter(day) { formatter(day) {
...@@ -588,7 +587,8 @@ ...@@ -588,7 +587,8 @@
const date = day.date.getDate(); const date = day.date.getDate();
const datestr = date < 10 ? '0' + date : date; const datestr = date < 10 ? '0' + date : date;
const sum = year + '-' + monthstr + '-' + datestr; const sum = year + '-' + monthstr + '-' + datestr;
const contrastList = this.diningSituations.notRepastDetailsDTOS.filter(e => e.dayNotEatNumber != 0); const contrastList = this.diningSituations.notRepastDetailsDTOS.filter(e => e
.dayNotEatNumber != 0);
contrastList.forEach(item => { contrastList.forEach(item => {
if (sum == item.repastDate) { if (sum == item.repastDate) {
const breakfastTxt = item.breakfastStatus ? '' : '早'; const breakfastTxt = item.breakfastStatus ? '' : '早';
...@@ -655,7 +655,8 @@ ...@@ -655,7 +655,8 @@
const startDay = new Date(year, month, 1).getDate() const startDay = new Date(year, month, 1).getDate()
const allDate = []; const allDate = [];
for (var i = startDay; i <= lastDay; i++) { for (var i = startDay; i <= lastDay; i++) {
allDate[i - 1] = i < 10 ? year + '-' + month + '-' + '0' + i : year + '-' + month + '-' + i; allDate[i - 1] = i < 10 ? year + '-' + month + '-' + '0' + i : year + '-' + month + '-' +
i;
} }
const saturdayDate = allDate.filter(e => { const saturdayDate = allDate.filter(e => {
const date = new Date(e); const date = new Date(e);
...@@ -675,11 +676,12 @@ ...@@ -675,11 +676,12 @@
var month = this.dataRangeArr[this.dataRangeIndex].startDate.slice(5, 7); var month = this.dataRangeArr[this.dataRangeIndex].startDate.slice(5, 7);
var saturdayList = this.getMonthSaturdayDate(year, month); var saturdayList = this.getMonthSaturdayDate(year, month);
switch (num) { switch (num) {
case 1: case 0:
var seriesData = []; var seriesData = [];
this.lineDatas.map(v => { this.lineDatas.map(v => {
if (v.isException == 1) { if (v.isException == 1) {
if (v.date == this.formatDateTwo(new Date(year, month, 0)) || saturdayList if (v.date == this.formatDateTwo(new Date(year, month, 0)) ||
saturdayList
.includes(v.date)) { .includes(v.date)) {
seriesData.push(Object.assign(v, { seriesData.push(Object.assign(v, {
itemStyle: { itemStyle: {
...@@ -698,7 +700,8 @@ ...@@ -698,7 +700,8 @@
})) }))
} }
} else { } else {
if (v.date == this.formatDateTwo(new Date(year, month, 0)) || saturdayList if (v.date == this.formatDateTwo(new Date(year, month, 0)) ||
saturdayList
.includes(v.date)) { .includes(v.date)) {
seriesData.push(Object.assign(v, { seriesData.push(Object.assign(v, {
itemStyle: { itemStyle: {
...@@ -718,7 +721,7 @@ ...@@ -718,7 +721,7 @@
} }
}); });
break; break;
case 2: case 1:
var seriesData = []; var seriesData = [];
this.lineDatas.map(v => { this.lineDatas.map(v => {
if (v.isException == 1) { if (v.isException == 1) {
...@@ -818,7 +821,8 @@ ...@@ -818,7 +821,8 @@
async queryNotRepastDetails(startDate, endDate, num) { async queryNotRepastDetails(startDate, endDate, num) {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/campus-consumer-report/queryNotRepastDetails' url: gHost +
'/report-push/campus-consumer-report/queryNotRepastDetails'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
...@@ -842,10 +846,12 @@ ...@@ -842,10 +846,12 @@
this.diningSituations.notRepastDetailsDTOS = data.obj.notRepastDetailsDTOS; this.diningSituations.notRepastDetailsDTOS = data.obj.notRepastDetailsDTOS;
this.diningSituations.cateringLevel = data.obj.cateringLevel; this.diningSituations.cateringLevel = data.obj.cateringLevel;
this.diningSituations.notCateringNumber = data.obj.notCateringNumber; this.diningSituations.notCateringNumber = data.obj.notCateringNumber;
this.diningSituations.notCateringType = this.diningSituations.cateringLevel ? ['早餐', '午餐', this.diningSituations.notCateringType = this.diningSituations
'晚餐' .cateringLevel ? ['早餐', '午餐',
][this.diningSituations.cateringLevel - 1] : ''; '晚餐'
this.diningSituations.clues = this.diningSituations.cateringLevel ? ['早餐吃好，一天才能活力满满哦', ][this.diningSituations.cateringLevel - 1] : '';
this.diningSituations.clues = this.diningSituations.cateringLevel ? [
'早餐吃好，一天才能活力满满哦',
'及时补充能量，下午才能集中精神学习哦', '晚餐好好吃，身体才能更健康' '及时补充能量，下午才能集中精神学习哦', '晚餐好好吃，身体才能更健康'
][this.diningSituations.cateringLevel - 1] : ''; ][this.diningSituations.cateringLevel - 1] : '';
break; break;
...@@ -864,7 +870,8 @@ ...@@ -864,7 +870,8 @@
async queryStudentConsumerPreference(num) { async queryStudentConsumerPreference(num) {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/campus-consumer-report/queryStudentConsumerPreference' url: gHost +
'/report-push/campus-consumer-report/queryStudentConsumerPreference'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
...@@ -909,7 +916,8 @@ ...@@ -909,7 +916,8 @@
async queryConsumerTrend() { async queryConsumerTrend() {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/campus-consumer-report/queryConsumerTrend' url: gHost +
'/report-push/campus-consumer-report/queryConsumerTrend'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
...@@ -925,11 +933,14 @@ ...@@ -925,11 +933,14 @@
return return
} }
this.consumerAmountObj = data.obj; this.consumerAmountObj = data.obj;
this.isReasonable = this.consumerAmountObj.exceedRate >= 40 && this.consumerAmountObj.exceedRate <= this.isReasonable = this.consumerAmountObj.exceedRate >= 40 && this
.consumerAmountObj.exceedRate <=
60 ? false : true; 60 ? false : true;
this.schoolAverageHeight = this.consumerAmountObj.schoolAmount <= this.consumerAmountObj this.schoolAverageHeight = this.consumerAmountObj.schoolAmount <= this
.consumerAmountObj
.consumerAmount ? 139 : 192; .consumerAmount ? 139 : 192;
this.userConsumeHeight = this.consumerAmountObj.consumerAmount <= this.consumerAmountObj this.userConsumeHeight = this.consumerAmountObj.consumerAmount <= this
.consumerAmountObj
.schoolAmount ? 139 : 192; .schoolAmount ? 139 : 192;
} catch (e) { } catch (e) {
//TODO handle the exception //TODO handle the exception
...@@ -945,11 +956,13 @@ ...@@ -945,11 +956,13 @@
async queryDayConsumerTrend(num) { async queryDayConsumerTrend(num) {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/campus-consumer-report/queryDayConsumerTrend' url: gHost +
'/report-push/campus-consumer-report/queryDayConsumerTrend'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
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,
}) })
if (data.code != 200) { if (data.code != 200) {
...@@ -963,16 +976,20 @@ ...@@ -963,16 +976,20 @@
var exceptionDate = data.obj.exceptionDate; var exceptionDate = data.obj.exceptionDate;
this.isAbnormal = exceptionDate.length ? true : false; this.isAbnormal = exceptionDate.length ? true : false;
var clues = ''; var clues = '';
exceptionDate.forEach((item, index) => item.slice(5, 6) == '0' ? (clues += item.slice(6, 7) + '月' + exceptionDate.forEach((item, index) => item.slice(5, 6) == '0' ? (
item.slice(8, 10) + '日' + (index == exceptionDate.length - 1 ? '' : '、')) : (clues += clues += item.slice(6, 7) + '月' +
item.slice(5, 7) + '月' + item.slice(8, 10) + '日' + (index == exceptionDate.length - 1 ? item.slice(8, 10) + '日' + (index == exceptionDate.length -
1 ? '' : '、')) : (clues +=
item.slice(5, 7) + '月' + item.slice(8, 10) + '日' + (
index == exceptionDate.length - 1 ?
'' : '、'))) '' : '、')))
this.consumerTrend.clues = clues; this.consumerTrend.clues = clues;
if (num) { if (num) {
var lineDatas = data.obj.dayConsumerAmount.map(item => Object.assign(item, { var lineDatas = data.obj.dayConsumerAmount.map(item => Object
value: item.consumerAmount, .assign(item, {
name: item.date.slice(5) value: item.consumerAmount,
})); name: item.date.slice(5)
}));
this.lineDatas = lineDatas; this.lineDatas = lineDatas;
} }
} catch (e) { } catch (e) {
...@@ -986,10 +1003,11 @@ ...@@ -986,10 +1003,11 @@
} }
}, },
// 是否开通消费报告 // 是否开通消费报告
async queryIsDredgeMember(){ async queryIsDredgeMember() {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/member-info/queryIsDredgeMember' url: gHost +
'/report-push/member-info/queryIsDredgeMember'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
...@@ -1003,7 +1021,7 @@ ...@@ -1003,7 +1021,7 @@
}) })
return return
} }
this.isOpen=data.obj.status; this.isOpen = data.obj.status;
if (this.isOpen) { if (this.isOpen) {
this.queryMemberValidTime(); this.queryMemberValidTime();
this.containerHeight = 4200; this.containerHeight = 4200;
...@@ -1025,7 +1043,8 @@ ...@@ -1025,7 +1043,8 @@
async queryMemberConsumerAmount() { async queryMemberConsumerAmount() {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/member-info/queryMemberConsumerAmount' url: gHost +
'/report-push/member-info/queryMemberConsumerAmount'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
...@@ -1054,7 +1073,8 @@ ...@@ -1054,7 +1073,8 @@
async queryMemberValidTime() { async queryMemberValidTime() {
try { try {
let data = await this.$http.get({ let data = await this.$http.get({
url: gHost + '/report-push/member-info/queryMemberValidTime' url: gHost +
'/report-push/member-info/queryMemberValidTime'
}, { }, {
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'), userId: getQueryParams('userId'),
...@@ -1069,11 +1089,14 @@ ...@@ -1069,11 +1089,14 @@
return return
} }
this.memberInfo.differDay = data.obj.differDay; this.memberInfo.differDay = data.obj.differDay;
let month = data.obj.invalidDate.slice(5, 6) == 0 ? data.obj.invalidDate.slice(6, 7) : data.obj let month = data.obj.invalidDate.slice(5, 6) == 0 ? data
.obj.invalidDate.slice(6, 7) : data.obj
.invalidDate.slice(5, 7); .invalidDate.slice(5, 7);
let date = data.obj.invalidDate.slice(8, 9) == 0 ? data.obj.invalidDate.slice(9) : data.obj let date = data.obj.invalidDate.slice(8, 9) == 0 ? data.obj
.invalidDate.slice(9) : data.obj
.invalidDate.slice(8); .invalidDate.slice(8);
this.memberInfo.invalidDateStr = data.obj.invalidDate.slice(0, 4) + '年' + month + '月' + date + '日'; this.memberInfo.invalidDateStr = data.obj.invalidDate
.slice(0, 4) + '年' + month + '月' + date + '日';
} catch (e) { } catch (e) {
//TODO handle the exception //TODO handle the exception
console.log(e); 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