From e2b9859ab42fc9cd3de1fa960717dbfa87e95da7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 15 十月 2025 14:54:50 +0800
Subject: [PATCH] 大屏显示内容完善
---
Monitor-APP/pages/index/data.json | 42 +++-----------------
Monitor-APP/pages/home/home.vue | 41 +++++++++++---------
2 files changed, 30 insertions(+), 53 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 2370bef..80f4d59 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -243,16 +243,19 @@
<view class="button-right" @click="ejected()"></view>
<!-- 涓讳綋 -->
<view class="info-main">
- <view class="info-box">
- <view class="swiper-head" style="height: 10%;width: 96%;margin-left: 2%;">
- <view style="width: 15%;">璁㈠崟鍙�</view>
- <view style="width: 10%;">鍗曡ID</view>
+ <view class="info-box">
+ <view class="swiper-head" style="height: 10%;width: 96%;margin-left: 2%;font-size: 2dvw;display: flex;">
+ <view style="width: 15%; display: flex; flex-direction: column; align-items: center;">
+ <view style="line-height: 1.5; white-space: nowrap;">浠诲姟鍙凤細{{infoText.workNo}}</view>
+ <view>璁㈠崟鍙�</view>
+ </view>
<view style="width: 15%;">鍟嗗搧缂栧彿</view>
<view style="width: 15%;">鍟嗗搧鍚嶇О</view>
<view style="width: 10%;">鎵樼洏鐮�</view>
- <view style="width: 15%;">鐗规畩璇存槑</view>
- <view style="width: 10%;">浣滀笟鏁伴噺</view>
- <view style="width: 10%;">鍓╀綑鏁伴噺</view>
+ <view style="width: 15%;">鎵瑰彿</view>
+ <view style="width: 10%;">鏁伴噺</view>
+ <view style="width: 10%;">鐩爣搴撲綅</view>
+ <view style="width: 10%;">婧愬簱浣�</view>
</view>
<y-box>
<!-- 鏂囨湰瀹瑰櫒 -->
@@ -301,17 +304,17 @@
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
display-multiple-items="3"
- circular="true" :autoplay="true" :interval="3000" :duration="1000" style="font-size: 4vb;">
+ circular="true" :autoplay="true" :interval="3000" :duration="1000" style="font-size: 2vw;">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
<!-- <view>No:{{i+1}}</view> -->
<view style="width: 15%;">{{item.orderNo}}</view>
- <view style="width: 10%;"> {{item.memo}}</view>
- <view style="width: 15%;">{{item.matnr}}</view>
- <view style="width: 15%;">{{item.maknx}}</view>
+ <view style="width: 15%;word-break: break-all;">{{item.matnr}}</view>
+ <view style="width: 15%;word-break: break-all;">{{item.maknx}}</view>
<view style="width: 10%;">{{infoText.barcode}}</view>
- <view style="width: 15%;">{{item.batch}}</view>
- <view style="width: 10%;">{{item.count}}</view>
- <view style="width: 10%;">{{item.total}}</view>
+ <view style="width: 15%;word-break: break-all;">{{item.batch}}</view>
+ <view style="width: 10%;">{{item.anfme}}</view>
+ <view style="width: 10%;">{{infoText.locNo}}</view>
+ <view style="width: 10%;">{{infoText.sourceLocNo}}</view>
</swiper-item>
</swiper>
<!-- </view> -->
@@ -366,7 +369,7 @@
<view class="item">
<view class="desc">ledId锛�</view>
<view class="input">
- <input type="text" v-model="baseLedId[0]">
+ <input type="text" v-model="baseLedId">
</view>
</view>
<view class="item">
@@ -446,7 +449,7 @@
baseLedId: '',
baseCrnId: '',
baseUrl: '',
- apiIp: '192.168.4.49',
+ apiIp: '192.168.5.111',
apiPort: '9090',
apiUrl: 'jsjwcs',
ledInfosApi: '/console/getLedInfos',
@@ -537,7 +540,7 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- }, 1800000)
+ }, 180000)
},
methods: {
carInfoModel(res) {
@@ -693,8 +696,10 @@
that.infoText.title = '鐩樼偣鍐嶅叆搴�'
}
- that.infoText.staNo = res.data[0].staNo
+ that.infoText.workNo = res.data[0].workNo
that.infoText.barcode = res.data[0].barcode
+ that.infoText.locNo = res.data[0].locNo
+ that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index ef5d2e7..04a004a 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -4,45 +4,17 @@
"title":"鍏ㄦ澘鍑哄簱",
"workNo":7083,
"staNo":217,
- "sourceStaNo":null,
- "locNo":null,
+ "sourceStaNo":"0200202",
+ "locNo":"0300202",
"sourceLocNo":"1500502",
- "barcode": "80009901",
+ "barcode": "80009999",
"matDtos":[
{
- "matnr":"0",
- "maknx":"宸ョ▼",
- "batch":"2025","count":40.0,
- "total": 20.0,
- "memo":"3333",
+ "matnr":"1001",
+ "maknx":"宸ョ▼鍙戠敓杩囧お33gdsrs",
+ "batch":"2025020301001","count":40.0,
+ "anfme": 20.0,
"orderNo":"CK2025",
- "specs":"gcslxwt"
- },
- {
- "matnr":"00841LH-10fsfsd",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶村彂鐢熺殑鏁呬簨鏂瑰紡",
- "batch":"20250802-11fddfsdf","count":40.0,
- "total": 20.0,
- "memo":"3333",
- "orderNo":"CK2025020301",
- "specs":"gcslxwt"
- },
- {
- "matnr":"00841LH-10",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":"20250802-11","count":40.0,
- "total": 20.0,
- "memo":"3333",
- "orderNo":"CK2025020301",
- "specs":"gcslxwt"
- },
- {
- "matnr":"00841LH-10",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":"20250802-11","count":40.0,
- "total": 20.0,
- "memo":"3333",
- "orderNo":"CK2025020301",
"specs":"gcslxwt"
}
],
--
Gitblit v1.9.1