Skip to content

X
xzf_uniapp-wechat-web
Commit 09497a1d authored by 袁玲利's avatar 袁玲利
Browse files
Options

校园报告

parent 7d1a3d23
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 90 deletions
src/pages/ConsumptionSystem/AbnormalConsumption/AbnormalConsumption.vue
View file @ 09497a1d
......@@ -454,18 +454,18 @@ export default {
AuthOauthToken: uni.getStorageSync("AuthOauthToken") || "",
"Content-Type": "application/x-www-form-urlencoded",
},
url: `${az_gHost}/cloud-gateway/bill/cateringAbnormal/getCateringAbnormalGroupList`,
url: `${az_gHost}/cloud-gateway/bill/cateringAbnormal/getCateringAbnormalGroupListV2`,
},
params
);
if (data.code != 10000) {
if (data.code != 200) {
uni.showToast({
icon: "none",
title: data.message || "发生异常!",
});
return;
}
let res = data.data;
let res = data.obj;
this.cateringAbnormalGroupList = res;
if (res.length) {
this.lastMeal =
......
src/pages/SchoolReport/SchoolReport.vue
View file @ 09497a1d
......@@ -1754,7 +1754,6 @@ export default {
},
async mounted() {
await this.init();
},
methods: {
async init() {
......@@ -1856,7 +1855,7 @@ export default {
this.diningSituations.diningSituationsDate = this.formatDate(
this.minDate
);
this.queryConsumerSummaryAmount(1).then(()=>{
this.queryConsumerSummaryAmount(1).then(() => {
self.piechart();
});
......@@ -1903,7 +1902,7 @@ export default {
},
// 当天11：00 ~ 13：00属于高峰期
isPeakPeriod() {
let first = this.timeIn("11:00:00", "13:00:00");
let first = this.timeIn("11:00:00", "11:01:00");
return first;
},
nodataClick: function () {
......@@ -1965,9 +1964,9 @@ export default {
this.dataRangeArr[this.dataRangeIndex].startDate,
this.dataRangeArr[this.dataRangeIndex].endDate
);
this.queryConsumerSummaryAmount(1).then(()=>{
self.piechart()
})
this.queryConsumerSummaryAmount(1).then(() => {
self.piechart();
});
// this.queryConsumerSummaryAmount();
// this.queryIsDredgeMember(1002, 1).then(() => {
// if (this.isOpen) {
......@@ -2309,33 +2308,68 @@ export default {
this.dataRangeArr[this.dataRangeIndex].endDate
);
try {
await $.ajax({
let data = {};
if (this.from == "wechat") {
data = await this.$http.post(
{
header: {
"Content-Type": "application/x-www-form-urlencoded",
},
url:
gHost +
"/report-push/cateringAbnormal/getCateringAbnormalGroupList",
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: params,
success: function (data) {
},
params
);
self.cateringAbnormalGroupList = [];
if (data.code == 10000) {
let res = data.data;
self.cateringAbnormalGroupList = res;
console.log(
self.cateringAbnormalGroupList,
"aaaaaaaaaaaaaaaaaaaaaaaa"
);
// if (res.length) {
// this.lastMeal =
// new Date(res[0].statisticalDate).getMonth() +
// 1 +
// "月" +
// new Date(res[0].statisticalDate).getDate() +
// "日";
// }
}
} else if (this.from == "alipay") {
data = await this.$http.post(
{
header: {
"Content-Type": "application/x-www-form-urlencoded",
},
});
url: `${az_gHost}/cloud-gateway/bill/cateringAbnormal/getCateringAbnormalGroupListV2`,
},
params
);
self.cateringAbnormalGroupList = [];
if (data.code == 200) {
let res = data.obj;
self.cateringAbnormalGroupList = res;
}
}
// await $.ajax({
// url:
// gHost +
// "/report-push/cateringAbnormal/getCateringAbnormalGroupList",
// type: "POST",
// contentType: "application/x-www-form-urlencoded",
// data: params,
// success: function (data) {
// self.cateringAbnormalGroupList = [];
// if (data.code == 10000) {
// let res = data.data;
// self.cateringAbnormalGroupList = res;
// console.log(
// self.cateringAbnormalGroupList,
// "aaaaaaaaaaaaaaaaaaaaaaaa"
// );
// // if (res.length) {
// // this.lastMeal =
// // new Date(res[0].statisticalDate).getMonth() +
// // 1 +
// // "月" +
// // new Date(res[0].statisticalDate).getDate() +
// // "日";
// // }
// }
// },
// });
} catch (e) {
console.log(e);
}
......@@ -2349,13 +2383,11 @@ export default {
this.$nextTick(() => {
let arr = this.pieDatas;
let domChart = document.getElementById("consumer-preferences-pie");
if(!domChart){
if (!domChart) {
return;
}
let myChart = echarts.init(
domChart
);
console.log(myChart, 'zzzzzzzzzzzzzzzzz')
let myChart = echarts.init(domChart);
console.log(myChart, "zzzzzzzzzzzzzzzzz");
let option = {
tooltip: {
trigger: "item",
......@@ -2403,7 +2435,9 @@ export default {
? year + "-" + month + "-" + "0" + i
: year + "-" + month + "-" + i;
}
const saturdayDate = (allDate.length || []) && allDate.filter((e) => {
const saturdayDate =
(allDate.length || []) &&
allDate.filter((e) => {
const date = new Date(e);
if (date.getDay() == 6) {
return true;
......@@ -2559,9 +2593,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
mySize.style.width = 350 + "px";
mySize.style.height = 260 + "px";
var myBreakfastTimeLineChart = echarts.init(mySize);
var cateringList = (this.mealtimeTrendsData.length || []) && this.mealtimeTrendsData.filter(
(e) => e.mealtype == mealtype
)[0].cateringList;
var cateringList =
(this.mealtimeTrendsData.length || []) &&
this.mealtimeTrendsData.filter((e) => e.mealtype == mealtype)[0]
.cateringList;
var breakfastTimeData = JSON.parse(JSON.stringify(cateringList));
var breakfastTimeDataTwo = JSON.parse(JSON.stringify(cateringList));
breakfastTimeData.forEach((e) => {
......@@ -2584,8 +2619,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
});
var xInterval = this.reportTypeIndex ? 0 : 6;
var yMidPoint =
"2022/07/01 " +
(this.mealtimeTrendsData.length || []) && this.mealtimeTrendsData.filter((e) => e.mealtype == 1)[0].earliestTime;
"2022/07/01 " + (this.mealtimeTrendsData.length || []) &&
this.mealtimeTrendsData.filter((e) => e.mealtype == 1)[0].earliestTime;
var maxDate = new Date(yMidPoint).setHours(
new Date(yMidPoint).getHours() == 23
? "00"
......@@ -3467,13 +3502,15 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
// 查询就餐情况
async queryNotRepastDetails(startDate, endDate) {
try {
let data = await this.$http.get(
{
url:
gHost +
"/report-push/campus-consumer-report/queryNotRepastDetails",
},
{
// let data = await this.$http.get(
// {
// url:
// gHost +
// "/report-push/campus-consumer-report/queryNotRepastDetails",
// },
// );
let params = {
schoolId: getQueryParams("schoolId"),
userId: getQueryParams("userId"),
startDate,
......@@ -3483,8 +3520,43 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
this.dataRangeArr[this.dataRangeIndex].startDate
).format("YYYYMM"),
userType: this.usertype,
}
};
let data = {};
if (this.from == "wechat") {
data = await this.$http.get(
{
url:
gHost +
"/report-push/campus-consumer-report/queryNotRepastDetails",
},
params
);
// if (data.code != 200) {
// uni.showToast({
// icon: "none",
// mask: true,
// title: data.msg,
// });
// return;
// }
// if (!data.obj) {
// this.diningSituations = {};
// return;
// }
// this.diningSituations.notRepastDay = data.obj.notRepastDay;
// this.diningSituations.notRepastDetailsDTOS =
// data.obj.notRepastDetailsDTOS;
} else if (this.from == "alipay") {
data = await this.$http.get(
{
header: {
"Content-Type": "application/x-www-form-urlencoded",
},
url: `${az_gHost}/cloud-gateway/bill/campusConsumerReport/queryNotRepastDetails`,
},
params
);
}
if (data.code != 200) {
uni.showToast({
icon: "none",
......@@ -3500,19 +3572,19 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
this.diningSituations.notRepastDay = data.obj.notRepastDay;
this.diningSituations.notRepastDetailsDTOS =
data.obj.notRepastDetailsDTOS;
this.diningSituations.cateringLevel = data.obj.cateringLevel;
this.diningSituations.notCateringNumber = data.obj.notCateringNumber;
this.diningSituations.notCateringType = this.diningSituations
.cateringLevel
? ["早餐", "午餐", "晚餐"][this.diningSituations.cateringLevel - 1]
: "";
this.diningSituations.clues = this.diningSituations.cateringLevel
? [
"早餐吃好，一天才能活力满满哦",
"及时补充能量，下午才能集中精神学习哦",
"晚餐好好吃，身体才能更健康",
][this.diningSituations.cateringLevel - 1]
: "";
// this.diningSituations.cateringLevel = data.obj.cateringLevel;
// this.diningSituations.notCateringNumber = data.obj.notCateringNumber;
// this.diningSituations.notCateringType = this.diningSituations
// .cateringLevel
// ? ["早餐", "午餐", "晚餐"][this.diningSituations.cateringLevel - 1]
// : "";
// this.diningSituations.clues = this.diningSituations.cateringLevel
// ? [
// "早餐吃好，一天才能活力满满哦",
// "及时补充能量，下午才能集中精神学习哦",
// "晚餐好好吃，身体才能更健康",
// ][this.diningSituations.cateringLevel - 1]
// : "";
} catch (e) {
//TODO handle the exception
console.log(e);
......@@ -3769,14 +3841,18 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
let newArr = [];
// 早餐 mealType = 1
let arr = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 1);
let arr =
((array_ && array_.length) || []) &&
array_.filter((x) => x.mealType == 1);
if (arr.length) {
newArr.push(arr[0]);
} else {
newArr.push(nullObj);
}
// 午餐 mealType = 2
let arr1 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 2);
let arr1 =
((array_ && array_.length) || []) &&
array_.filter((x) => x.mealType == 2);
if (arr1.length) {
newArr.push(arr1[0]);
} else {
......@@ -3784,7 +3860,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}
// 晚餐 mealType = 3
let arr2 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 3);
let arr2 =
((array_ && array_.length) || []) &&
array_.filter((x) => x.mealType == 3);
if (arr2.length) {
newArr.push(arr2[0]);
} else {
......@@ -3792,8 +3870,12 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}
// 其他 mealType = 4 夜宵 mealType = 5 夜夜宵
let arr3 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 4);
let arr4 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 5);
let arr3 =
((array_ && array_.length) || []) &&
array_.filter((x) => x.mealType == 4);
let arr4 =
((array_ && array_.length) || []) &&
array_.filter((x) => x.mealType == 5);
if (arr3.length) {
let obj = JSON.parse(JSON.stringify(arr3[0]));
if (arr4.length) {
......@@ -4509,7 +4591,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
// 跳转云平台权益中心-支付宝
async openAzMenber_() {
my.navigateTo({
url: "/pages/OpenMemberGui/OpenMemberGui",
url: "/pages/ToCloudOrder/ToCloudOrder",
});
},
// equityPay: function () {
......
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