1

src/pages/ConsumptionReport/ConsumptionReport.vue

@@ -92,7 +92,7 @@
 								未就餐次数
 							</view>
 							<view class="no-eatting-total-text-item">
-								未就餐次数
+								未就餐天数
 							</view>
 						</view>
 					</view>
@@ -144,13 +144,13 @@
 							<view v-for="(item,index) in dailyConsumptionData"
 								class="average-daily-consumption-chart-item">
 								<view class="average-daily-consumption-chart-item-data" @click="click">
-									{{item}}
+									{{item.value}}
 								</view>
 								<view class="average-daily-consumption-chart-item-shape"
-									:style="{height:shapeSizeArr[index]+'rpx'}">
+									:style="{height:item.shapeSizeArr+'rpx'}">
 								</view>
 								<view class="average-daily-consumption-chart-item-date">
-									{{dailyConsumptionDate[index]}}
+									{{item.time}}
 								</view>
 							</view>
 							<!--  -->
@@ -280,7 +280,7 @@
 								本周
 							</view>
 							<view class="noeatting-number">
-								9次
+								{{notRepastNumber}}次
 							</view>
 							<view class="noeatting-total-item">
 								未就餐
@@ -400,8 +400,6 @@
 		},
 		computed: {
 			repastDateTimeFormat() {
-				// return this.consumptionPreferencesData.map(data => ((data / this.consumptionPreferencesData.grossAmount *
-				// 	10000) / 100).toFixed(1) + '%')
 				return function(repastDateTime) {
 					if (!repastDateTime) {
 						return '';
@@ -409,9 +407,6 @@
 					return dayjs(repastDateTime).format("MM月DD日")
 				}
 			},
-			shapeSizeArr() {
-				return this.dailyConsumptionData.map(data => data / Math.max(...this.dailyConsumptionData) * 266)
-			},
 			percentArr() {
 				return function(type, data2) {
 					if (!data2.grossAmount || data2.grossAmount == 0) {
@@ -712,15 +707,26 @@
 										reject(res.msg)
 										return
 									}
-									this_.dayConsumerTrend = res.obj
-									this_.dailyConsumptionData = Object.values(this_
-										.dayConsumerTrend
-										.dayConsumerMap).reverse()
-									this_.dailyConsumptionDate = Object.keys(this_.dayConsumerTrend
-										.dayConsumerMap).map(element => element.substr(5)
-										.replace(
-											'-',
-											'/')).reverse()
+									let timeArr = Object.keys(res.obj.dayConsumerMap).sort(
+										function(a, b) {
+											return b < a ? 1 : -1
+										})
+									let tmpData = [],
+										MaxValue = Object.values(res.obj.dayConsumerMap);
+									for (let timeItem of timeArr) {
+										tmpData.push({
+											time: timeItem.substr(5).replace('-', '/'),
+											value: res.obj.dayConsumerMap[timeItem],
+											shapeSizeArr: res.obj.dayConsumerMap[
+													timeItem] == 0 ? 0 : (res.obj
+													.dayConsumerMap[
+														timeItem] / Math.max(...MaxValue)
+												) *
+												266
+										})
+									}
+									console.warn(tmpData)
+									this_.dailyConsumptionData = tmpData
 									resolve()
 									return
 								}