From 7a958524ae462a5f28724cbb72b2338b6797385a Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 16 十一月 2022 00:15:41 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  126 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 375516a..0690806 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -10,12 +10,53 @@
 				<view class="time-tools">{{calendar}}</view>
 				<view class="button-left"></view>
 				<view class="button-right"></view>
-			</view>
-			<view class="main">
-				<view class="home-left">
-					<y-box></y-box>
+				<!-- 涓讳綋 -->
+				<view class="main">
+					<view class="mian-item">
+						<view class="mian-item-box">
+							<y-box>
+								<view class="content-item">
+									<text>鑷姩鍖栫珛浣撲粨搴�</text>
+									<p class="english">Automatic Storageand Retrieval System</p>
+									<p class="introduce-content">  鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛�
+									鑷姩鍖栫珛浣撲粨搴撴槸褰撳墠鎶�鏈按骞宠緝楂樼殑褰㈠紡銆�
+									鑷姩鍖栫珛浣撲粨搴撶殑涓讳綋鐢辫揣鏋躲�佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆�
+									璐ф灦鏄挗缁撴瀯鎴栭挗绛嬫贩鍑濆湡缁撴瀯鐨勫缓绛戠墿鎴栫粨鏋勪綋锛岃揣鏋跺唴鏄爣鍑嗗昂瀵哥殑璐т綅绌洪棿锛屽贩閬撳爢鍨涜捣閲嶆満绌胯浜庤揣
+									鏋朵箣闂寸殑宸烽亾涓紝瀹屾垚瀛樸�佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</p>
+								</view>
+								<view class="content-item img">
+									<text>浠撳簱鏁版嵁</text>
+									<p class="english">warehouse data</p>
+									<view>
+										<view class="charge-info-item">
+											<image src="../../static/a1.png" mode="aspectFit"></image>
+											<view>
+												<text class="count">{{xDistance}}</text>
+												<text class="unit">m</text>
+											</view>
+											<view>绱璧拌璺濈(绫�)</view>
+										</view>
+									</view>
+								</view>
+							</y-box>
+						</view>
+					</view>
+					<view class="mian-item">
+						<view class="mian-item-box">
+							<view style="height: 38%;">
+								<y-box></y-box>
+							</view>
+							<view style="height: 2%;"></view>
+							<view style="height: 38%;">
+								<y-box></y-box>
+							</view>
+							<view style="height: 2%;"></view>
+							<view style="height: 20%;">
+								<y-box></y-box>
+							</view>
+						</view>
+					</view>
 				</view>
-				<view class="home-right"></view>
 			</view>
 		</uni-transition>
 		<!-- 鍏ㄦ澘/鎷f枡淇℃伅 -->
@@ -44,7 +85,11 @@
 					boxShadow: '0 0 5px 1px rgba(0,0,0,0.2)'
 				},
 				duration: 1000,
-				calendar: ''
+				calendar: '',
+				xDistance: '',
+				yDistance: '',
+				xDuration: '',
+				yDuration: '',
 			}
 		},
 		onShow() {
@@ -109,9 +154,18 @@
 		background-image: url(../../static/background.png);
 		background-size: 100vw 100vh;
 	}
+	.home-right {
+		width: 50vw;
+		height: 89vh;
+		/* background-color: cadetblue; */
+	}
+	.home-right-box {
+		width: 98%;
+		height: 98%;
+	}
 	.head {
 		width: 100vw;
-		height: 10vh;
+		height: 11vh;
 		font-size: 4vh;
 		font-weight: 700;
 		display: flex;
@@ -143,6 +197,62 @@
 		width: 13.5%;
 		height: 8.5%;
 	}
+	.charge-info-item {
+		width: 100%;
+		height: 100%;
+	}
+	.charge-info-item image {
+		height: 100%;
+		width: 100%;
+	}
+	
+	
+	
+	/* 鍏辩敤 */
+	.main {
+		width: 100vw;
+		height: 88vh;
+		margin-top: 1vh;
+		display: flex;
+		
+	}
+	.mian-item {
+		width: 50%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	.mian-item:last-child {
+		align-items: flex-start;
+	}
+	.mian-item-box {
+		width: 98%;
+		height: 98%;
+	}
+	.content-item {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: flex-start;
+		margin-top: 1vh;
+		margin-left: 4%;
+		margin-right: 4%;
+	}
+	.english {
+		font-size: 0.1vh;
+	}
+	.introduce-content {
+		font-size: 0.3vh;
+		padding-top: 2vh;
+		text-indent: 3vh;
+		letter-spacing: 0.3vh;
+	}
+	
+	
+	
+	
 	/* 鍏ㄦ澘/鎷f枡淇℃伅 */
 	.info {
 		width: 100vw;
@@ -155,6 +265,4 @@
 		min-height: 100vh;
 		background-color: #00ffff;
 	}
-	/* 鍏辩敤 */
-	
 </style>
\ No newline at end of file

--
Gitblit v1.9.1