From 9076ba45e8a66f149ff6f851614e9ed711660c69 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 03 八月 2023 18:23:09 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 3b0be5b..2ef9df5 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>鎵樼洏鐮侊細{{infoText.barcode}}</view>
- <view>鍟嗗搧缂栧彿</view>
- <view>鍟嗗搧鍚嶇О</view>
- <view>瑙勬牸</view>
- <view>鏁伴噺</view>
+ <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 style="width: 10%;">鏁伴噺</view> -->
</view>
<!-- body -->
<view class="swiper-body">
@@ -230,14 +230,20 @@
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="3"
+ circular="true" :autoplay="true" :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: 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>
+
+
</swiper-item>
</swiper>
</view>
@@ -276,7 +282,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 +313,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 +326,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';
@@ -386,7 +392,8 @@
},
swiperList: [],
timeOut: false,
- times: 0
+ times: 0,
+ currDate: ''
}
},
onShow() {
@@ -428,6 +435,9 @@
},1000)
},
methods: {
+ timeOut() {
+ console.log(this.times);
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -460,6 +470,9 @@
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
@@ -526,6 +539,9 @@
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
@@ -712,6 +728,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
}
})
},
@@ -739,7 +756,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 +1060,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