From 666e98f2fb2fad2f12d44125d637767984826d44 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 07 二月 2024 19:19:08 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 207 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 152 insertions(+), 55 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 29250a6..07169ae 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,5 +1,6 @@
<template>
<view class="container">
+ <!-- 瀹佹尝鎹蜂赴椤圭洰 -->
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
<view class="head">
@@ -134,9 +135,9 @@
<!-- null -->
<view style="height: 2%;"></view>
+
-
- <view style="height: 43%;">
+ <view style="height: 51%;">
<y-box>
<view class="box-item">
<view class="flex-row" style="width: 100%;">
@@ -155,35 +156,60 @@
</view>
</view>
<view class="flex-row" style="width: 100%;">
- <!-- 宸� -->
- <view class="charts-box-ring">
- <qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
- </view>
- <!-- 鍙� -->
- <view>
+ <!-- 搴撲綅浣跨敤鎯呭喌 -->
+ <!-- left -->
+ <view style="margin-left: 5%;">
<view class="flex-row sub-info">
<image src="../../static/g1.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.stockCount}}</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">闀挎�诲簱浣�</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.longAllLoc}}</view>
</view>
- <view class="flex-row sub-info" style="margin-top: 2vh;">
- <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 class="flex-row sub-info">
+ <image src="../../static/g1.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.longUseLoc}}</view>
</view>
- <view class="flex-row sub-info" style="margin-top: 2vh;">
- <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 class="flex-row sub-info">
+ <image src="../../static/g1.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.longEmptyLoc}}</view>
+ </view>
+ <view class="flex-row sub-info">
+ <image src="../../static/g1.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.longXLoc}}</view>
</view>
</view>
+ <view style="margin-left: 5%;">
+ <view class="flex-row sub-info">
+ <image src="../../static/g1.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.shortAllLoc}}</view>
+ </view>
+ <view class="flex-row sub-info">
+ <image src="../../static/g1.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.shortUseLoc}}</view>
+ </view>
+ <view class="flex-row sub-info">
+ <image src="../../static/g1.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.shortEmptyLoc}}</view>
+ </view>
+ <view class="flex-row sub-info">
+ <image src="../../static/g1.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.shortXLoc}}</view>
+ </view>
+ </view>
+
</view>
</view>
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%;">
+ <view style="height: 10%;">
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
@@ -217,11 +243,15 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
- <view>鍟嗗搧缂栧彿</view>
- <view>鍟嗗搧鍚嶇О</view>
- <view>瑙勬牸</view>
- <view>鏁伴噺</view>
+ <view style="width: 10%;">搴忓彿</view>
+ <view style="width: 12%;">璁㈠崟鍙�</view>
+ <view style="width: 12%;">宸ヤ綔鍙�</view>
+ <view style="width: 12%;">绠辩爜</view>
+ <view style="width: 12%;">鍟嗗搧缂栧彿</view>
+ <view style="width: 12%;">鍟嗗搧鍚嶇О</view>
+ <view style="width: 10%;">瑙勬牸</view>
+ <view style="width: 10%;">鏁伴噺</view>
+ <view style="width: 10%;">缁撲綑</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -232,12 +262,16 @@
<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>No:{{i+1}}</view>
- <view>{{item.matnr}}</view>
- <view>{{item.maktx}}</view>
- <view>{{item.specs}}</view>
- <view>{{item.count}}</view>
+ <swiper-item class="swiper-item" v-for="(item,i) in locs" :key="i">
+ <view style="width: 10%;">No:{{i+1}}</view>
+ <view style="width: 12%;">{{item.orderNo ? item.orderNo : '--'}}</view>
+ <view style="width: 12%;">{{item.wrkNo ? item.wrkNo : '--'}}</view>
+ <view style="width: 12%;">{{item.suppCode ? item.suppCode : '--'}}</view>
+ <view style="width: 12%;">{{item.matnr}}</view>
+ <view style="width: 12%;">{{item.maktx}}</view>
+ <view style="width: 10%;">{{item.specs ? item.specs : '--'}}</view>
+ <view style="width: 10%;">{{item.anfme ? item.anfme : '--'}}</view>
+ <view style="width: 10%;">{{item.volume ? item.volume : '--'}}</view>
</swiper-item>
</swiper>
</view>
@@ -307,6 +341,12 @@
<input type="text" v-model="baseUrl">
</view>
</view>
+ <view class="item">
+ <view class="desc">绔欑偣锛�</view>
+ <view class="input">
+ <input type="text" v-model="devNo">
+ </view>
+ </view>
</view>
<!-- button -->
<view class="eject-button">
@@ -325,8 +365,8 @@
data() {
return {
series: [],
- homeViewShow: true,
- infoViewShow: false ,
+ homeViewShow: false,
+ infoViewShow: true ,
errorInfoViewShow: false,
homeMode: [],
infoMode: [],
@@ -341,6 +381,14 @@
stockCount: '',
emptyCount: '',
noneCount: '',
+ longAllLoc: '',
+ shortAllLoc: '',
+ longEmptyLoc: '',
+ shortEmptyLoc: '',
+ longUseLoc: '',
+ shortUseLoc: '',
+ longXLoc: '',
+ shortXLoc: '',
},
chartsData: {
"Line": {
@@ -380,7 +428,9 @@
count: "",
error: ""
},
- swiperList: []
+ swiperList: [],
+ devNo: 'CS-313',
+ locs: []
}
},
onShow() {
@@ -396,34 +446,66 @@
const BasePort = uni.getStorageSync('BasePort');
const BaseCrnId = uni.getStorageSync('BaseCrnId');
const PROJ = uni.getStorageSync('UPROJ');
+ const DEVNO = uni.getStorageSync('devNo');
that.baseUrl = PROJ
that.baseIP = BaseIP
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
+ that.devNo = DEVNO
// this.getUrl()
},
onLoad() {
- setInterval(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- this.getDate()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
+ setTimeout(()=> {
this.getUrl()
- this.controller()
+ },1000)
+ setInterval(()=>{
// 娴嬭瘯鐢�
+ this.getVisualized()
},1000)
},
methods: {
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
+ getVisualized() {
+ let that = this
+ let param = {devNo: `${that.devNo}`}
+ uni.request({
+ url: `${that.commonUrl}/rpc/info`,
+ header: {
+ 'Access-Control-Allow-Origin': '*',
+ 'Access-Control-Allow-Methods': 'GET,POST,OPTIONS',
+ 'Access-Control-Allow-Headers': 'X-Request-with,Content-Type',
+ },
+ sslVerify: false,
+ withCredentials: true,
+ method: 'POST',
+ data: JSON.stringify(param),
+ success(res) {
+ res = res.data
+ console.log(res);
+ that.result = res
+ if (res.code === 200 && res.data) {
+ that.locs = res.data.agvWrkDetls
+ if (res.data.agvWrkMast) {
+ if (res.data.agvWrkMast.ioType == 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if (res.data.agvWrkMast.ioType == 103) {
+ that.infoText.title = '鎷ｆ枡鍑哄簱'
+ } else {
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ }
+ } else{
+ that.infoText.title = '鍏ュ簱浣滀笟'
+ }
+
+ }
+ }
+ })
+ },
+
getServerData() {
this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
@@ -497,12 +579,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.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
+ 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;
@@ -521,17 +606,18 @@
method:"GET",
success(result) {
var res = result.data
- console.log(res);
if (res.data && res.data !== "") {
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) {
@@ -651,6 +737,7 @@
uni.setStorageSync('BasePort',this.basePort);
uni.setStorageSync('BaseCrnId',this.baseCrnId);
uni.setStorageSync('UPROJ',this.baseUrl);
+ uni.setStorageSync('devNo',this.devNo);
this.getUrl()
this.ejectShow = false
},
@@ -708,13 +795,22 @@
uni.request({
url: that.commonUrl + "/monitor/loc/rep",
method:'GET',
+ data: {
+ crnId: that.baseCrnId,
+ },
success(result) {
var res = result.data
if (res.code === 200) {
+ console.log(res.data.pie);
that.chartsData.Pie.series[0].data = res.data.pie
- that.baseInfo.stockCount = res.data.stockCunt
- that.baseInfo.emptyCount = res.data.emptyCount
- that.baseInfo.noneCount = res.data.noneCount
+ that.baseInfo.longAllLoc = res.data.longAllLoc
+ that.baseInfo.shortAllLoc = res.data.shortAllLoc
+ that.baseInfo.longEmptyLoc = res.data.longEmptyLoc
+ that.baseInfo.shortEmptyLoc = res.data.shortEmptyLoc
+ that.baseInfo.longUseLoc = res.data.longUseLoc
+ that.baseInfo.shortUseLoc = res.data.shortUseLoc
+ that.baseInfo.longXLoc = res.data.longXLoc
+ that.baseInfo.shortXLoc = res.data.shortXLoc
that.baseInfo.used = res.data.used
that.baseInfo.usedPr = res.data.usedPr
}
@@ -872,6 +968,7 @@
/* background-color: #00ffff; */
}
.sub-info {
+ margin-top: 1vh;
font-size: 1.5vw;
}
.sub-info image {
@@ -967,7 +1064,7 @@
.eject{
position: relative;
width: 40vw;
- height: 40vh;
+ height: 50vh;
background-color: #fff;
border-radius: 2rem;
}
--
Gitblit v1.9.1