From 8edd23458c23880ca8b19d54f05e0afa35579ca4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 02 九月 2024 14:13:20 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  157 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 131 insertions(+), 26 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 7366f87..efea331 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -243,11 +243,15 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<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 style="width: 12%;">璁㈠崟鍙�</view>
+									<view style="width: 12%;">宸ヤ綔鍙�</view>
+									<view style="width: 12%;">绠辩爜</view>
+									<view style="width: 12%;">鍟嗗搧缂栧彿</view>
+									<view style="width: 12%;">鍟嗗搧鍚嶇О</view>
+									<view style="width: 10%;">瑙勬牸</view>
 									<view style="width: 10%;">鏁伴噺</view>
+									<view style="width: 10%;">缁撲綑</view>
 								</view>
 								<!-- body -->
 								<view class="swiper-body">
@@ -258,12 +262,17 @@
 									<swiper class="swiper-body-main" vertical="true" 
 									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 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 class="swiper-item" v-for="(item,i) in locs" :key="i"
+										:style="item.color">
+											<view style="width: 10%;">No:{{i+1}}</view>
+											<view style="width: 12%;">{{item.orderNo ? item.orderNo : '--'}}</view>
+											<view style="width: 12%;">{{item.wrkNo ? item.wrkNo : '--'}}</view>
+											<view style="width: 12%;">{{item.suppCode ? item.suppCode : '--'}}</view>
+											<view style="width: 12%;">{{item.matnr}}</view>
+											<view style="width: 12%;">{{item.maktx}}</view>
+											<view style="width: 10%;">{{item.specs ? item.specs : '--'}}</view>
+											<view style="width: 10%;">{{item.anfme ? item.anfme : '--'}}</view>
+											<view style="width: 10%;">{{item.volume ? item.volume : '--'}}</view>
 										</swiper-item>
 									</swiper>
 								</view>
@@ -333,6 +342,12 @@
 							<input type="text" v-model="baseUrl">
 						</view>
 					</view>
+					<view class="item">
+						<view class="desc">绔欑偣锛�</view>
+						<view class="input">
+							<input type="text" v-model="devNo">
+						</view>
+					</view>
 				</view>
 				<!-- button -->
 				<view class="eject-button">
@@ -351,8 +366,8 @@
 		data() {
 			return {
 				series: [],
-				homeViewShow: true,
-				infoViewShow: false	,
+				homeViewShow: false,
+				infoViewShow: true	,
 				errorInfoViewShow: false,
 				homeMode: [],
 				infoMode: [],
@@ -414,7 +429,9 @@
 					count: "",
 					error: ""
 				},
-				swiperList: []
+				swiperList: [],
+				devNo: 'CS-313',
+				locs: []
 			}
 		},
 		onShow() {
@@ -430,34 +447,117 @@
 			const BasePort = uni.getStorageSync('BasePort');
 			const BaseCrnId = uni.getStorageSync('BaseCrnId');
 			const PROJ = uni.getStorageSync('UPROJ');
+			const DEVNO = uni.getStorageSync('devNo');
 			that.baseUrl = PROJ
 			that.baseIP = BaseIP
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
+			that.devNo = DEVNO
 			// this.getUrl()
 		},
 		onLoad() {
-			setInterval(()=>{
-				this.getServerData()
-				this.initlineChart()
-				this.initPieChart()
-				this.getOther()
-				this.getDate()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
+			setTimeout(()=> {
 				this.getUrl()
-				this.controller()
+			},1000)
+			setInterval(()=>{
 				// 娴嬭瘯鐢�
 				
+				this.getVisualized()
+				// this.getVisualizedTest()
 			},1000)
 		},
 		methods: {
 			getUrl() {
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
 			},
+			getVisualizedTest() {
+				let that = this
+				var result = ycqdata.dataInfo3
+				// console.log(result);
+				let res = result.data
+				if (res.code === 200) {
+					// console.log(res.data.agvWaitPakins);
+					if (res.data.agvWrkDetls != null) {
+						that.locs = res.data.agvWrkDetls
+						if (res.data.agvWrkMast) {
+							if (res.data.agvWrkMast.ioType == 107) {
+								that.infoText.title = '鐩樼偣鍑哄簱'
+							} else if (res.data.agvWrkMast.ioType == 103) {
+								that.infoText.title = '鎷f枡鍑哄簱'
+							} else if (res.data.agvWrkMast.ioType == 57) {
+								that.infoText.title = '鐩樼偣鍐嶅叆搴�'
+							} else if (res.data.agvWrkMast.ioType == 53) {
+								that.infoText.title = '鎷f枡鍐嶅叆搴�'
+							} else if (res.data.agvWrkMast.ioType == 101) {
+								that.infoText.title = '鍏ㄦ澘鍑哄簱'
+							} 
+						} else{
+							that.infoText.title = '鍏ュ簱浣滀笟'
+						}
+					} else if (res.data.agvWaitPakins != null) {
+						that.locs = res.data.agvWaitPakins
+						that.infoText.title = '鍏ュ簱浣滀笟'
+					}
+					
+					
+					
+				}
+			},
+			getVisualized() {
+				let that = this
+				let param = {devNo: `${that.devNo}`}
+				uni.request({
+					url: `${that.commonUrl}/rpc/info`,
+					header: {
+						'Access-Control-Allow-Origin': '*',
+						'Access-Control-Allow-Methods': 'GET,POST,OPTIONS',
+						'Access-Control-Allow-Headers': 'X-Request-with,Content-Type',
+						},
+					sslVerify: false,
+					withCredentials: true,
+					method: 'POST',
+					data: JSON.stringify(param),
+					success(res) {
+						res = res.data
+						that.result = res
+						if (res.code === 200) {							
+							if (res.data.agvWrkDetls != null) {
+								that.locs = res.data.agvWrkDetls
+								if (res.data.agvWrkMast) {
+									if (res.data.agvWrkMast.ioType == 107) {
+										that.infoText.title = '鐩樼偣鍑哄簱'
+									} else if (res.data.agvWrkMast.ioType == 103) {
+										that.infoText.title = '鎷f枡鍑哄簱'										
+										for (let k in that.locs) {										
+											if (that.locs[k].anfme == 0 || that.locs[k].anfme == null) {
+												that.locs[k]['color'] = 'color: #df741c'
+											}
+										}										
+									} else if (res.data.agvWrkMast.ioType == 57) {
+										that.infoText.title = '鐩樼偣鍐嶅叆搴�'
+									} else if (res.data.agvWrkMast.ioType == 53) {
+										that.infoText.title = '鎷f枡鍐嶅叆搴�'
+									} else if (res.data.agvWrkMast.ioType == 101) {
+										that.infoText.title = '鍏ㄦ澘鍑哄簱'
+									} 
+									
+									
+								} else{
+									that.infoText.title = '鍏ュ簱浣滀笟'
+								}
+							} else if (res.data.agvWaitPakins != null) {
+								that.locs = res.data.agvWaitPakins
+								that.infoText.title = '鍏ュ簱浣滀笟'
+							}
+							
+							
+							
+						}
+					}
+				})
+			},
+			
 			getServerData() {
 				this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
 				this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
@@ -689,6 +789,7 @@
 				uni.setStorageSync('BasePort',this.basePort);
 				uni.setStorageSync('BaseCrnId',this.baseCrnId);
 				uni.setStorageSync('UPROJ',this.baseUrl);
+				uni.setStorageSync('devNo',this.devNo);
 				this.getUrl()
 				this.ejectShow = false
 			},
@@ -752,7 +853,7 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
-							console.log(res.data.pie);
+							// console.log(res.data.pie);
 							that.chartsData.Pie.series[0].data = res.data.pie
 							that.baseInfo.longAllLoc = res.data.longAllLoc
 							that.baseInfo.shortAllLoc = res.data.shortAllLoc
@@ -809,6 +910,10 @@
 		display: flex;
 		flex-direction: row;
 	}
+	
+	.red {
+			color: red
+		}
 	
 	.container{
 		width: 100vw;
@@ -1015,7 +1120,7 @@
 	.eject{
 		position: relative;
 		width: 40vw;
-		height: 40vh;
+		height: 50vh;
 		background-color: #fff;
 		border-radius: 2rem;
 	}

--
Gitblit v1.9.1