From 9bc437ba57bc912280de179cd3d289d29d864642 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 13:38:54 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e9ab206..d583544 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -3,7 +3,7 @@
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
<view class="head">
- <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+ <text>涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -15,7 +15,7 @@
<view class="mian-item-box">
<y-box>
<view class="box-item">
- <text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
+ <text class="item-title">涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
<text class="item-subTitle">Automatic Storageand Retrieval System</text>
<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
</view>
@@ -186,9 +186,7 @@
<view style="height: 18%;">
<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> -->
+ 涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
</view>
</y-box>
</view>
@@ -230,20 +228,16 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ display-multiple-items="1"
+ circular="true" :autoplay="false" :interval="3000" :duration="2000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
- <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
-
-
- <view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 30%;">澶囨敞: {{item.memo}}</view>
-
-
+ <view style="width: 100%;display: flex;flex-direction: column;
+ align-items: center;justify-content: space-around;">
+ <view style="width: 60%;">搴撲綅鍙�: {{item.locNo}}</view>
+ <view style="width: 60%;" v-show="pakoutShow">浜у搧浠ｅ彿: {{item.matnr}}</view>
+ <view style="width: 60%;" v-show="pakoutShow">浜у搧鍚嶇О: {{item.maknx}}</view>
+ <view style="width: 60%;" v-show="pakoutShow">鏁伴噺: [{{item.anfme}} / {{item.memo}}]</view>
+ </view>
</swiper-item>
</swiper>
</view>
@@ -321,7 +315,7 @@
</view>
</view>
</view>
- <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOuts">
杩炴帴瓒呮椂: {{times}} s
</view>
</view>
@@ -391,9 +385,10 @@
barcode: ""
},
swiperList: [],
- timeOut: false,
+ timeOuts: false,
times: 0,
- currDate: ''
+ currDate: '',
+ pakoutShow: false
}
},
onShow() {
@@ -424,10 +419,10 @@
this.getOther()
// this.getDate()
this.getDate2()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
@@ -458,12 +453,16 @@
that.infoType = 1
if (res.data[0].ioType === 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
+ that.pakoutShow = true
} else if(res.data[0].ioType === 1) {
that.infoText.title = '鍏ュ簱'
+ that.pakoutShow = false
} else if(res.data[0].ioType === 10) {
that.infoText.title = '绌烘墭鍏ュ簱'
} else if(res.data[0].ioType === 110) {
@@ -474,10 +473,6 @@
that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.infoText.staNo = res.data[0].staNo
that.swiperList = res.data[0].matDtos
- // that.infoText.matnr = res.data[0].matDtos[0].matnr
- // that.infoText.specs = res.data[0].matDtos[0].specs
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -556,7 +551,7 @@
},
fail(err) {
that.timeOut = true
- that.times = that.times+3
+ that.times = that.times+1
that.infoType = 0
}
})
@@ -572,7 +567,6 @@
that.timeOut = false
that.times = 0
var res = result.data
- console.log(res);
if (res.data && res.data !== "") {
var errorInfo = res.data
if (that.infoType == 1) {
@@ -810,6 +804,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