From ab10cac0146228c22ffbbae0bbdfdf6af02cc18c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 11 四月 2023 12:59:20 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 142 ++++++++++++++++++++++++++++------------------
1 files changed, 86 insertions(+), 56 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 740c142..d855474 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -28,8 +28,8 @@
<image src="../../static/a1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">m</view>
+ <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
</view>
<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
</view>
@@ -39,8 +39,8 @@
<image src="../../static/b1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">m</view>
+ <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
</view>
<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
</view>
@@ -50,8 +50,8 @@
<image src="../../static/c1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">s</view>
+ <view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
</view>
<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
</view>
@@ -61,8 +61,8 @@
<image src="../../static/d1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">s</view>
+ <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
</view>
<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
</view>
@@ -167,13 +167,13 @@
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
+ <image src="../../static/f1.png" mode="aspectFit"></image>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
+ <image src="../../static/e1.png" mode="aspectFit"></image>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
</view>
</view>
@@ -213,12 +213,34 @@
<view class="info-main">
<view class="info-box">
<y-box>
- <view class="info-box-text">
- <view class="flex-col info-box-text-item">鐩爣绔欙細{{infoText.staNo}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧缂栧彿锛歿{infoText.matnr}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧鍚嶇О锛歿{infoText.maknx}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧瑙勬牸锛歿{infoText.specs}}</view>
- <view class="flex-col info-box-text-item">鏁伴噺锛歿{infoText.count}}</view>
+ <!-- 鏂囨湰瀹瑰櫒 -->
+ <view class="text-content">
+ <!-- head -->
+ <view class="swiper-head">
+ <view style="width: 20%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
+ <view style="width: 30%;">鍟嗗搧缂栧彿</view>
+ <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
+ <view style="width: 20%;">瑙勬牸</view>
+ <view style="width: 10%;">鏁伴噺</view>
+ </view>
+ <!-- body -->
+ <view class="swiper-body">
+ <!-- swiper 涓�浜涜鏄�
+ 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.matnr}}</view>
+ <view style="width: 20%;">{{item.maknx}}</view>
+ <view style="width: 20%;">{{item.specs}}</view>
+ <view style="width: 10%;">{{item.count}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
</view>
</y-box>
</view>
@@ -350,17 +372,16 @@
infoType: 0,
text: '',
infoText: {
- title: '鍏ㄦ澘鍑哄簱',
- staNo: "200",
- matnr: "300",
- maknx: "400",
- specs: "500",
- count: "600",
- error: "鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涖��"
+ title: '',
+ staNo: "",
+ matnr: "",
+ maknx: "",
+ specs: "",
+ count: "",
+ error: "",
+ barcode: ""
},
-
-
-
+ swiperList: []
}
},
onShow() {
@@ -381,34 +402,33 @@
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
- this.getUrl()
+ // this.getUrl()
},
onLoad() {
-
- // this.getServerData()
- this.getDate()
setInterval(()=>{
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
this.getDate()
this.getInfo()
this.getError()
- this.getUrl()
- // 娴嬭瘯鐢�
// this.getInfo2()
// this.getError2()
+ this.getUrl()
this.controller()
+ // 娴嬭瘯鐢�
+
},1000)
- setInterval(()=>{
- // this.controller()
- },2000)
},
methods: {
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
- // getServerData() {
- // this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
- // this.chartsDataPie2=JSON.parse(JSON.stringify(demodata.PieA))
- // },
+ getServerData() {
+ this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
+ this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
+ },
// 鑾峰彇閿欒淇℃伅
getInfo2() {
let that = this
@@ -425,10 +445,12 @@
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
}
- that.infoText.staNo = res.data[0].staNo
- 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.barcode = res.data[0].barcode
+ 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
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -476,11 +498,15 @@
that.infoText.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ } else if(res.data[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
}
- that.infoText.staNo = res.data[0].staNo
- 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.barcode = res.data[0].barcode
+ 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
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -495,6 +521,7 @@
let that = this
uni.request({
url: that.commonUrl + "/monitor/led/error",
+ data: {ledId:that.baseLedId},
method:"GET",
success(result) {
var res = result.data
@@ -502,12 +529,14 @@
var errorInfo = res.data
if (that.infoType == 1) {
that.infoType = 3
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
return
}
that.infoType = 2
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
@@ -688,11 +717,11 @@
var res = result.data
if (res.code === 200) {
that.chartsData.Pie.series[0].data = res.data.pie
- that.stockCount = res.data.stockCunt
- that.emptyCount = res.data.emptyCount
- that.noneCount = res.data.noneCount
- that.used = res.data.used
- that.usedPr = res.data.usedPr
+ that.baseInfo.stockCount = res.data.stockCunt
+ that.baseInfo.emptyCount = res.data.emptyCount
+ that.baseInfo.noneCount = res.data.noneCount
+ that.baseInfo.used = res.data.used
+ that.baseInfo.usedPr = res.data.usedPr
}
}
})
@@ -727,6 +756,7 @@
<style>
/* @import url("../../static/css/common.css"); */
+ @import url("home.css");
/* 鍒� */
.flex-col {
display: flex;
--
Gitblit v1.9.1