From 92c9cc0b1b15a08699739db47797345b6abca3c5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 12 十月 2024 10:39:10 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 07787b7..5e1bc2c 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -191,8 +191,8 @@
<view class="button-right" @click="ejected()"></view>
<!-- 涓讳綋 -->
<view class="info-main">
- <view class="info-box">
- <y-box>
+ <view class="info-box" style="display: flex;">
+ <y-box v-for="item in infoText">
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
@@ -309,7 +309,7 @@
<view class="board">
<uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
<view class="error-board">
- <text v-for="item in carInfo">{{item}}</text>
+ <text>{{infoText.error}}</text>
</view>
</uni-transition>
</view>
@@ -317,6 +317,13 @@
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
</view>
+
+ <!-- 鐗堟湰鍙� -->
+ <!-- #ifdef APP-PLUS -->
+ <view class="version">
+ 褰撳墠鐗堟湰:{{version}}
+ </view>
+ <!-- #endif -->
</view>
</template>
<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
@@ -326,6 +333,7 @@
export default {
data() {
return {
+ version: '1231313',
newModeClass: 'slide-top',
errorBoardShow: false,
carInfo: [],
@@ -386,7 +394,7 @@
error: null,
infoType: 0,
text: '',
- infoText: {
+ infoText: [{
title: '鑷姩浠撳簱WCS鐩戞帶骞冲彴',
title2: '',
staNo: "",
@@ -403,7 +411,7 @@
doneOfUnit: '',
totalOfUnit: '',
ctnNo: '1'
- },
+ }],
swiperList: [],
timeOut: false,
times: 0,
@@ -510,23 +518,21 @@
that.baseCrnId = BaseCrnId
-
+ this.getVersion()
this.getDate2()
setTimeout(() => {
+ this.getShuttle()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
setTimeout(() => {
- this.getShuttleTest()
+ this.getShuttle()
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
- setTimeout(() => {
- this.getShuttleTest()
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- }, 3000)
- }, 1000)
+ }, 2000)
}, 1000)
},
onLoad() {
@@ -534,12 +540,12 @@
this.getServerData()
this.getDate2()
this.getUrl()
- this.getInfo()
- this.getError()
- this.getCarInfo()
+ // this.getInfo()
+ // this.getError()
+ // this.getCarInfo()
// this.getCarInfoTest()
- // this.getInfo2()
- // this.getError2()
+ this.getInfo2()
+ this.getError2()
this.controller()
}, 1000)
@@ -547,14 +553,28 @@
// this.changeErrorShow()
// },5000)
setInterval(() => {
- this.getShuttleTest()
+ this.getShuttle()
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
}, 600000)
+
+ // #ifdef APP-PLUS
+ setTimeout(()=>{
+ plus.runtime.restart()
+ },28800000)
+ // #endif
+
+
},
methods: {
+ getVersion() {
+ let that = this
+ plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+ that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
+ })
+ },
getShuttleTest() {
let res = ycqdata.infoData2.data
this.shuttleInfoModel(res)
@@ -670,22 +690,12 @@
let that = this
let result = ycqdata.dataError2
var res = result.data
- if (res.data && res.data !== "") {
- var errorInfo = res.data
- if (that.infoType == 1) {
- that.infoType = 3
- that.infoText.title = "寮傚父"
- that.infoText.error = errorInfo
- return
- }
- that.infoType = 2
- that.infoText.title = "寮傚父"
- that.infoText.error = errorInfo
+ if (res.code == 200 && res.data != '') {
+ that.infoText.title = "鍏朵粬淇℃伅"
+ that.infoText.error = res.data
+ this.errorBoardShow = true
} else {
- if (that.infoType == 1) {
- return
- }
- that.infoType = 0
+ this.errorBoardShow = false
}
},
getInfo() {
@@ -739,32 +749,26 @@
},
infoModel(res) {
let that = this
+
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
return;
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- that.infoText.title2 = '鍏ㄦ澘鍑哄簱'
- } else if (res.data[0].ioType === 103) {
- that.infoText.title = '鎷ｆ枡鍑哄簱'
- that.infoText.title2 = '鎷ｆ枡鍑哄簱'
- } else if (res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- that.infoText.title2 = '鐩樼偣鍑哄簱'
- }
- res.data[0].matDtos
- for (let k in res.data[0].matDtos) {
-
- if (res.data[0].matDtos[k].count == 0) {
- res.data[0].matDtos[k]['color'] = 'color: #df741c'
+ that.infoText.title = '绔欑偣鍑哄簱'
+ that.infoText = res.data
+ for (let info of res.data) {
+ console.log(info);
+ res.data[0].matDtos
+ for (let k in res.data[0].matDtos) {
+
}
+ that.infoText.staNo = res.data[0].staNo
+ that.infoText.barcode = res.data[0].barcode
+ that.swiperList = res.data[0].matDtos
}
- that.infoText.staNo = res.data[0].staNo
- that.infoText.barcode = res.data[0].barcode
- that.swiperList = res.data[0].matDtos
+
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -1099,7 +1103,15 @@
<style>
/* @import url("../../static/css/common.css"); */
@import url("home.css");
-
+ /* 鐗堟湰鍙� */
+ .version {
+ min-width: 100rpx;
+ position: fixed;
+ right: 20rpx;
+ bottom: 10rpx;
+ font-size: .1rem;
+ color: #909399;
+ }
/* 鍒� */
.flex-col {
display: flex;
@@ -1464,7 +1476,8 @@
.error-board {
margin: .2rem;
- height: 11vh;
+ padding: .2rem;
+ /* height: 11vh; */
background-color: #F56C6C;
box-shadow: rgba(0, 0, 0, .35) 0px 5px 15px;
border-radius: .2rem;
--
Gitblit v1.9.1