From e9119355cb0ac224b1846988cfee9ed06fa70050 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 三月 2023 12:50:45 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   57 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6715bc2..7cedcd9 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="container">
+		<!-- 瀹佹尝鎹蜂赴椤圭洰 -->
 		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
 				<view class="head">
@@ -173,7 +174,7 @@
 													</view>
 													<view class="flex-row sub-info" style="margin-top: 2vh;">
 														<image src="../../static/e1.png" mode="aspectFit"></image>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;">绂佺敤</view>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
 														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
 													</view>
 												</view>
@@ -217,9 +218,11 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<view>鐩爣绔欙細</view>
-									<view>鍟嗗搧缂栧彿</view>
-									<view>鍟嗗搧鍚嶇О</view>
+									<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>
 								<!-- body -->
 								<view class="swiper-body">
@@ -228,10 +231,14 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="16"
+									display-multiple-items="8"
 									circular="true" :autoplay="true" :interval="3000" :duration="1000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view>{{item}}</view>
+											<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>
 									</swiper>
 								</view>
@@ -375,9 +382,6 @@
 					error: ""
 				},
 				swiperList: []
-				
-				
-				
 			}
 		},
 		onShow() {
@@ -407,10 +411,10 @@
 				this.initPieChart()
 				this.getOther()
 				this.getDate()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
 				this.getUrl()
 				this.controller()
 				// 娴嬭瘯鐢�
@@ -442,10 +446,11 @@
 						that.infoText.title = '妫�鏂欏嚭搴�'
 					}
 					that.infoText.staNo = res.data[0].staNo
-					that.infoText.matnr = res.data[0].matDtos[0].matnr
-					that.infoText.specs = res.data[0].matDtos[0].specs
-					that.infoText.maknx = res.data[0].matDtos[0].maknx
-					that.infoText.count = res.data[0].matDtos[0].count
+					that.swiperList = res.data[0].matDtos
+					// that.infoText.matnr = res.data[0].matDtos[0].matnr
+					// that.infoText.specs = res.data[0].matDtos[0].specs
+					// that.infoText.maknx = res.data[0].matDtos[0].maknx
+					// that.infoText.count = res.data[0].matDtos[0].count
 				} else {
 					if (that.infoType == 2 || that.infoType == 3) {
 						return;
@@ -493,12 +498,15 @@
 								that.infoText.title = '鍏ㄦ澘鍑哄簱'
 							} else if(res.data[0].ioType === 103) {
 								that.infoText.title = '妫�鏂欏嚭搴�'
+							} else if(res.data[0].ioType === 107) {
+								that.infoText.title = '鐩樼偣鍑哄簱'
 							}
 							that.infoText.staNo = res.data[0].staNo
-							that.infoText.matnr = res.data[0].matDtos[0].matnr
-							that.infoText.specs = res.data[0].matDtos[0].specs
-							that.infoText.maknx = res.data[0].matDtos[0].maknx
-							that.infoText.count = res.data[0].matDtos[0].count
+							that.swiperList = res.data[0].matDtos
+							// that.infoText.matnr = res.data[0].matDtos[0].matnr
+							// that.infoText.specs = res.data[0].matDtos[0].specs
+							// that.infoText.maknx = res.data[0].matDtos[0].maknx
+							// that.infoText.count = res.data[0].matDtos[0].count
 						} else {
 							if (that.infoType == 2 || that.infoType == 3) {
 								return;
@@ -517,17 +525,18 @@
 					method:"GET",
 					success(result) {
 						var	res = result.data
-						console.log(res);
 						if (res.data && res.data !== "") {
 							var errorInfo = res.data
 							if (that.infoType == 1) {
 								that.infoType = 3
-								that.infoText.title = "寮傚父"
+								that.infoText.title = "鍏朵粬淇℃伅" 
+								// that.infoText.title = "寮傚父"
 								that.infoText.error = errorInfo
 								return
 							}
 							that.infoType = 2
-							that.infoText.title = "寮傚父"
+							that.infoText.title = "鍏朵粬淇℃伅"
+							// that.infoText.title = "寮傚父"
 							that.infoText.error = errorInfo
 						} else {
 							if (that.infoType == 1) {

--
Gitblit v1.9.1