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/home/home.vue | 147 ++++++++++++++++++++++++++++++------------------
1 files changed, 91 insertions(+), 56 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 84f070f..80f4d59 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,14 +218,11 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%">
-
-
+ <view style="height: 18%" class="flex-row">
<image style="height: 100%;"
src="../../static/barcode.png" mode="aspectFit"></image>
- <image style="float:right; 100%;margin-top: -5%;margin-right: 5%;"
+ <image style="height: 100%;"
src="../../static/zy_logo.png" mode="aspectFit"></image>
-
</view>
</view>
</view>
@@ -246,26 +243,58 @@
<view class="button-right" @click="ejected()"></view>
<!-- 涓讳綋 -->
<view class="info-main">
- <view class="info-box">
+ <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: 10%;">婧愬簱浣�</view>
+ </view>
<y-box>
<!-- 鏂囨湰瀹瑰櫒 -->
- <view class="text-content" v-for="item in swiperList">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
+ <!-- <view class="text-content" v-for="item in swiperList" style="font-size: 3vw;"> -->
+<!-- <view>鐩爣绔欙細{{infoText.staNo}}</view>
<view>鍟嗗搧缂栫爜锛歿{item.matnr}}</view>
<view>鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
<view>瑙勬牸锛歿{item.specs}}</view>
<view>鍥惧彿锛歿{item.model ? item.model :''}}</view>
- <view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view>
-
+ <view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view> -->
+ <!-- <view style="display: flex;text-align: left;">
+ <view style="width: 50%;">璁㈠崟鍙凤細{{item.orderNo}}</view>
+ <view style="width: 50%;">鍗曡ID锛歿{item.memo}}</view>
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 50%;">鍟嗗搧缂栧彿锛歿{item.matnr}}</view>
+ <view style="width: 50%;">鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 50%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
+ <view style="width: 50%;">鐗规畩璇存槑锛歿{item.batch}}</view>
+ </view>
+ <view style="display: flex;text-align: left;">
+ <view style="width: 50%;">浣滀笟鏁伴噺锛歿{item.count}}</view>
+ <view style="width: 50%;">鍓╀綑鏁伴噺锛歿{item.total}}</view>
+ </view> -->
+
<!-- head -->
- <!-- <view class="swiper-head">
- <view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
- <view style="width: 30%;">鍟嗗搧缂栧彿</view>
- <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
- <view style="width: 20%;">瑙勬牸</view>
- <view style="width: 10%;">鏁伴噺</view>
+<!-- <view class="swiper-head" style="height: 15%;">
+ <view style="width: 15%;">璁㈠崟鍙�</view>
+ <view style="width: 10%;">鍗曡ID</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> -->
<!-- body -->
<!-- <view class="swiper-body"> -->
@@ -273,19 +302,23 @@
circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
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.matNo}}</view>
- <view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 10%;">{{item.count}}</view>
+ <swiper class="swiper-body-main" vertical="true"
+ display-multiple-items="3"
+ 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: 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%;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> -->
- </view>
+ <!-- </view> -->
+ <!-- </view> -->
</y-box>
</view>
</view>
@@ -359,14 +392,6 @@
</view>
</view>
</view>
- <!-- 灏忚溅寮傚父 -->
- <view class="board">
- <uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
- <view class="error-board">
- <text v-for="item in carInfo">{{item}}</text>
- </view>
- </uni-transition>
- </view>
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
</view>
@@ -424,6 +449,10 @@
baseLedId: '',
baseCrnId: '',
baseUrl: '',
+ apiIp: '192.168.5.111',
+ apiPort: '9090',
+ apiUrl: 'jsjwcs',
+ ledInfosApi: '/console/getLedInfos',
info: null,
error: null,
infoType: 0,
@@ -494,6 +523,8 @@
}, 500)
},
onLoad() {
+ this.getLedInfo()
+
setInterval(() => {
this.getDate2()
this.getUrl()
@@ -502,7 +533,6 @@
// this.getInfo2()
// this.getError2()
this.controller()
- this.getCarInfo()
}, 1000)
setInterval(() => {
@@ -510,26 +540,9 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- }, 1800000)
+ }, 180000)
},
methods: {
- getCarInfoTest() {
- let that = this
- var result = ycqdata.carError
- var res = result.data
- that.carInfoModel(res)
- },
- getCarInfo() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/device/error",
- method: "GET",
- success(result) {
- var res = result.data
- that.carInfoModel(res)
- }
- })
- },
carInfoModel(res) {
let infoList = []
@@ -557,6 +570,25 @@
getServerData() {
this.chartsDataLine1 = JSON.parse(JSON.stringify(this.chartsData.Line))
this.chartsDataPie2 = JSON.parse(JSON.stringify(this.chartsData.Pie))
+ },
+ getLedInfo() {
+ let that = this
+ uni.request({
+ url: this.baseHttp + that.apiIp + ":" + that.apiPort + "/" + that.apiUrl + "/" + that.ledInfosApi,
+ method: "GET",
+ data: {},
+ success(result) {
+ var res = result.data
+ let data = res.data;
+
+ uni.setStorageSync('BaseIp', that.apiIp);
+ uni.setStorageSync('BaseLedId', data.staArr);
+ uni.setStorageSync('BasePort', that.apiPort);
+ uni.setStorageSync('BaseCrnId', data.crnId);
+ uni.setStorageSync('UPROJ', that.apiUrl);
+ this.getUrl()
+ }
+ })
},
// 鑾峰彇閿欒淇℃伅
getInfo2() {
@@ -664,7 +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
@@ -1161,7 +1196,7 @@
.info-box {
width: 98%;
- height: 98%;
+ height: 90%;
}
/* 寮傚父淇℃伅 */
--
Gitblit v1.9.1