From 8cf990477e17db8607b874a01ec48dc20785181b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 10 十一月 2023 16:06:13 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   79 +++++++++++++++++++++++++++++----------
 1 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 92ce788..9bbf081 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -215,11 +215,13 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
-									<view style="width: 30%;">鍟嗗搧缂栧彿</view>
-									<view style="width: 20%;">鍟嗗搧鍚嶇О</view>
-									<view style="width: 20%;">瑙勬牸</view>
-									<view style="width: 10%;">鏁伴噺</view>
+									<view style="flex: 1;">绔欏彿锛歿{infoText.staNo}}</view>
+									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
+									<view style="flex: 2;">绠辩爜</view>
+									<view style="flex: 4;">鍟嗗搧鍚嶇О</view>
+									<view style="flex: 5;">瑙勬牸</view>
+									<view style="flex: 1;">浣滀笟鏁伴噺</view>
+									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view>
 								<!-- body -->
 								<view class="swiper-body">
@@ -228,14 +230,16 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="8"
+									display-multiple-items="15"
 									circular="true" :autoplay="true" :interval="3000" :duration="1000">
-										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">No:{{i+1}}</view>
-											<view style="width: 30%;">{{item.matNo}}</view>
-											<view style="width: 20%;">{{item.maknx}}</view>
-											<view style="width: 20%;">{{item.specs}}</view>
-											<view style="width: 10%;">{{item.count}}</view>
+										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i" :style="item.color">
+											<view style="flex: 1;">No:{{i+1}}</view>
+											<view style="flex: 2;">{{item.matNo}}</view>
+											<view style="flex: 2;">{{item.containerCode}}</view>
+											<view style="flex: 4;">{{item.maknx}}</view>
+											<view style="flex: 5;">{{item.specs}}</view>
+											<view style="flex: 1;">{{item.count}}</view>
+											<view style="flex: 1;">{{item.total}}</view>
 										</swiper-item>
 									</swiper>
 								</view>
@@ -414,22 +418,46 @@
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
-			// this.getUrl()
+			
+			
+		
+			this.getDate2()
+			setTimeout(()=>{
+				// this.getServerData()
+				// this.initlineChart()
+				// this.initPieChart()
+				// this.getOther()
+				setTimeout(()=>{
+					this.getServerData()
+					this.initlineChart()
+					this.initPieChart()
+					this.getOther()
+					setTimeout(()=>{
+						this.getServerData()
+						this.initlineChart()
+						this.initPieChart()
+						this.getOther()
+					},3000)
+				},1000)
+			},1000)
 		},
 		onLoad() {
+			setInterval(()=>{
+				this.getDate2()
+				this.getUrl()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
+				this.controller()
+			},1000)
+			
 			setInterval(()=>{
 				this.getServerData()
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
-				this.getDate2()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
-				this.getUrl()
-				this.controller()
-			},1000)
+			},600000)
 		},
 		methods: {
 			timeOuts() {
@@ -530,6 +558,14 @@
 					} else if(res.data[0].ioType === 107) {
 						that.infoText.title = '鐩樼偣鍑哄簱'
 					}
+					res.data[0].matDtos
+					for(let k in res.data[0].matDtos) {
+						
+						if(res.data[0].matDtos[k].count != 0) {
+							res.data[0].matDtos[k]['color'] = 'color: #df741c'
+						}
+					}
+					console.log(that.swiperList);
 					that.infoText.staNo = res.data[0].staNo
 					that.swiperList = res.data[0].matDtos
 					// that.infoText.matnr = res.data[0].matDtos[0].matnr
@@ -673,6 +709,7 @@
 					url: that.commonUrl + "/monitor/date",
 					method:"GET",
 					success(result) {
+						// console.log(result);
 						var res = result.data.data
 						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
 						that.currDate = res.year + "/" + res.month + "/" + res.day

--
Gitblit v1.9.1