From 6bd400003bae1e92cfbee6f0e6ccec90477b987e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 14 五月 2023 14:57:07 +0800
Subject: [PATCH] Merge branch 'bfMonitor' of http://47.97.1.152:5880/r/private into bfMonitor
---
Monitor-APP/pages/home/home.vue | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index c3f6cab..deccea3 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,11 +217,11 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view>鎵樼洏鐮侊細{{infoText.barcode}}</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.matnr}}</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>
@@ -316,7 +316,7 @@
</view>
</view>
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
- 杩炴帴瓒呮椂
+ 杩炴帴瓒呮椂: {{times}} s
</view>
</view>
</template>
@@ -385,7 +385,8 @@
barcode: ""
},
swiperList: [],
- timeOut: false
+ timeOut: false,
+ times: 0
}
},
onShow() {
@@ -427,6 +428,9 @@
},1000)
},
methods: {
+ timeOut() {
+ console.log(this.times);
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -503,6 +507,7 @@
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) {
@@ -538,6 +543,7 @@
},
fail(err) {
that.timeOut = true
+ that.times = that.times+3
that.infoType = 0
}
})
@@ -551,6 +557,7 @@
method:"GET",
success(result) {
that.timeOut = false
+ that.times = 0
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
--
Gitblit v1.9.1