From 9c1a072c6b8813b069cd9515f709d9bc05faef65 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 27 五月 2024 09:23:17 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6a7f3fa..2ca42b2 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -15,7 +15,7 @@
 						<view class="mian-item-box">
 							<y-box>
 								<view class="box-item">
-									<text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
+									<text class="item-title">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
 									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
 									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
 								</view>
@@ -186,9 +186,7 @@
 								<view style="height: 18%;">
 									<y-box>
 										<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
-											<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
-											鑷姩浠撳簱WCS鐩戞帶骞冲彴
-											<!-- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image> -->
+											涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
 										</view>
 									</y-box>
 								</view>
@@ -233,15 +231,15 @@
 									display-multiple-items="3"
 									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">{{i+1}}\{{swiperList.length}}</view>
+											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
 											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
 											<view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
-											<view style="width: 40%;">瀹㈡埛: {{item.manu}}</view>
+											<view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
 											
 											
-											<view style="width: 20%;">鏁伴噺: {{item.count}}</view>
+											<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
 											<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
-											<view style="width: 40%;">澶囨敞: {{item.memo}}</view>
+											<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
 											
 											
 										</swiper-item>
@@ -282,7 +280,7 @@
 				<!-- 寮瑰嚭title -->
 				<view class="eject-title">淇敼 / 閰嶇疆</view>
 				<!-- input -->
-				<view class="eject-input">
+				<scroll-view scroll-y class="eject-input">
 					<view class="item">
 						<view class="desc">ip锛�</view>
 						<view class="input">
@@ -313,7 +311,7 @@
 							<input type="text" v-model="baseUrl">
 						</view>
 					</view>
-				</view>
+				</scroll-view>
 				<!-- button -->
 				<view class="eject-button">
 					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -424,10 +422,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()
 				// 娴嬭瘯鐢�
@@ -1060,12 +1058,15 @@
 		text-align: center;
 	}
 	.eject-input {
-		
+		margin-top: 2vh;
+		height: 25vh;
+		/* background-color: #00163E; */
+		::-webkit-scrollbar{display:none}
 	}
 	.item {
 		display: flex;
 		align-items: center;
-		margin: 2vh 0 0 0;
+		margin: 1vh 0 0 0;
 		font-size: 1.5vw;
 		color: #363636;
 	}

--
Gitblit v1.9.1