From 1725e840f0d073fc6023a1c47656921e7dcfdf4d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 七月 2022 10:43:58 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 3 +
Monitor-APP/pages/index/index.vue | 85 +++++++++++++++++++++++++++++++++++++++---
Monitor-APP/pages.json | 1
3 files changed, 81 insertions(+), 8 deletions(-)
diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index 401c292..f226042 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -6,6 +6,7 @@
"navigationStyle":"custom"
}
}
+
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6237a27..f80f50d 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,6 +1,7 @@
{"dataYYY":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{
"title":"鍏ㄦ澘鍑哄簱",
"workNo":7016,
+ "orderNo":"",
"ioType":101,
"staNo":188,
"sourceStaNo":null,
@@ -25,6 +26,6 @@
{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0}
],
"emptyMk":false}]}} ,
- "dataEEE":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":"1111"}}
+ "dataEEE":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}}
}
diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index 4520b59..f82eee0 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -18,7 +18,10 @@
<text>{{title}}</text>
</view>
<view style="width: 80%;height: 100%;display: inline-block;float: left;font-size: 160rpx;">
- <text class="animate" v-show="!errorShow && pakinShow && pakinGun">{{newspaper}}</text>
+ <!--鏄剧ずorder璁㈠崟缂栧彿 -->
+ <text v-show="orderShow" style="display: inline-block;position: absolute; height: 12%;width: 68%;background-color: #001ead;z-index: 9999;" >CK20220718</text>
+ <!-- 鏄剧ず婊氬姩鍒楄〃 -->
+ <text class="animate" style="" v-show="!errorShow && pakinShow && pakinGun">{{newspaper}}</text>
<text v-show="errorShow">{{errorPaper}}</text>
<text v-show="pakinShow">{{newspaper}}</text>
</view>
@@ -263,6 +266,7 @@
errorShow:'',
pakinShow:'',
pakinGun:'',
+ orderShow:false,
}
},
mounted() {
@@ -299,13 +303,73 @@
this.animation();
},1000)
},
- onLoad() {
- // var that=this
- // plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
- // that.version=wgtinfo.version
- // });
- },
methods: {
+ getEEE() {
+ var result = ycqdata.dataEEE
+ let that = this
+ let res = result.data
+ if (res.data && res.data !== "") {
+ that.title = ''
+ that.staNo = ''
+ that.pakinShow = false
+ that.errorShow = true
+ that.errorPaper = res.data
+ that.move = false // 鏄剧ず
+ } else {
+ that.errorPaper = ''
+ that.errorShow = false
+ if (that.pakinShow) {
+ return;
+ } else {
+ that.move = true // 闅愯棌
+ }
+ }
+ },
+ getYYY() {
+ var result = ycqdata.dataYYY
+ let that = this
+ var newsData = ''
+ var str = ''
+ let res = result.data
+ if(res.data && res.data !== null) {
+ if (res.data[0].matDtos.length > 0) {
+ that.pakinShow = true
+ that.pakinGun = true
+ if (res.data[0].ioType === 101) {
+ that.title = '鍏ㄦ澘鍑哄簱'
+ } else if(res.data[0].ioType === 103) {
+ that.title = '妫�鏂欏嚭搴�'
+ }
+ if (res.data[0].orderNo) {
+ that.orderShow = true
+ } else {
+ that.orderShow = false
+ }
+ that.staNo = '鐩爣绔�' + res.data[0].staNo
+ for (var i = 0; i < res.data[0].matDtos.length; i++) {
+ str = res.data[0].matDtos[i].matnr + ' - ' + res.data[0].matDtos[i].batch + '\n'
+ newsData = newsData + str
+ }
+ if (that.errorShow) {
+ // that.pakinShow = false
+ return;
+ } else {
+ that.newspaper = newsData
+ that.move = false
+ }
+ if (res.data[0].matDtos.length <= 8) {
+ that.errorShow = true
+ that.pakinShow = true
+ that.pakinGun = false
+ }
+ } else {
+ that.move = true
+ }
+ } else {
+ that.move = true
+ }
+
+ },
getError() {
let that = this
uni.request({
@@ -356,6 +420,11 @@
} else if(res.data[0].ioType === 103) {
that.title = '妫�鏂欏嚭搴�'
}
+ if (res.data[0].orderNo) {
+ that.orderShow = true
+ } else {
+ that.orderShow = false
+ }
that.staNo = '鐩爣绔�' + res.data[0].staNo
for (var i = 0; i < res.data[0].matDtos.length; i++) {
str = res.data[0].matDtos[i].matnr + ' - ' + res.data[0].matDtos[i].batch + '\n'
@@ -383,9 +452,11 @@
},
animation() {
if (this.move) {
+ // 涓婂眰鍚戜笂 / 涓嬪眰鍚戜笂
this.topMove = 'topUp'
this.floorMove = 'floorUp'
} else {
+ // 涓婂眰鍚戜笅 / 涓嬪眰鍚戜笅
this.topMove = 'topDown'
this.floorMove = 'floorDown'
}
--
Gitblit v1.9.1