From 322d44a411b63c130a65d2e74ce7233bc3f95149 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 09 一月 2025 09:08:29 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 90 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6fb3b13..36d3ed9 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -92,17 +92,17 @@
<swiper class="manu-body-main" vertical="true"
display-multiple-items="6"
circular="true" :autoplay="true" :interval="3000" :duration="2000">
- <swiper-item class="manu-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 30%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.owner}}</view>
- <view style="width: 30%;">{{item.matnr}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 10%;">{{item.orderNo}}</view>
+ <swiper-item class="manu-item" v-for="(item,i) in boundInfoList" :key="i">
+ <view style="width: 30%;">{{item.orderNo}}</view>
+ <view style="width: 20%;">{{item.docType}}</view>
+ <view style="width: 30%;">{{item.outTime}}</view>
+ <view style="width: 20%;">{{item.outTime}}</view>
+ <view style="width: 10%;">{{item.useTime}}</view>
</swiper-item>
</swiper>
</view>
</view>
- <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;">
+ <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;font-size: 1.5vh">
<view>绱鐢ㄦ椂锛� {{mTime}}</view>
</view>
</view>
@@ -114,7 +114,7 @@
<view class="mian-item">
<view class="mian-item-box">
<view style="width: 100%;height: 100%;">
- <view style="height: 35%;">
+ <view style="height: 30%;">
<!-- 鎶樼嚎鍥� -->
<y-box>
<view class="box-item">
@@ -129,8 +129,8 @@
<!-- 鐧惧垎姣� -->
<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
- <text class="item-title">31</text>
- <text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
+ <text class="item-subTitle" style="font-size: 1.5vh;">浠婃棩鍏ュ簱锛�10</text>
+ <text class="item-subTitle" style="font-size: 1.5vh;">浠婃棩鍑哄簱锛�20</text>
</view>
</view>
</view>
@@ -193,7 +193,7 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 21%;">
+ <view style="height: 26%;">
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;">
<view class="flex-col" style="width: 100%;height: 30vh;align-items: flex-start;font-size: 1vw">
@@ -214,17 +214,17 @@
<swiper class="manu-body-main" vertical="true"
display-multiple-items="3"
circular="true" :autoplay="true" :interval="3000" :duration="2000">
- <swiper-item class="manu-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.owner}}</view>
- <view style="width: 20%;">{{item.matnr}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 20%;">{{item.orderNo}}</view>
+ <swiper-item class="manu-item" v-for="(item,i) in deviceInfoList" :key="i">
+ <view style="width: 20%;">{{item.errCode}}</view>
+ <view style="width: 20%;">{{item.errContext}}</view>
+ <view style="width: 20%;">{{item.errTime}}</view>
+ <view style="width: 20%;">{{item.reTime}}</view>
+ <view style="width: 20%;">{{item.stopTime}}</view>
</swiper-item>
</swiper>
</view>
</view>
- <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;font-size: 1.2 vh;">
+ <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;font-size: 1.5vh;">
<view>绱鐢ㄦ椂锛� {{mTime}}</view>
</view>
</view>
@@ -268,8 +268,8 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ display-multiple-items="5"
+ circular="true" :autoplay="true" :interval="3000" :duration="8000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
<view style="width: 20%;">{{i+1}} / {{swiperList.length}}</view>
<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
@@ -279,7 +279,8 @@
<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 20%;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 20%;">澶囨敞: {{item.memo}}</view>
<view style="width: 30%;">鍗曟嵁鍙�: {{item.orderNo}}</view>
@@ -434,6 +435,8 @@
barcode: ""
},
swiperList: [],
+ boundInfoList: [],
+ deviceInfoList: [],
timeOut: false,
times: 0,
currDate: '',
@@ -473,7 +476,9 @@
this.getInfo2()
this.getError2()
this.getUrl()
- // this.controller()
+ this.getBoundInfoTest()
+ this.getDeviceInfoTest()
+ this.controller()
// 娴嬭瘯鐢�
},1000)
@@ -489,6 +494,20 @@
this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
},
+ // 鑾峰彇鍑哄叆搴撶粺璁℃暟鎹�
+ getBoundInfoTest() {
+ let that = this
+ var result = ycqdata.boundInfoTest
+ var res = result.data
+ that.boundInfoList = res.data
+ },
+ // 鑾峰彇璁惧鏁呴殰鏁版嵁
+ getDeviceInfoTest() {
+ let that = this
+ var result = ycqdata.deviceInfoTest
+ var res = result.data
+ that.deviceInfoList = res.data
+ },
// 鑾峰彇閿欒淇℃伅
getInfo2() {
let that = this
@@ -499,20 +518,21 @@
return;
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
+ that.infoText.title = res.data[0].title
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- } else if(res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- } else if(res.data[0].ioType === 1) {
- that.infoText.title = '鍏ュ簱'
- } else if(res.data[0].ioType === 10) {
- that.infoText.title = '绌烘墭鍏ュ簱'
- } else if(res.data[0].ioType === 110) {
- that.infoText.title = '绌烘墭鍑哄簱'
- }
+ // if (res.data[0].ioType === 101) {
+ // that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ // } else if(res.data[0].ioType === 103) {
+ // that.infoText.title = '妫�鏂欏嚭搴�'
+ // } else if(res.data[0].ioType === 107) {
+ // that.infoText.title = '鐩樼偣鍑哄簱'
+ // } else if(res.data[0].ioType === 1) {
+ // that.infoText.title = '鍏ュ簱'
+ // } else if(res.data[0].ioType === 10) {
+ // that.infoText.title = '绌烘墭鍏ュ簱'
+ // } else if(res.data[0].ioType === 110) {
+ // that.infoText.title = '绌烘墭鍑哄簱'
+ // }
that.infoText.barcode = res.data[0].barcode
that.infoText.workNo = res.data[0].workNo
that.infoText.sourceLocNo = res.data[0].sourceLocNo
--
Gitblit v1.9.1