From 5c62f5e53b42f117802b8101e1ee121e758991c1 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 15 五月 2022 19:57:55 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/index.vue | 88 ++++++--------------------------------------
Monitor-APP/pages/index/data.js | 3 +
2 files changed, 15 insertions(+), 76 deletions(-)
diff --git a/Monitor-APP/pages/index/data.js b/Monitor-APP/pages/index/data.js
index be40313..7ea549f 100644
--- a/Monitor-APP/pages/index/data.js
+++ b/Monitor-APP/pages/index/data.js
@@ -76,6 +76,9 @@
var str = ''
let res = result.data
if (res.data[0].matDtos.length > 0) {
+ if (res.data[0].matDtos.length <= 8) {
+ that.pakinShow = true
+ }
if (res.data[0].ioType === 101) {
that.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index e4828b5..74ef14e 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -17,9 +17,10 @@
<view style="width: 10%;height: 100%;display:inline-block;float: left;text-align: center;padding-top: 180px;">
<text>{{title}}</text>
</view>
- <view style="width: 80%;height: 100%;display: inline-block;float: left;font-size: 170rpx;">
- <text class="animate" v-show="!errorShow">{{newspaper}}</text>
+ <view style="width: 80%;height: 100%;display: inline-block;float: left;font-size: 160rpx;">
+ <text class="animate" v-show="!errorShow && !pakinShow">{{newspaper}}</text>
<text v-show="errorShow">{{newspaper}}</text>
+ <text v-show="pakinShow">{{newspaper}}</text>
</view>
<view style="width: 10%;height: 100%;display: inline-block;float: right;padding-top: 180px;">
<text>{{staNo}}</text>
@@ -258,6 +259,7 @@
title:'',
staNo:'',
errorShow:'',
+ pakinShow:''
}
},
mounted() {
@@ -287,12 +289,12 @@
}, 1000);
setInterval(() => {
this.getDate();
- // this.getPakin();
- // this.getError();
- this.getYYY();
- this.getEEE();
+ this.getPakin();
+ this.getError();
+ // this.getYYY();
+ // this.getEEE();
this.animation();
- },2000)
+ },1500)
},
onLoad() {
// var that=this
@@ -301,75 +303,6 @@
// });
},
methods: {
-
- getEEE() {
- var result = {'data':{"msg":"鎿嶄綔鎴愬姛","code":200,"data":"鎿嶄綔鎴愬姛"}}
- let that = this
- let res = result.data
- if (res.data) {
- that.title = ''
- that.staNo = ''
- that.errorShow = true
- that.newspaper = res.data
- that.move = false
- } else {
- that.errorShow = false
- }
- },
- getYYY() {
- var result = {
- 'data':{"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{
- "title":"鍏ㄦ澘鍑哄簱",
- "workNo":7016,
- "ioType":101,
- "staNo":188,
- "sourceStaNo":null,
- "locNo":null,
- "sourceLocNo":"0900107",
- "matDtos":[
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037502300","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505146","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504801","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507729","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507727","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507731","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504807","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504805","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504797","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504794","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504791","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504793","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505141","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507728","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504810","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0},
- ],
- "emptyMk":false}]} }
- let that = this
- var newsData = ''
- var str = ''
- let res = result.data
- if (res.data[0].matDtos.length > 0) {
- if (res.data[0].ioType === 101) {
- that.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.title = '妫�鏂欏嚭搴�'
- }
- 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) {
- return;
- } else {
- that.newspaper = newsData
- that.move = false
- }
- } else {
- that.move = true
- }
- },
getError() {
let that = this
uni.request({
@@ -406,6 +339,9 @@
var str = ''
let res = result.data
if (res.data[0].matDtos) {
+ if (res.data[0].matDtos.length <= 8) {
+ that.pakinShow = true
+ }
if (res.data[0].ioType === 101) {
that.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
--
Gitblit v1.9.1