From 69375dc4c4f31775222520c8d00e59f2c98357fd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 九月 2023 13:56:04 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 141 ++++++++++++++++++++++++++++++++---------------
1 files changed, 96 insertions(+), 45 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6a2a966..c344f78 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -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>
@@ -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 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>宸ヤ綔鍙�: {{infoText.workNo}}</view>
+ <view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+ <view>鐩爣绔�: {{infoText.staNo}}</view>
+ <view v-show="infoText.ctnNo" style="color: red;">閿佺爜鐗╂枡</view>
+ <!-- <view style="width: 10%;">鏁伴噺</view> -->
</view>
<!-- body -->
<view class="swiper-body">
@@ -230,14 +230,27 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- 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 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>
+ display-multiple-items="2"
+ circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ <swiper-item class="swiper-item">
+ <view>
+ <view>鏂欏彿锛歿{infoText.matnr}}</view>
+ <view class="swiper-margin">瑙勬牸锛歿{infoText.specs}}</view>
+ </view>
+ <view>
+ <view>鎵规锛歿{infoText.batch}}</view>
+ <view class="swiper-margin">鍑哄簱鏁伴噺锛歿{infoText.count}}</view>
+ </view>
+ </swiper-item>
+ <swiper-item class="swiper-item" v-show="infoText.orderNo">
+ <view>
+ <view>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
+ <view class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
+ </view>
+ <view>
+ <view>宸插嚭绠辨暟锛歿{infoText.doneOfTray}}</view>
+ <view class="swiper-margin">鎬荤鏁帮細{{infoText.totalOfTray}}</view>
+ </view>
</swiper-item>
</swiper>
</view>
@@ -276,7 +289,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 +320,7 @@
<input type="text" v-model="baseUrl">
</view>
</view>
- </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -320,7 +333,7 @@
</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';
@@ -382,7 +395,14 @@
specs: "",
count: "",
error: "",
- barcode: ""
+ barcode: "",
+ orderNo: '',
+ batch: '',
+ doneOfTray: '',
+ totalOfTray: '',
+ doneOfUnit: '',
+ totalOfUnit: '',
+ ctnNo: '1'
},
swiperList: [],
timeOut: false,
@@ -416,7 +436,6 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- // this.getDate()
this.getDate2()
this.getInfo()
this.getError()
@@ -424,12 +443,10 @@
// this.getError2()
this.getUrl()
this.controller()
- // 娴嬭瘯鐢�
-
},1000)
},
methods: {
- timeOut() {
+ timeOuts() {
console.log(this.times);
},
getUrl() {
@@ -442,7 +459,7 @@
// 鑾峰彇閿欒淇℃伅
getInfo2() {
let that = this
- var result = ycqdata.dataInfo2
+ var result = ycqdata.dataInfo3
var res = result.data
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
@@ -463,12 +480,28 @@
} else if(res.data[0].ioType === 110) {
that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.barcode = res.data[0].barcode
+ that.infoText.workNo = res.data[0].workNo
+ that.infoText.sourceLocNo = res.data[0].sourceLocNo
+ that.infoText.staNo = res.data[0].staNo
+ that.infoText.ctnNo = res.data[0].ctnNo
+ if (res.data[0].ctnNo) {
+ that.infoText.orderNo = ''
+ } else {
+ that.infoText.orderNo = res.data[0].orderNo
+ }
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.matnr = res.data[0].matDtos[0].matnr
+ that.infoText.barcode = res.data[0].barcode
+ that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
+ that.infoText.specs = res.data[0].matDtos[0].specs
+ that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.doneOfTray = res.data[0].doneOfTray
+ that.infoText.totalOfTray = res.data[0].totalOfTray
+ that.infoText.doneOfUnit = res.data[0].doneOfUnit
+ that.infoText.totalOfUnit = res.data[0].totalOfUnit
+
+
+
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -482,6 +515,7 @@
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
+
if (that.infoType == 1) {
that.infoType = 3
that.infoText.title = "鍏朵粬淇℃伅"
@@ -529,12 +563,25 @@
} else if(res.data[0].ioType === 110) {
that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.barcode = res.data[0].barcode
+ that.infoText.workNo = res.data[0].workNo
+ 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
+ that.infoText.ctnNo = res.data[0].ctnNo
+ if (res.data[0].ctnNo) {
+ that.infoText.orderNo = ''
+ } else {
+ that.infoText.orderNo = res.data[0].orderNo
+ }
+ that.infoText.matnr = res.data[0].matDtos[0].matnr
+ that.infoText.barcode = res.data[0].barcode
+ that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
+ that.infoText.specs = res.data[0].matDtos[0].specs
+ that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.doneOfTray = res.data[0].doneOfTray
+ that.infoText.totalOfTray = res.data[0].totalOfTray
+ that.infoText.doneOfUnit = res.data[0].doneOfUnit
+ that.infoText.totalOfUnit = res.data[0].totalOfUnit
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -544,7 +591,7 @@
},
fail(err) {
that.timeOut = true
- that.times = that.times+3
+ that.times = that.times+1
that.infoType = 0
}
})
@@ -1048,12 +1095,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;
}
@@ -1112,5 +1162,6 @@
.info-box-text-item {
height: 20%;font-size: 8vh;
justify-content: center;
+ white-space: pre-line;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1