From 7a98e0aa96265c35e658732e5152ce13c3df24e4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 07 八月 2025 17:05:49 +0800
Subject: [PATCH] 1
---
Monitor-APP/manifest.json | 3 ++-
Monitor-APP/pages/home/home.vue | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Monitor-APP/manifest.json b/Monitor-APP/manifest.json
index 6c5100a..ea92a58 100644
--- a/Monitor-APP/manifest.json
+++ b/Monitor-APP/manifest.json
@@ -41,7 +41,8 @@
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ]
+ ],
+ "abiFilters" : [ "armeabi-v7a" ]
},
/* ios鎵撳寘閰嶇疆 */
"ios" : {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 1fc6a86..81e3638 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -233,7 +233,7 @@
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
<view style="width: 100%;display: flex;flex-direction: column;
align-items: center;justify-content: space-around;">
- <view style="width: 60%;font-size:4vw" v-show="!pakoutShow">搴撲綅鍙�: {{infoText.locNo}}</view>
+ <view style="width: 60%;font-size:4vw" v-show="pakoutShow">搴撲綅鍙�: {{infoText.locNo}}</view>
<view style="width: 60%;font-size:4vw" v-show="pakoutShow">浜у搧浠ｅ彿: {{item.matnr}}</view>
<view style="width: 60%;font-size:4vw" v-show="pakoutShow">浜у搧鍚嶇О: {{item.maknx}}</view>
<view style="width: 60%;font-size:4vw" v-show="pakoutShow">鏁伴噺: [{{item.count}} / {{item.total}}]</view>
@@ -377,6 +377,8 @@
infoText: {
title: '',
staNo: "",
+ locNo: "",
+ sourceLocNo: "",
matnr: "",
maknx: "",
specs: "",
@@ -419,10 +421,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()
// 娴嬭瘯鐢�
@@ -535,25 +537,27 @@
that.pakoutShow = true
} else if(res.data[0].ioType === 53) {
that.infoText.title = '鎷ｆ枡鍏ュ簱'
- that.pakoutShow = false
+ that.pakoutShow = true
} else if(res.data[0].ioType === 57) {
that.infoText.title = '鐩樼偣鍏ュ簱'
- that.pakoutShow = false
+ that.pakoutShow = true
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
that.pakoutShow = true
} else if(res.data[0].ioType === 1) {
that.infoText.title = '鍏ュ簱'
- that.pakoutShow = false
+ that.pakoutShow = true
} else if(res.data[0].ioType === 10) {
that.infoText.title = '绌烘墭鍏ュ簱'
that.pakoutShow = false
} else if(res.data[0].ioType === 110) {
that.infoText.title = '绌烘墭鍑哄簱'
+ that.pakoutShow = false
}
that.infoText.barcode = res.data[0].barcode
that.infoText.workNo = res.data[0].workNo
that.infoText.sourceLocNo = res.data[0].sourceLocNo
+ that.infoText.locNo = res.data[0].locNo
that.infoText.staNo = res.data[0].staNo
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
--
Gitblit v1.9.1