Skip to content

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

提交更新

parent aeaf172b
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 145 deletions
src/pages/ConsumptionReport/ConsumptionReport.vue
View file @ 98f8ef9e
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
<view class="no-eatting-total-detail"> <view class="no-eatting-total-detail">
<view class="no-eatting-total-detail-item"> <view class="no-eatting-total-detail-item">
<text class="no-eatting-total-detail-item-num"> <text class="no-eatting-total-detail-item-num">
9 {{notRepastNumber}}
</text>次 </text>次
</view> </view>
<view class="no-eatting-total-detail-item"> <view class="no-eatting-total-detail-item">
<text class="no-eatting-total-detail-item-num"> <text class="no-eatting-total-detail-item-num">
5 {{notRepastDay}}
</text>天 </text>天
</view> </view>
</view> </view>
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
其他消费 其他消费
</view> </view>
<view class="consumption-preferences-list-item-text-item-percent"> <view class="consumption-preferences-list-item-text-item-percent">
{{percentArr(2,consumptionPreferencesData)}} {{percentArr(3,consumptionPreferencesData)}}
</view> </view>
</view> </view>
<view class="consumption-preferences-list-item-text-cash"> <view class="consumption-preferences-list-item-text-cash">
...@@ -302,159 +302,32 @@ ...@@ -302,159 +302,32 @@
</view> </view>
</view> </view>
<view class="noeatting-details-ul"> <view class="noeatting-details-ul">
<view class="noeatting-details-list"> <view class="noeatting-details-list" v-for="(item,index) in notRepastDetailsDTOS"
<view class="noeatting-details-list-item"> :key="index">
12月6日
</view>
<view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
</view>
<view class="noeatting-details-list-item noeatting-details-list-num">
3
</view>
</view>
<view class="noeatting-details-list">
<view class="noeatting-details-list-item">
12月6日
</view>
<view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
</view>
<view class="noeatting-details-list-item noeatting-details-list-num">
3
</view>
</view>
<view class="noeatting-details-list">
<view class="noeatting-details-list-item">
12月6日
</view>
<view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
</view>
<view class="noeatting-details-list-item noeatting-details-list-num">
3
</view>
</view>
<view class="noeatting-details-list">
<view class="noeatting-details-list-item">
12月6日
</view>
<view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
</view>
<view class="noeatting-details-list-item noeatting-details-list-num">
3
</view>
</view>
<view class="noeatting-details-list">
<view class="noeatting-details-list-item"> <view class="noeatting-details-list-item">
12月6日 {{repastDateTimeFormat(item.repastDate)}}
</view> </view>
<view class="noeatting-details-list-meal"> <view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item"> <view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" <image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image> :src="HaveamealImg[item.breakfastStatus]" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view> </view>
</view>
<view class="noeatting-details-list-item noeatting-details-list-num">
3
</view>
</view>
<view class="noeatting-details-list">
<view class="noeatting-details-list-item">
12月6日
</view>
<view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item"> <view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" <image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image> :src="HaveamealImg[item.lunchStatus]" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view> </view>
<view class="noeatting-details-list-meal-item"> <view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" <image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image> :src="HaveamealImg[item.supperStatus]" mode=""></image>
</view> </view>
</view> </view>
<view class="noeatting-details-list-item noeatting-details-list-num"> <view class="noeatting-details-list-item noeatting-details-list-num">
3 {{item.dayNotEatNumber}}
</view> </view>
</view> </view>
<view class="noeatting-details-list"> <!-- ds -->
<view class="noeatting-details-list-item"> <view class="noConsumptionData" v-if="notRepastDetailsDTOS.length==0">
12月6日 暂无更多数据
</view>
<view class="noeatting-details-list-meal">
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img" src="../../static/images/eat.png"
mode=""></image>
</view>
<view class="noeatting-details-list-meal-item">
<image class="noeatting-details-list-meal-img"
src="../../static/images/noeat.png" mode=""></image>
</view>
</view>
<view class="noeatting-details-list-item noeatting-details-list-num">
3
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -515,18 +388,34 @@ ...@@ -515,18 +388,34 @@
dailyConsumptionDate: [], dailyConsumptionDate: [],
// 消费偏好数据 // 消费偏好数据
consumptionPreferencesData: {}, consumptionPreferencesData: {},
// 未就餐详情
notRepastDetailsDTOS: [],
// 未就餐天数
notRepastDay: '0',
// 未就餐总数
notRepastNumber: '5',
HaveamealImg: ['../../static/images/noeat.png', '../../static/images/eat.png']
} }
}, },
computed: { computed: {
repastDateTimeFormat() {
// return this.consumptionPreferencesData.map(data => ((data / this.consumptionPreferencesData.grossAmount *
// 10000) / 100).toFixed(1) + '%')
return function(repastDateTime) {
if (!repastDateTime) {
return '';
}
return dayjs(repastDateTime).format("MM月DD日")
}
},
shapeSizeArr() { shapeSizeArr() {
return this.dailyConsumptionData.map(data => data / Math.max(...this.dailyConsumptionData) * 266) return this.dailyConsumptionData.map(data => data / Math.max(...this.dailyConsumptionData) * 266)
}, },
percentArr() { percentArr() {
// return this.consumptionPreferencesData.map(data => ((data / this.consumptionPreferencesData.grossAmount *
// 10000) / 100).toFixed(1) + '%')
return function(type, data2) { return function(type, data2) {
if (!data2.grossAmount) { if (!data2.grossAmount || data2.grossAmount == 0) {
return ''; return 0;
} }
let { let {
canteenAmount, canteenAmount,
...@@ -552,7 +441,7 @@ ...@@ -552,7 +441,7 @@
}, },
widthArr() { widthArr() {
return function(type, data2) { return function(type, data2) {
if (!data2.grossAmount||data2.grossAmount==0) { if (!data2.grossAmount || data2.grossAmount == 0) {
return 0; return 0;
} }
let { let {
...@@ -691,6 +580,10 @@ ...@@ -691,6 +580,10 @@
reject(res.msg) reject(res.msg)
return return
} }
this_.notRepastDay = res.obj.notRepastDay;
this_.notRepastDetailsDTOS = res.obj.notRepastDetailsDTOS;
this_.notRepastNumber = res.obj.notRepastNumber;
resolve()
return return
} }
reject(res.msg) reject(res.msg)
......
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