From 4109a5f3adb87196b250e1a9c19c18d69b64e30d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 02 七月 2024 15:49:42 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 152 ++++++++++++++++++++++----------------------------
1 files changed, 66 insertions(+), 86 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 3b0be5b..79836b9 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,9 +15,9 @@
<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>
+ <text class="item-text" style="text-align: left;">璇ョ郴缁熶富瑕佺敤浜庤溅闂村唴鍘熸潗鏂欍�佸崐鎴愬搧銆佹垚鍝佺殑鑷姩鍖栧瓨鍌ㄣ�佸嚭鍏ュ簱鍙婇厤閫佺鐞嗐�傝绯荤粺閰嶇疆浜�2816涓爣鍑嗘枡鐩掍粨浣嶃�備緷鎵樺厛杩涚殑鍫嗗灈鏈烘銆佽緭閫佹粴绛掑強RFID鎶�鏈紝涓嶹CS鍙奧MS杞欢绯荤粺娣卞害铻嶅悎锛屽疄鐜板偍杩愪綔涓氱殑楂樻晥鍗忓悓涓庣簿纭鐞嗐�傚垱鏂伴噰鐢ㄧ殑鍙屽眰搴撲綅璁捐涓庡弻宸ヤ綅鍙屼几浣嶈揣鍙夋妧鏈紝瀹炵幇浜嗙墿鏂欑殑骞惰澶勭悊锛屽吋椤惧簱瀹瑰悓鏃舵彁鍗囩墿鏂欏鐞嗘晥鐜囷紝姝ゅ锛岀郴缁熻繕閰嶅浜嗚嚜涓荤爺鍒禔GV鑷姩鎺ラ┏绯荤粺锛屽疄鐜扮墿鏂欏湪鏂欏簱鍜岀敓浜у伐浣嶇殑寰�澶嶈嚜鍔ㄦ祦杞紝鏋佸ぇ鎻愬崌浜嗙墿鏂欑殑杞繍鏁堢巼鍜岀敓浜х嚎鐨勮繛缁繍琛岃兘鍔涖��</text>
</view>
<view class="box-item">
<text class="item-title">浠撳簱鏁版嵁</text>
@@ -29,9 +29,9 @@
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(鍗冪背)</view>
</view>
</view>
@@ -40,9 +40,9 @@
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(鍗冪背)</view>
</view>
</view>
@@ -51,9 +51,9 @@
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
<view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">H</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(灏忔椂)</view>
</view>
</view>
@@ -62,9 +62,9 @@
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">H</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(灏忔椂)</view>
</view>
</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>
@@ -216,13 +214,12 @@
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
- <view class="swiper-head">
- <view>鎵樼洏鐮侊細{{infoText.barcode}}</view>
- <view>鍟嗗搧缂栧彿</view>
- <view>鍟嗗搧鍚嶇О</view>
- <view>瑙勬牸</view>
- <view>鏁伴噺</view>
- </view>
+ <!-- <view class="swiper-head">
+ <view style="width: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
+ <view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
+ <view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+ <view style="width: 20%;">鎺ユ敹绔欑偣: {{infoText.staNo}}</view>
+ </view> -->
<!-- body -->
<view class="swiper-body">
<!-- swiper 涓�浜涜鏄�
@@ -230,14 +227,22 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="8"
- circular="true" :autoplay="true" :interval="3000" :duration="1000">
+ display-multiple-items="5"
+ circular="true" :autoplay="false" :interval="3000" :duration="2000">
<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: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+ <view style="width: 20%;">浠诲姟鍗曞彿: {{item.taskNo}}</view>
+ <view style="width: 20%;">杞藉叿缂栧彿: {{item.barcode}}</view>
+ <view style="width: 20%;">宸ヤ綔鍙�: {{item.taskNo}}</view>
+ <view style="width: 20%;">鐗╂枡鍚嶇О: {{item.maktx}}</view>
+ <view style="width: 20%;">鐗╂枡鍙�: {{item.matnr}}</view>
+
+ <view style="width: 20%;">浠诲姟绫诲瀷: {{item.ioType$}}</view>
+ <view style="width: 20%;">鍑哄彂绔欑偣: {{item.startPoint ? item.startPoint : '--'}}</view>
+ <view style="width: 20%;">鎺ユ敹绔欑偣: {{item.targetPoint}}</view>
+ <view style="width: 20%;">杞繍鏁伴噺: {{item.anfme}}</view>
+ <!-- <view style="width: 20%;">澶囨敞: {{item.memo}}</view> -->
+ <!-- 11 -->
</swiper-item>
</swiper>
</view>
@@ -276,7 +281,7 @@
<!-- 寮瑰嚭title -->
<view class="eject-title">淇敼 / 閰嶇疆</view>
<!-- input -->
- <view class="eject-input">
+ <scroll-view scroll-y class="eject-input">
<view class="item">
<view class="desc">ip锛�</view>
<view class="input">
@@ -307,7 +312,7 @@
<input type="text" v-model="baseUrl">
</view>
</view>
- </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -315,12 +320,12 @@
</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>
</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}]} -->
<script>
import demodata from '@/mockdata/demodata.json';
import ycqdata from '@/pages/index/data.json';
@@ -385,8 +390,9 @@
barcode: ""
},
swiperList: [],
- timeOut: false,
- times: 0
+ timeOuts: false,
+ times: 0,
+ currDate: ''
}
},
onShow() {
@@ -417,9 +423,9 @@
this.getOther()
// this.getDate()
this.getDate2()
- this.getInfo()
- this.getError()
- // this.getInfo2()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
// this.getError2()
this.getUrl()
this.controller()
@@ -428,6 +434,9 @@
},1000)
},
methods: {
+ timeOut() {
+ console.log(this.times);
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -440,31 +449,14 @@
let that = this
var result = ycqdata.dataInfo2
var res = result.data
- if (res.data && res.data !== "") {
+ if (res.data && res.data.length > 0) {
if (that.infoType == 2 || that.infoType == 3) {
return;
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- 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.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
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.title = res.data[0].ioType$
+ that.swiperList = res.data
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -499,38 +491,21 @@
getInfo() {
let that = this
uni.request({
- url: that.commonUrl + "/monitor/led",
+ url: that.commonUrl + "/monitor/currentTask",
method:"GET",
- data: {ledId:that.baseLedId},
+ // data: {ledId:that.baseLedId},
success(result) {
- that.timeOut = false
+ that.timeOuts = false
that.times = 0
var res = result.data
- if (res.data && res.data !== "") {
+ if (res.data && res.data.length > 0) {
if (that.infoType == 2 || that.infoType == 3) {
return;
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- 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.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
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.title = res.data[0].ioType
+ that.swiperList = res.data
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -539,7 +514,7 @@
}
},
fail(err) {
- that.timeOut = true
+ that.timeOuts = true
that.times = that.times+3
that.infoType = 0
}
@@ -553,7 +528,7 @@
data: {ledId:that.baseLedId},
method:"GET",
success(result) {
- that.timeOut = false
+ that.timeOuts = false
that.times = 0
var res = result.data
if (res.data && res.data !== "") {
@@ -577,7 +552,7 @@
}
},
fail(err) {
- that.timeOut = true
+ that.timeOuts = true
that.infoType = 0
}
})
@@ -711,7 +686,9 @@
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
+ that.currDate = res.year + "/" + res.month + "/" + res.day
}
})
},
@@ -739,7 +716,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()
@@ -1043,12 +1020,15 @@
text-align: center;
}
.eject-input {
-
+ margin-top: 2vh;
+ height: 25vh;
+ /* background-color: #00163E; */
+ ::-webkit-scrollbar{display:none}
}
.item {
display: flex;
align-items: center;
- margin: 2vh 0 0 0;
+ margin: 1vh 0 0 0;
font-size: 1.5vw;
color: #363636;
}
--
Gitblit v1.9.1