From 3f3a57b8361cf80ff0d9c1b3bbdaec0ae731082d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 23 五月 2023 14:56:24 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index c3f6cab..49cde72 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -187,8 +187,8 @@
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
- <!-- 鑷姩浠撳簱WCS鐩戞帶骞冲彴 -->
- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image>
+ 鑷姩浠撳簱WCS鐩戞帶骞冲彴
+ <!-- <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.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,9 @@
barcode: ""
},
swiperList: [],
- timeOut: false
+ timeOut: false,
+ times: 0,
+ currDate: ''
}
},
onShow() {
@@ -427,6 +429,9 @@
},1000)
},
methods: {
+ timeOut() {
+ console.log(this.times);
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -503,6 +508,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 +544,7 @@
},
fail(err) {
that.timeOut = true
+ that.times = that.times+3
that.infoType = 0
}
})
@@ -551,6 +558,7 @@
method:"GET",
success(result) {
that.timeOut = false
+ that.times = 0
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
@@ -708,6 +716,7 @@
success(result) {
var res = result.data.data
that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+ that.currDate = res.year + "/" + res.month + "/" + res.day
}
})
},
@@ -735,7 +744,7 @@
this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
},
getDateFormat(value) {
- var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
+ var date = new Date(this.currDate);// 鑾峰彇褰撳墠鏃堕棿
date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
var m = date.getMonth() + 1
var d = date.getDate()
@@ -788,6 +797,7 @@
ledId: that.baseLedId,
},
success(result) {
+ console.log(result);
var res = result.data
if (res.code === 200) {
that.baseInfo.xDistance = res.data.xDistance
--
Gitblit v1.9.1