From f42292b39f9825a0ca0da89bc5b1d96ebbf8dceb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 12 十月 2024 10:38:35 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 8402e18..c01479b 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -185,9 +185,15 @@
 								<view style="height: 2%;"></view>
 								<view style="height: 18%;">
 									<y-box>
-										<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
+										<!-- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
 											涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
+										</view> -->
+										
+										<view style="display: flex;align-items: center;justify-content: center;width: 100%;height: 100%;">
+											<view style="flex: 1;">浣滀笟涓暟閲忥細 {{useInfo.count1 ? useInfo.count1 : '--'}}</view>
+											<view style="flex: 1;">鏈彇璐ф暟閲忥細 {{useInfo.count2 ? useInfo.count2 : '--'}}</view>
 										</view>
+										
 									</y-box>
 								</view>
 							</view>
@@ -226,20 +232,24 @@
 									<!-- swiper 涓�浜涜鏄�
 									circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
-									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->	
 									<swiper class="swiper-body-main" vertical="true" 
 									display-multiple-items="3"
-									circular="true" :autoplay="true" :interval="3000" :duration="2000">
+									circular="true" :autoplay="true" :interval="5000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
-											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
-											<view style="width: 40%;">瑙勬牸: {{item.matnr}}</view>
-											<view style="width: 30%;">鍑�閲�: {{item.weight}}</view>
+											<view style="width: 25%;">{{i+1}} / {{swiperList.length}}</view>
+											<view style="width: 25%;">鏂欏彿: {{item.matnr}}</view>
+											<view style="width: 25%;">绠卞彿: {{item.batch}}</view>
+											<view style="width: 25%;">鏁伴噺: {{item.count}}</view>
 											
+											<view style="width: 25%;">鍗峰彿: {{item.specs}}</view>
+											<view style="width: 25%;">璁㈠崟鍙�	: {{item.orderNo}}</view>
+											<view style="width: 25%;">瀹㈡埛鍚嶇О: {{item.cstmrName}}</view>
+											<view style="width: 25%;">鎬讳綔涓氫腑: {{item.count1}}</view>
 											
-											<view style="width: 30%;">闀垮害: {{item.price}}</view>
-											<view style="width: 40%;">绠卞彿: {{item.batch}}</view>
-											<view style="width: 30%;">鍗峰彿: {{item.model}}</view>
+											<view style="width: 25%;">鐮佸灈鍚庢湭鍙栬揣: {{item.count3}}</view>
+											<view style="width: 25%;">璁㈠崟浣滀笟涓�: {{item.count2}}</view>
+											<view style="width: 25%;">澶囨敞: {{item.memo}}</view>
 											
 											
 										</swiper-item>
@@ -338,6 +348,7 @@
 				homeMode: [],
 				infoMode: [],
 				errorInfoMode: [],
+				useInfo: '',
 				baseInfo: {
 					xDistance: 1,
 					yDistance: 2,
@@ -420,6 +431,7 @@
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
+				this.getUserInfo()
 				// this.getDate()
 				this.getDate2()
 				this.getInfo()
@@ -507,6 +519,20 @@
 					that.infoType = 0
 				}
 			},
+			getUserInfo() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/led",
+					method:"GET",
+					data: {ledId:that.baseLedId},
+					success(res) {
+						res = res.data
+						if (res.data && res.data != '') {
+							that.useInfo = res.data
+						}
+					}
+				})
+			},
 			getInfo() {
 				let that = this
 				uni.request({

--
Gitblit v1.9.1