From ac186ac5c9edbe245b70676f86ad2f68bf3f34a7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 21 十一月 2024 09:14:58 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  112 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a5d8769..18adba6 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,11 +218,10 @@
                             <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: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
+									<view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
+									<view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+									<view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
                                 </view>
                                 <!-- body -->
                                 <view class="swiper-body">
@@ -231,14 +230,18 @@
                                     vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
                                     display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
                                     <swiper class="swiper-body-main" vertical="true" 
-                                    display-multiple-items="8"
+                                    display-multiple-items="3"
                                     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.matnr}}</view>
-                                            <view style="width: 20%;">{{item.maknx}}</view>
-                                            <view style="width: 20%;">{{item.specs}}</view>
-                                            <view style="width: 10%;">{{item.count}}</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: 30%;">鍝佸彿: {{item.matnr}}</view>
+                                            
+                                            
+                                            <view style="width: 30%;">浣滀笟: {{item.count}} / 鍘熸暟: {{item.total}}</view>
+                                            <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
+                                            <view style="width: 30%;">鍗曟嵁鍙�: {{item.orderNo}}</view>
                                         </swiper-item>
                                     </swiper>
                                 </view>
@@ -402,7 +405,7 @@
             that.baseLedId = BaseLedId
             that.basePort = BasePort
             that.baseCrnId = BaseCrnId
-            this.getUrl()
+            // this.getUrl()
 			setTimeout(()=>{
 				this.getServerData()
 				this.initlineChart()
@@ -427,10 +430,10 @@
 				this.getServerData()
 				this.getDate2()
 				this.getUrl()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
 				this.controller()
 			},1000)
 			
@@ -484,12 +487,42 @@
                     }
                     // infoType1:鍙湁鎷f枡绛変俊鎭�
                     that.infoType = 1
-                    if (res.data[0].ioType === 101) {
-                        that.infoText.title = '鍏ㄦ澘鍑哄簱'
-                    } else if(res.data[0].ioType === 103) {
-                        that.infoText.title = '妫�鏂欏嚭搴�'
+                    switch (res.data[0].ioType) {
+                    	case 1:
+                    		that.infoText.title = '鍏ㄦ澘鍏ュ簱'
+                    		break;
+                    	case 1:
+                    		that.infoText.title = '绌烘澘鍏ュ簱'
+                    		break;
+                    	case 53:
+                    		that.infoText.title = '鎷f枡鍥炲簱'
+                    		break;
+                    	case 54:
+                    		that.infoText.title = '骞舵澘鍥炲簱'
+                    		break;
+                    	case 57:
+                    		that.infoText.title = '鐩樼偣鍥炲簱'
+                    		break;
+                    	case 101:
+                    		that.infoText.title = '鍏ㄦ澘鍑哄簱'
+                    		break;
+                    	case 103:
+                    		that.infoText.title = '鎷f枡鍑哄簱'
+                    		break;
+                    	case 104:
+                    		that.infoText.title = '骞舵澘鍑哄簱'
+                    		break;
+                    	case 107:
+                    		that.infoText.title = '鐩樼偣鍑哄簱'
+                    		break;
+                    	case 110:
+                    		that.infoText.title = '绌烘澘鍑哄簱'
+                    		break;
                     }
-                    that.infoText.staNo = res.data[0].staNo
+                    that.infoText.barcode = res.data[0].barcode
+					that.infoText.workNo = res.data[0].workNo
+					that.infoText.staNo = res.data[0].staNo
+					that.infoText.sourceLocNo = res.data[0].sourceLocNo
                     that.swiperList = res.data[0].matDtos
                     // that.infoText.matnr = res.data[0].matDtos[0].matnr
                     // that.infoText.specs = res.data[0].matDtos[0].specs
@@ -539,14 +572,49 @@
                             }
                             // infoType1:鍙湁鎷f枡绛変俊鎭�
                             that.infoType = 1
+							switch (res.data[0].ioType) {
+								case 1:
+									that.infoText.title = '鍏ㄦ澘鍏ュ簱'
+									break;
+								case 1:
+									that.infoText.title = '绌烘澘鍏ュ簱'
+									break;
+								case 53:
+									that.infoText.title = '鎷f枡鍥炲簱'
+									break;
+								case 54:
+									that.infoText.title = '骞舵澘鍥炲簱'
+									break;
+								case 57:
+									that.infoText.title = '鐩樼偣鍥炲簱'
+									break;
+								case 101:
+									that.infoText.title = '鍏ㄦ澘鍑哄簱'
+									break;
+								case 103:
+									that.infoText.title = '鎷f枡鍑哄簱'
+									break;
+								case 104:
+									that.infoText.title = '骞舵澘鍑哄簱'
+									break;
+								case 107:
+									that.infoText.title = '鐩樼偣鍑哄簱'
+									break;
+								case 110:
+									that.infoText.title = '绌烘澘鍑哄簱'
+									break;
+							}
                             if (res.data[0].ioType === 101) {
                                 that.infoText.title = '鍏ㄦ澘鍑哄簱'
                             } else if(res.data[0].ioType === 103) {
-                                that.infoText.title = '妫�鏂欏嚭搴�'
+                                that.infoText.title = '鎷f枡鍑哄簱'
                             } else if(res.data[0].ioType === 107) {
                                 that.infoText.title = '鐩樼偣鍑哄簱'
                             }
+                            that.infoText.barcode = res.data[0].barcode
+                            that.infoText.workNo = res.data[0].workNo
                             that.infoText.staNo = res.data[0].staNo
+                            that.infoText.sourceLocNo = res.data[0].sourceLocNo
                             that.swiperList = res.data[0].matDtos
                             // that.infoText.matnr = res.data[0].matDtos[0].matnr
                             // that.infoText.specs = res.data[0].matDtos[0].specs

--
Gitblit v1.9.1