From c007112b27671a3b44514468a0cf6db8769efdd6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 14 五月 2023 22:18:01 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 131 ++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 35 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index bd12872..e71b833 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -188,7 +188,7 @@
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
鑷姩浠撳簱WCS鐩戞帶骞冲彴
- <!-- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
+ <!-- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image> -->
</view>
</y-box>
</view>
@@ -217,11 +217,11 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
- <view>鍟嗗搧缂栧彿</view>
- <view>鍟嗗搧鍚嶇О</view>
- <view>瑙勬牸</view>
- <view>鏁伴噺</view>
+ <view style="width: 20%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
+ <view style="width: 30%;">鍟嗗搧缂栧彿</view>
+ <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
+ <view style="width: 20%;">瑙勬牸</view>
+ <view style="width: 10%;">鏁伴噺</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -233,11 +233,11 @@
display-multiple-items="8"
circular="true" :autoplay="true" :interval="3000" :duration="1000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view>No:{{i+1}}</view>
- <view>{{item.matNo}}</view>
- <view>{{item.maknx}}</view>
- <view>{{item.specs}}</view>
- <view>{{item.count}}</view>
+ <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>
</swiper-item>
</swiper>
</view>
@@ -315,6 +315,9 @@
</view>
</view>
</view>
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ 杩炴帴瓒呮椂: {{times}} s
+ </view>
</view>
</template>
@@ -378,9 +381,12 @@
maknx: "",
specs: "",
count: "",
- error: ""
+ error: "",
+ barcode: ""
},
- swiperList: []
+ swiperList: [],
+ timeOut: false,
+ times: 0
}
},
onShow() {
@@ -409,7 +415,8 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- this.getDate()
+ // this.getDate()
+ this.getDate2()
this.getInfo()
this.getError()
// this.getInfo2()
@@ -421,6 +428,9 @@
},1000)
},
methods: {
+ timeOut() {
+ console.log(this.times);
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -443,8 +453,16 @@
that.infoText.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ } else if(res.data[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if(res.data[0].ioType === 1) {
+ that.infoText.title = '鍏ュ簱'
+ } else if(res.data[0].ioType === 10) {
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ } else if(res.data[0].ioType === 110) {
+ that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.staNo = res.data[0].staNo
+ that.infoText.barcode = res.data[0].barcode
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -465,12 +483,14 @@
var errorInfo = res.data
if (that.infoType == 1) {
that.infoType = 3
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
return
}
that.infoType = 2
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
@@ -486,6 +506,8 @@
method:"GET",
data: {ledId:that.baseLedId},
success(result) {
+ that.timeOut = false
+ that.times = 0
var res = result.data
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
@@ -499,8 +521,14 @@
that.infoText.title = '妫�鏂欏嚭搴�'
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if(res.data[0].ioType === 1) {
+ that.infoText.title = '鍏ュ簱'
+ } else if(res.data[0].ioType === 10) {
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ } else if(res.data[0].ioType === 110) {
+ that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.staNo = res.data[0].staNo
+ that.infoText.barcode = res.data[0].barcode
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -512,6 +540,11 @@
}
that.infoType = 0
}
+ },
+ fail(err) {
+ that.timeOut = true
+ that.times = that.times+3
+ that.infoType = 0
}
})
@@ -523,6 +556,8 @@
data: {ledId:that.baseLedId},
method:"GET",
success(result) {
+ that.timeOut = false
+ that.times = 0
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
@@ -543,6 +578,10 @@
}
that.infoType = 0
}
+ },
+ fail(err) {
+ that.timeOut = true
+ that.infoType = 0
}
})
@@ -551,6 +590,31 @@
controller() {
switch(this.infoType) {
// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+ case 0:
+ if (this.errorInfoViewShow) {
+ this.errorInfoViewShow = false
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.infoViewShow) {
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.errorInfoViewShow && this.infoViewShow) {
+ this.errorInfoViewShow = false
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
case 1:
if (this.homeViewShow) {
this.homeViewShow = false
@@ -605,23 +669,7 @@
},1000)
}
return;
- default :
- if (this.errorInfoViewShow) {
- this.errorInfoViewShow = false
- this.errorInfoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
+
}
},
@@ -658,6 +706,19 @@
this.getUrl()
this.ejectShow = false
},
+ // 鏃ュ巻 鏈嶅姟鍣�
+ getDate2() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/monitor/date",
+ method:"GET",
+ success(result) {
+ var res = result.data.data
+ that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+ }
+ })
+ },
+
// 鏃ュ巻
getDate() {
var dt = new Date();
--
Gitblit v1.9.1