From 4434c41562f18959967a957f09c795f0c24f3b70 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <18597012158>
Date: 星期三, 22 三月 2023 10:11:16 +0800
Subject: [PATCH] commit
---
pages/tabBar/general.vue | 310 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 218 insertions(+), 92 deletions(-)
diff --git a/pages/tabBar/general.vue b/pages/tabBar/general.vue
index a6b8fbe..6ec0d22 100644
--- a/pages/tabBar/general.vue
+++ b/pages/tabBar/general.vue
@@ -1,21 +1,21 @@
<template>
<view class="app">
- <!-- <view class="cu-custom custom-bar" :style="[{height:CustomBar + 'px'}]">
+ <!-- <view class="cu-custom custom-bar" :style="[{height:CustomBar + 'px'}]">
<view class="select-equ-box">
<u-icon name="setting" color="rgb(255,255,255)" :size="20"></u-icon>
<text style="margin-left: 10rpx;" @click="show">1鍙峰共鐕ユ満</text>
<u-icon name="arrow-right" color="rgb(255,255,255)" :size="12"></u-icon>
</view>
- </view>
- <view class="blank" :style="[{height:CustomBar + 'px'}]">
- </view>
-
- -->
- <cu-custom bgColor="bg-gradual-blue" :isBack="false">
- <block slot="content">骞茬嚗璁惧鐩戞帶绯荤粺</block>
- </cu-custom>
-
-<!-- <view class="card-box dynamic shadow cu-list menu">
+ </view>
+ <view class="blank" :style="[{height:CustomBar + 'px'}]">
+ </view>
+
+ -->
+ <cu-custom bgColor="bg-gradual-blue" :isBack="false">
+ <block slot="content">骞茬嚗璁惧鐩戞帶绯荤粺</block>
+ </cu-custom>
+
+ <!-- <view class="card-box dynamic shadow cu-list menu">
<view class="title-box">
<view class="left">
<uni-text class="cuIcon-titles text-blue"></uni-text>
@@ -70,61 +70,66 @@
</view> -->
- <view class="card-box dynamic shadow">
- <view class="title-box margin-bottom-sm">
- <view class="left justify-between">
- <view class="flex align-center">
- <uni-text class="cuIcon-titles text-blue"></uni-text>
- <view class="title">鎬昏</view>
- </view>
- <view>
- <text class="text-gray">2023-3-18</text>
- </view>
-
- </view>
-
+ <view class="card-box dynamic shadow">
+ <view class="title-box margin-bottom-sm">
+ <view class="left justify-between">
+ <view class="flex align-center">
+ <uni-text class="cuIcon-titles text-blue"></uni-text>
+ <view class="title">鎬昏</view>
+ </view>
+ <view>
+ <text class="text-gray">{{model.date}}</text>
+ </view>
+
+ </view>
+
</view>
<view class="flex flex-direction padding-xs">
<view class="flex">
<view class="flex-sub flex flex-direction">
- <text class="text-df">鐑樺共鏁伴噺</text>
- <text class="text-bold text-sl margin-top-xs text-cyan margin-top-sm">16 <text class="text-gray text-sm margin-left-xs">妗�</text></text>
- </view>
- <view class="flex-twice flex flex-direction justify-between">
- <view class="flex-sub flex">
- <view class="flex flex-direction flex-sub">
- <text class="text-gray text-xs">鎵规淇℃伅</text>
- <text class="text-black"><text class="text-black">绉嶇被:</text> 2 <text class="text-gray text-xs"></text></text>
-
- </view>
- <view class="flex flex-direction flex-sub">
- <text class="text-white text-xs">鎵规</text>
- <text class="text-black"><text class="text-black">鎵规:</text> 12 <text class="text-gray text-xs"></text></text>
-
- </view>
-
- </view>
- <view class="flex-sub flex margin-top-sm">
- <view class="flex flex-direction flex-sub">
- <text class="text-gray text-xs">鐑樺共淇℃伅</text>
- <text class="text-cyan"><text class="text-black">閲嶉噺:</text> 100 <text class="text-gray text-xs">kg</text></text>
-
- </view>
- <view class="flex flex-direction flex-sub">
- <text class="text-white text-xs">鏃堕棿</text>
- <text class="text-cyan"><text class="text-black">鏃堕棿:</text> 100 <text class="text-gray text-xs">min</text></text>
- </view>
-
- </view>
-
+ <text class="text-df">鐑樺共鏁伴噺</text>
+ <text class="text-bold text-sl margin-top-xs text-cyan margin-top-sm">{{showValue(model.feed)}} <text
+ class="text-gray text-sm margin-left-xs">绛�</text></text>
</view>
-
+ <view class="flex-twice flex flex-direction justify-between">
+ <view class="flex-sub flex">
+ <view class="flex flex-direction flex-sub">
+ <text class="text-gray text-xs">鎵规淇℃伅</text>
+ <text class="text-black"><text class="text-black">绉嶇被:</text> {{showValue(model.group)}} <text
+ class="text-gray text-xs"></text></text>
+
+ </view>
+ <view class="flex flex-direction flex-sub">
+ <text class="text-white text-xs">鎵规</text>
+ <text class="text-black"><text class="text-black">鎵规:</text> {{showValue(model.batch)}} <text
+ class="text-gray text-xs"></text></text>
+
+ </view>
+
+ </view>
+ <view class="flex-sub flex margin-top-sm">
+ <view class="flex flex-direction flex-sub">
+ <text class="text-gray text-xs">鐑樺共淇℃伅</text>
+ <text class="text-cyan"><text class="text-black">閲嶉噺:</text> {{showValue(model.weight)}} <text
+ class="text-gray text-xs">kg</text></text>
+
+ </view>
+ <view class="flex flex-direction flex-sub">
+ <text class="text-white text-xs">鏃堕棿</text>
+ <text class="text-cyan"><text class="text-black">鏃堕棿:</text> {{showValue(model.dryTime)}} <text
+ class="text-gray text-xs">min</text></text>
+ </view>
+
+ </view>
+
+ </view>
+
</view>
- <view class="margin-top">
- <u-scroll-list>
-
- </u-scroll-list>
-
+ <view class="margin-top">
+ <u-scroll-list>
+
+ </u-scroll-list>
+
</view>
</view>
@@ -141,7 +146,7 @@
</view>
</view>
- <lunc-calendar :showShrink="true" shrinkState="week" :signList="signList"></lunc-calendar>
+ <lunc-calendar ref="calendar" @dayChange="dayChange" weekType="鏄熸湡" @monthChange="monthChange" :showShrink="true" shrinkState="week" :signList="monthList"></lunc-calendar>
</view>
@@ -154,21 +159,23 @@
</view>
</view>
- <view class="data-item" v-for="(res, index) in dataList" :key="res.id" style="padding: 0 10rpx;">
+ <view class="data-item" v-for="(item, index) in herbList" :key="item.id" style="padding: 0 10rpx;">
<view class="flex justify-between text-lg align-center padding-tb-xs">
<view class="flex">
- <text>鏍硅寧绫�</text>
+ <text>涓崏鑽�</text>
<text>涓�</text>
- <text>褰撳綊</text>
- <view class="margin-lr-sm">
+ <text>{{showValue(item.herbName)}}</text>
+ <!-- <view class="margin-lr-sm">
<u-tag text="鎶ヨ涓�娆�" plain size="mini" type="warning"></u-tag>
+ </view> -->
+ <view class="margin-lr-sm">
+ <u-tag text="姝ｅ父" plain size="mini" type="success"></u-tag>
</view>
- <u-tag text="鏍囩" plain size="mini" type="success"></u-tag>
</view>
<view style="width:160rpx;" class="flex align-center text-xs ">
<text>杩涘害:</text>
<view style="width: 100rpx;">
- <u-line-progress :percentage="40" height="10"></u-line-progress>
+ <u-line-progress :percentage="calcProgress(item.dryTime,item.et)" height="10"></u-line-progress>
</view>
</view>
</view>
@@ -180,31 +187,32 @@
<view class="flex flex-direction margin-left-xl margin-left-sm justify-center">
<view>
- <text class="text-xxl text-green">13%</text>
- <text class="text-xs margin-top-xs text-grey text-line-through">42%</text>
+ <text class="text-xxl text-green">{{showValue(item.target)}}%</text>
+ <text class="text-xs margin-top-xs text-grey text-line-through">{{showValue(item.initial)}}%</text>
</view>
<text class="text-xs margin-top-xs text-grey">鍚按鐜�</text>
</view>
<view class="flex flex-direction margin-left-xl margin-left-10p justify-center">
<view>
- <text class="text-xxl">200kg</text>
- <text class="text-xs margin-top-xs text-grey text-line-through">400kg</text>
+ <text class="text-xxl">{{showValue(item.yield )}}kg</text>
+ <text
+ class="text-xs margin-top-xs text-grey text-line-through">{{showValue(item.originWeight)}}kg</text>
</view>
<view class="text-xs margin-top-xs text-grey">
- <text>16妗�</text>
+ <text>{{showValue(item.feed)}}绛�</text>
<text style="margin: 0 10rpx;"> l </text>
- <text>70鈩�</text>
+ <text>{{showValue(item.windTemp)}}鈩�</text>
<text style="margin: 0 10rpx;"> l </text>
- <text>100min</text>
+ <text>{{showValue(item.dryTime)}}min</text>
</view>
</view>
</view>
<u-gap height="10"></u-gap>
<view class="text-grey text-sm flex justify-between">
- <text>CY20230318001</text>
- <text>2023-03-18 12:00:00</text>
+ <text>{{showValue(item.code)}}</text>
+ <text>{{showValue(item.orderTime)}}</text>
</view>
<u-line color="#f1f1f1" margin="15rpx 0 15rpx 0"></u-line>
</view>
@@ -259,22 +267,23 @@
<script>
export default {
data() {
- return {
- list: [{
- thumb: "https://cdn.uviewui.com/uview/goods/1.jpg"
- }, {
- thumb: "https://cdn.uviewui.com/uview/goods/2.jpg"
- }, {
- thumb: "https://cdn.uviewui.com/uview/goods/3.jpg"
- }, {
- thumb: "https://cdn.uviewui.com/uview/goods/4.jpg"
- }, {
- thumb: "https://cdn.uviewui.com/uview/goods/5.jpg"
- }],
+ return {
+ list: [{
+ thumb: "https://cdn.uviewui.com/uview/goods/1.jpg"
+ }, {
+ thumb: "https://cdn.uviewui.com/uview/goods/2.jpg"
+ }, {
+ thumb: "https://cdn.uviewui.com/uview/goods/3.jpg"
+ }, {
+ thumb: "https://cdn.uviewui.com/uview/goods/4.jpg"
+ }, {
+ thumb: "https://cdn.uviewui.com/uview/goods/5.jpg"
+ }],
StatusBar: this.StatusBar,
CustomBar: this.CustomBar,
percent: 50,
- activeColor: '#0081ff',
+ activeColor: '#0081ff',
+ monthList:[],
signList: [{
date: "2023-03-13",
title: "榫欓』鑽�",
@@ -320,12 +329,47 @@
time: '2021骞�10鏈�18鏃�'
}
],
+ model: {
+ date: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
+ },
+ herbList: []
}
},
onShow() {
- console.info('onShow')
+ console.info('onShow')
+
+
+ },
+ onReady() {
+ let month = uni.$u.timeFormat(new Date(), 'yyyy-mm')
+ this.getMonth(month)
+
+ let day = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd')
+ this.getOrderList(day,day)
+
},
- methods: {
+ methods: {
+ dayChange(dayInfo) { // 鐐瑰嚮鏃ユ湡
+ this.model.date = dayInfo.date
+ console.log("鐐瑰嚮鏃ユ湡", JSON.parse(JSON.stringify(dayInfo)));
+ this.getOrderList(dayInfo.date,dayInfo.date);
+ },
+ monthChange(monthInfo) { // 鍒囨崲鏈堜唤
+ console.log("鍒囨崲鏈堜唤", JSON.parse(JSON.stringify(monthInfo)));
+ let m = monthInfo.month
+ if(m<10){
+ m = '0' + m
+ }
+ let month = monthInfo.year + '-' + m
+ console.info(month)
+ this.getMonth(month)
+ },
+ showValue(value){
+ if(value == null){
+ return "--"
+ }
+ return value
+ },
show(e) {
console.info(this.CustomBar)
@@ -334,7 +378,89 @@
uni.navigateTo({
url: "/pages/charts/charts"
})
- }
+ },
+ getOrderList(date1,date2) {
+ let params = {
+ "orderTime_begin":date1 + " 00:00:00",
+ "orderTime_end":date2 + " 00:00:00",
+ }
+ this.$api.getOrderList(params).then((res) => {
+ if (res.success) {
+ this.herbList = res.result.records
+
+ let feed = this.countTotal(this.herbList,"feed");
+ let weight = this.countTotal(this.herbList,"originWeight");
+ let dryTime = this.countTotal(this.herbList,"dryTime");
+
+ let gList = [];
+ this.herbList.forEach(item => {
+ if(!gList.includes(item.herbName)){
+ gList.push(item.herbName)
+ }
+ });
+ this.model.feed = feed
+ this.model.group = gList.length
+ this.model.batch = this.herbList.length
+ this.model.weight = weight
+ this.model.dryTime = dryTime
+
+ console.info(this.model)
+ }
+ })
+ },
+ getMonth(month){
+ let params = {
+ month:month
+ }
+ this.$api.getMonth(params).then((res) => {
+ if(res.success){
+ let list = res.result || []
+ list = list.map(item => {
+ let rec = {}
+ rec.date = item;
+ rec.title = "鐢熶骇";
+ rec.info = "";
+
+ return rec
+ })
+ this.monthList = [...this.monthList,...list]
+ this.$refs.calendar.addSignList(this.monthList);
+
+ if(res.result&&res.result.length>0){
+ let date = res.result[0]
+ let array = date.split('-')
+ if(array && array.length == 3){
+ this.$refs.calendar.clickDay({"day":array[2],"month":array[1],"year":array[0]})
+ }
+
+ }
+
+
+
+ }
+
+ })
+ },
+ //璁＄畻棰勬祴杩涘害
+ calcProgress(dryTime, et) {
+ if (dryTime && et) {
+ let res = dryTime / et * 100
+ res = res.toFixed(2)
+ return res
+ }
+ return 0;
+
+ },
+ //璁＄畻瀵硅薄鏁扮粍涓煇涓睘鎬у悎璁�
+ countTotal(arr, keyName) {
+ let $total = 0;
+ $total = arr.reduce(function (total, currentValue, currentIndex, arr){
+ return currentValue[keyName] ? (total + currentValue[keyName]) : total;
+ }, 0);
+ return $total;
+ }
+
+
}
--
Gitblit v1.9.3