From 83ea9dc1674145a338e0d35f8dffce024e2ae49f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 23 九月 2025 12:49:36 +0800
Subject: [PATCH] led大屏展示修改

---
 Monitor-APP/pages/home/home.vue |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a6a38bf..30aefe4 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -17,10 +17,22 @@
 								<view class="box-item">
 									<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;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
+											style="text-align: left;">鍦ㄨ嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勮繍琛岃繃绋嬩腑锛屼俊鎭寲绯荤粺鐨勬敮鎾戣嚦鍏抽噸瑕侊紝鍏朵腑 WMS锛堜粨搴撶鐞嗙郴缁燂級 鍜� WCS锛堜粨搴撴帶鍒剁郴缁燂級 鏋勬垚浜嗘牳蹇冪殑淇℃伅涓庢帶鍒跺钩鍙般��</text>
+										
+										<text class="item-text"
+												style="text-align: left;">WMS 绯荤粺涓昏璐熻矗浠撳簱鐨勪笟鍔$鐞嗕笌鍐崇瓥鏀寔銆傚畠閫氳繃瀵瑰叆搴撱�佸嚭搴撱�佺Щ搴撱�佺洏鐐圭瓑浣滀笟娴佺▼鐨勪紭鍖栵紝瀹炵幇搴撲綅鐨勫悎鐞嗗垎閰嶅拰搴撳瓨鐨勭簿纭鎺с�俉MS 鑳藉涓� ERP銆丮ES 绛変笂灞備笟鍔$郴缁熷鎺ワ紝淇濊瘉鐗╂枡鏁版嵁銆佽鍗曚俊鎭笌瀹為檯璐х墿鐘舵�佺殑缁熶竴锛屼粠鑰屾彁楂樻暣涓緵搴旈摼鐨勯�忔槑搴﹀拰鍗忓悓鎬с��</text>
+										
+										<text class="item-text"
+												style="text-align: left;">WCS 绯荤粺鍒欐壙鎷呭簳灞傝澶囩殑瀹炴椂璋冨害涓庢帶鍒朵换鍔°�傚畠鎺ユ敹 WMS 涓嬪彂鐨勪綔涓氭寚浠わ紝鍒嗚В涓哄叿浣撶殑璁惧鍔ㄤ綔锛屽崗璋冨爢鍨涙満銆佽緭閫佺嚎銆佺┛姊溅銆丄GV 绛夊绉嶈澶囧崗鍚岃繍琛岋紝纭繚浣滀笟杩囩▼瀹夊叏楂樻晥銆俉CS 鏇村己璋冩墽琛屽眰鐨勫疄鏃舵�т笌绋冲畾鎬э紝閫氳繃璺緞浼樺寲銆佷换鍔″垎閰嶅拰鍐茬獊澶勭悊锛屼繚闅滅郴缁熺殑鏁翠綋鍚炲悙鑳藉姏銆�</text>
+										
+										<text class="item-text"
+												style="text-align: left;">WMS 涓� WCS 鐨勭揣瀵嗙粨鍚堬紝浣胯嚜鍔ㄥ寲绔嬩綋浠撳簱涓嶄粎鍏峰 楂樺眰鍚堢悊鍖栥�佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲 鐨勭壒鐐癸紝杩樿兘瀹炵幇 搴撳瓨绠$悊鐨勭簿缁嗗寲銆佺墿娴佹墽琛岀殑鏅鸿兘鍖栥�傝繖涓轰紒涓氶檷浣庤繍钀ユ垚鏈�佹彁鍗囩┖闂村埄鐢ㄧ巼鍜屽嚭鍏ュ簱鏁堢巼鎻愪緵浜嗗潥瀹炰繚闅溿��</text>
 								</view>
-								<view class="box-item">
+								<view class="box-item"></view>
+						<!-- 		<view class="box-item">
 									<text class="item-title">浠撳簱鏁版嵁</text>
 									<text class="item-subTitle">warehouse data</text>
 									<view class="img-box">
@@ -82,7 +94,7 @@
 										</view>
 
 									</view>
-								</view>
+								</view> -->
 								<view class="box-item">
 									<view class="flex-row" style="width: 100%;">
 										<!-- 宸︿晶 -->
@@ -92,22 +104,22 @@
 											<text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
 										</view>
 										<!-- 鍙充晶 -->
-										<view style="margin-left: auto;">
+										<!-- <view style="margin-left: auto;"> -->
 											<!-- 鐧惧垎姣� -->
-											<view class="flex-col"
-												style="align-items: flex-end;justify-content: flex-end;">
+											<!-- <view class="flex-col" -->
+												<!-- style="align-items: flex-end;justify-content: flex-end;"> -->
 												<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
-												<text class="item-title">{{baseInfo.usedPr}}%</text>
+												<!-- <text class="item-title">{{baseInfo.usedPr}}%</text>
 												<text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text>
 											</view>
-										</view>
+										</view> -->
 									</view>
 
 									<view class="flex-col"
 										style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
 										<!-- 杩涘害鏉� -->
 										<view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
-											<view class="progressBar" style="width: 80%;height: 2vw;">
+											<view class="progressBar" style="width: 85%;height: 2vw;">
 												<view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
 											</view>
 											<view
@@ -140,8 +152,8 @@
 													<view class="flex-col"
 														style="align-items: flex-end;justify-content: flex-end;">
 														<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
-														<text class="item-title">31</text>
-														<text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
+														<!-- <text class="item-title">31</text> -->
+														<!-- <text class="item-subTitle">浠婃棩璁㈠崟鏁�</text> -->
 													</view>
 												</view>
 											</view>
@@ -158,7 +170,7 @@
 								<view style="height: 2%;"></view>
 
 
-								<view style="height: 43%;">
+								<view style="height: 63%;">
 									<y-box>
 										<view class="box-item">
 											<view class="flex-row" style="width: 100%;">
@@ -217,13 +229,13 @@
 
 									</y-box>
 								</view>
-								<view style="height: 2%;"></view>
+						<!-- 		<view style="height: 2%;"></view>
 								<view style="height: 18%"  class="flex-row">
 										<image style="height: 100%;"
 											src="" mode="aspectFit"></image>
 										<image style="height: 100%;"
 											src="../../static/zy_logo.png" mode="aspectFit"></image>
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -244,12 +256,12 @@
 				<!-- 涓讳綋 -->
 				<view class="info-main">
 					<view class="info-box">
-						<view class="swiper-head" style="height: 10%;width: 96%;margin-left: 2%;font-size: 2.5vb;">
+						<view class="swiper-head" style="height: 10%;width: 96%;margin-left: 2%;font-size: 2.5vw;">
 							<view style="width: 15%;">璁㈠崟鍙�</view>
 							<view style="width: 10%;">鍗曡ID</view>
+							<view style="width: 10%;">鎵樼洏鐮�</view>
 							<view style="width: 15%;">鍟嗗搧缂栧彿</view>
 							<view style="width: 15%;">鍟嗗搧鍚嶇О</view>
-							<view style="width: 10%;">鎵樼洏鐮�</view>
 							<view style="width: 15%;">鐗规畩璇存槑</view>
 							<view style="width: 10%;">浣滀笟鏁伴噺</view>
 							<view style="width: 10%;">鍓╀綑鏁伴噺</view>
@@ -301,14 +313,14 @@
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 								<swiper class="swiper-body-main" vertical="true" 
 									display-multiple-items="3"
-									circular="true" :autoplay="true" :interval="3000" :duration="1000" style="font-size: 2vb;">
+									circular="true" :autoplay="true" :interval="3000" :duration="1000" style="font-size: 2.5vw;">
 										<swiper-item  class="swiper-item" v-for="(item,i) in swiperList" :key="i">
 											<!-- <view>No:{{i+1}}</view> -->
 											<view style="width: 15%;">{{item.orderNo}}</view>
 											<view style="width: 10%;"> {{item.memo}}</view>
+											<view style="width: 10%;">{{infoText.barcode}}</view>
 											<view style="width: 15%;">{{item.matnr}}</view>
 											<view style="width: 15%;">{{item.maknx}}</view>
-											<view style="width: 10%;">{{infoText.barcode}}</view>
 											<view style="width: 15%;">{{item.batch}}</view>
 											<view style="width: 10%;">{{item.count}}</view>
 											<view style="width: 10%;">{{item.total}}</view>
@@ -449,6 +461,9 @@
 				apiIp: '10.10.0.189',
 				apiPort: '8080',
 				apiUrl: 'dlzwcs',
+				// apiIp: '192.168.4.49',
+				// apiPort: '9090',
+				// apiUrl: 'jsjwcs',
 				ledInfosApi: '/console/getLedInfos',
 				info: null,
 				error: null,
@@ -537,7 +552,7 @@
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
-			}, 1800000)
+			}, 180000)
 		},
 		methods: {
 			carInfoModel(res) {

--
Gitblit v1.9.1