From f8f44457bb8a4eb1779bf50c0c1bcfe5b34a7b25 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 24 八月 2023 16:32:12 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 5 +++--
Monitor-APP/pages/home/home.css | 1 +
Monitor-APP/pages/home/home.vue | 38 +++++++++++++++++++++-----------------
3 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index dd7d447..e47e9c7 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -22,6 +22,7 @@
.swiper-body-main {
width: 100%;
height: 100%;
+ font-size: 70px;
/* background-color: #00a8ff; */
}
.swiper-item {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 478087a..e9ea281 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>
@@ -234,16 +234,18 @@
<swiper-item class="swiper-item">
<view>
<view>鏂欏彿锛歿{infoText.matnr}}</view>
- <view class="swiper-margin">鍚嶇О锛歿{infoText.maknx}}</view>
+ <view class="swiper-margin">瑙勬牸锛歿{infoText.specs}}</view>
</view>
<view>
- <view>鎵瑰彿锛歿{infoText.batch}}</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>
- 璁㈠崟鍙凤細{{infoText.orderNo}}
+ <view>璁㈠崟鍙凤細</view>
+ <view class="swiper-margin">{{infoText.orderNo}}</view>
+
</view>
<view>
<view>宸插嚭鎵樼洏鏁帮細{{infoText.doneOfTray}}</view>
@@ -437,16 +439,13 @@
this.initlineChart()
this.initPieChart()
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()
- // 娴嬭瘯鐢�
-
},1000)
},
methods: {
@@ -490,7 +489,7 @@
that.swiperList = res.data[0].matDtos
that.infoText.matnr = res.data[0].matDtos[0].matnr
that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
- that.infoText.maknx = res.data[0].matDtos[0].maknx
+ 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
@@ -563,10 +562,15 @@
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.matnr = res.data[0].matDtos[0].matnr
+ 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
+ that.infoText.orderNo = res.data[0].orderNo
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index a5c2d9c..fefa6bb 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -4,7 +4,7 @@
"data":[{
"title": "鍏ㄦ澘鍑哄簱",
"workNo": 8282,
- "orderNo": "202207280921",
+ "orderNo": "P6010405230818",
"ioType": 101,
"staNo": 177,
"sourceStaNo": null,
@@ -13,7 +13,8 @@
"matDtos": [{
"matnr": "1101488-10000",
"maknx": "A4F-DQ",
- "batch": null,
+ "specs": "aa",
+ "batch": "A-N-03--",
"count": 16.0,
"total": 32.0
}],
--
Gitblit v1.9.1