From 0c26022095437c5ce3d1f790b70afb7ddabf0395 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <18597012158>
Date: 星期三, 29 三月 2023 11:19:50 +0800
Subject: [PATCH] 优化部分显示

---
 pages/tabBar/monitor.vue |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pages/tabBar/monitor.vue b/pages/tabBar/monitor.vue
index 900231a..b7156de 100644
--- a/pages/tabBar/monitor.vue
+++ b/pages/tabBar/monitor.vue
@@ -16,7 +16,7 @@
 						interval="3500" duration="600">
 						<swiper-item class="swiper-list" v-for="(item, index) in bannerList" :key="index">
 							<view class="swiper-item uni-bg-red">
-								<image class="swiper-img" :src="item.imageUrl" mode="aspectFill"></image>
+								<image class="swiper-img" :src="item.imageUrl" mode="aspectFit"></image>
 							</view>
 						</swiper-item>
 					</swiper>
@@ -31,9 +31,9 @@
 				<view class='bg-orange cu-tag radius light sm margin-right-xs' v-else>鍋滄</view>
 				<!-- <view class='bg-cyan cu-tag radius light sm'>姝e父</view> -->
 			</view>
-			<view class="text-black text-df flex">
-				<text class="margin-right-xs">閰嶆柟鍚嶇О:</text>
-				<text>{{ formulaName   }} </text>
+			<view class="text-black text-df flex align-center">
+				<text class="margin-right-xs">鎵规:</text>
+				<text>{{ this.$lget(this.model,'code') }} </text>
 			</view>
 
 			<view class="text-gray  margin-top-xs">
@@ -43,7 +43,20 @@
 
 			<view class="text-gray  margin-top-xs">
 				<text class="margin-right-xs">鎶曟枡:</text>
-				<text>{{$lget(model,'feed')}}绛�</text>
+				<text class="text-cyan">{{$lget(model,'feed')}} <text class="text-gray margin-left-xs">绛�</text></text>
+			 
+			</view>
+			<view class="text-gray  margin-top-xs">
+				<text class="margin-right-xs">閲嶉噺:</text>
+				<text class="text-cyan margin-right-xs">{{$lget(model,'trendVo.weight')}}<text class="text-gray margin-left-xs">/</text></text>
+				<text>  <text class="text-line-through">{{$lget(model,'originWeight')}}</text>  <text class="text-gray margin-left-xs">kg</text></text>
+			 
+			</view>
+			
+			<view class="text-gray  margin-top-xs">
+				<text class="margin-right-xs">鐢ㄦ椂:</text>
+				<text class="text-cyan">{{$lget(model,'trendVo.totalTime')}}<text class="text-gray margin-left-xs">min</text></text>
+			 
 			</view>
 
 			<!-- <view class="margin-tb-sm" style="position: relative;">
@@ -383,10 +396,10 @@
 					tenantid: 1000
 				},
 				bannerList: [{
-						imageUrl: '/static/image/equ1.png'
+						imageUrl: 'https://dev.shlanbao.cn:9999/fileTransfer/preview?userFileId=1640616151832784896&isMin=false&shareBatchNum=&extractionCode='
 					},
 					{
-						imageUrl: '/static/image/equ1.png'
+						imageUrl: 'https://dev.shlanbao.cn:9999/fileTransfer/preview?userFileId=1640617395255177216&isMin=false&shareBatchNum=&extractionCode='
 					}
 				]
 

--
Gitblit v1.9.3