From 8e8d6259ac5680a9c5eef963b809f07914828207 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 01 七月 2024 08:32:03 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 878d8c3..05e4dc7 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -15,9 +15,9 @@
 						<view class="mian-item-box">
 							<y-box>
 								<view class="box-item">
-									<text class="item-title">鏅鸿兘浠撳偍澶у睆鏄剧ず绯荤粺</text>
+									<text class="item-title">鏅鸿兘浠撳偍鐗╂祦绯荤粺</text>
 									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
-									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
+									<text class="item-text" style="text-align: left;">璇ョ郴缁熶富瑕佺敤浜庤溅闂村唴鍘熸潗鏂欍�佸崐鎴愬搧銆佹垚鍝佺殑鑷姩鍖栧瓨鍌ㄣ�佸嚭鍏ュ簱鍙婇厤閫佺鐞嗐�傝绯荤粺閰嶇疆浜�2816涓爣鍑嗘枡鐩掍粨浣嶃�備緷鎵樺厛杩涚殑鍫嗗灈鏈烘銆佽緭閫佹粴绛掑強RFID鎶�鏈紝涓嶹CS鍙奧MS杞欢绯荤粺娣卞害铻嶅悎锛屽疄鐜板偍杩愪綔涓氱殑楂樻晥鍗忓悓涓庣簿纭鐞嗐�傚垱鏂伴噰鐢ㄧ殑鍙屽眰搴撲綅璁捐涓庡弻宸ヤ綅鍙屼几浣嶈揣鍙夋妧鏈紝瀹炵幇浜嗙墿鏂欑殑骞惰澶勭悊锛屽吋椤惧簱瀹瑰悓鏃舵彁鍗囩墿鏂欏鐞嗘晥鐜囷紝姝ゅ锛岀郴缁熻繕閰嶅浜嗚嚜涓荤爺鍒禔GV鑷姩鎺ラ┏绯荤粺锛屽疄鐜扮墿鏂欏湪鏂欏簱鍜岀敓浜у伐浣嶇殑寰�澶嶈嚜鍔ㄦ祦杞紝鏋佸ぇ鎻愬崌浜嗙墿鏂欑殑杞繍鏁堢巼鍜岀敓浜х嚎鐨勮繛缁繍琛岃兘鍔涖��</text>
 								</view>
 								<view class="box-item">
 									<text class="item-title">浠撳簱鏁版嵁</text>
@@ -228,7 +228,7 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="3"
+									display-multiple-items="6"
 									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
 											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
@@ -240,7 +240,6 @@
 											<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
 											<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
 											<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
-											
 											<!-- 11 -->
 										</swiper-item>
 									</swiper>
@@ -319,7 +318,7 @@
 				</view>
 			</view>
 		</view>
-		<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+		<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOuts">
 			杩炴帴瓒呮椂: {{times}} s
 		</view>
 	</view>
@@ -389,7 +388,7 @@
 					barcode: ""
 				},
 				swiperList: [],
-				timeOut: false,
+				timeOuts: false,
 				times: 0,
 				currDate: ''
 			}
@@ -422,10 +421,10 @@
 				this.getOther()
 				// this.getDate()
 				this.getDate2()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
+				// this.getInfo()
+				// this.getError()
+				this.getInfo2()
+				this.getError2()
 				this.getUrl()
 				this.controller()
 				// 娴嬭瘯鐢�
@@ -514,7 +513,7 @@
 					method:"GET",
 					data: {ledId:that.baseLedId},
 					success(result) {
-						that.timeOut = false
+						that.timeOuts = false
 						that.times = 0
 						var	res = result.data
 						if (res.data && res.data !== "") {
@@ -553,7 +552,7 @@
 						}
 					},
 					fail(err) {
-						that.timeOut = true
+						that.timeOuts = true
 						that.times = that.times+3
 						that.infoType = 0
 					}
@@ -567,7 +566,7 @@
 					data: {ledId:that.baseLedId},
 					method:"GET",
 					success(result) {
-						that.timeOut = false
+						that.timeOuts = false
 						that.times = 0
 						var	res = result.data
 						if (res.data && res.data !== "") {
@@ -591,7 +590,7 @@
 						}
 					},
 					fail(err) {
-						that.timeOut = true
+						that.timeOuts = true
 						that.infoType = 0
 					}
 				})

--
Gitblit v1.9.1