From f63be6a1bd357877eef3bacf0cc003865c834f75 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 14 十月 2024 14:28:42 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 6 +++---
Monitor-APP/pages/home/home.css | 4 ++--
Monitor-APP/pages/home/home.vue | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 267570c..b11a6b7 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,12 +1,12 @@
.text-content {
width: 100%;
height: 100%;
- font-size: 12px;
+ font-size: 2.4vw;
/* background-color: aliceblue; */
}
.swiper-head {
width: 100%;
- height:10%;
+ height:12%;
background-color: rgba(54, 94, 226, 0.5);
display: flex;
/* grid-template-columns: 2fr 3fr 2fr 2fr 1fr; */
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 3a7c324..d59e4c0 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -236,9 +236,9 @@
<swiper-item class="swiper-item" v-for="(item,i) in info.matDtos" :key="i"
:style="item.color">
<view style="flex: 2;word-break: break-all;">
- {{item.matNo ? item.matNo : '--'}}
+ {{item.matnr ? item.matnr : '--'}}
</view>
- <view style="flex: 2;">{{item.matNo}}</view>
+ <view style="flex: 2;">{{item.name}}</view>
<view style="flex: 2;">{{item.maknx}}</view>
<view style="flex: 1;">{{item.count}}</view>
<view style="flex: 1;">{{item.total}}</view>
@@ -554,12 +554,12 @@
this.getServerData()
this.getDate2()
this.getUrl()
- this.getInfo()
- this.getError()
+ // this.getInfo()
+ // this.getError()
// this.getCarInfo()
// this.getCarInfoTest()
- // this.getInfo2()
- // this.getError2()
+ this.getInfo2()
+ this.getError2()
this.controller()
}, 1000)
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index b41a41b..4b11b5e 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -12,8 +12,8 @@
"sourceLocNo": "1500502",
"barcode": "80009921",
"matDtos": [{
- "matNo": "230309103100005",
- "maknx": "瀹氬瓙绾垮湀",
+ "matnr": "230309103100005",
+ "name": "瀹氬瓙绾垮湀",
"batch": null,
"count": 0,
"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
@@ -22,7 +22,7 @@
"orderNo": "23129502652,23129502651,23129502652,23129502652"
},
{
- "matNo": "230309103100005",
+ "matnr": "230309103100005",
"maknx": "瀹氬瓙绾垮湀",
"batch": null,
"count": 40.0,
--
Gitblit v1.9.1