From 6acc6874e61f4e995d33d3031694b3168a0ccf31 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 十一月 2024 09:11:38 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 172 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 120 insertions(+), 52 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 32e196a..e1be7d9 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -207,15 +207,13 @@
<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
<view style="width: 50%; font-size: 3vw;">鐗╂枡缂栫爜: {{item.matnr}}</view>
- <view style="width: 50%; font-size: 3vw;">鎵瑰彿: {{item.batch}}</view>
- <view style="width: 33%; font-size: 3vw;">鐢熶骇鏃ユ湡: {{item.manuDate}}</view>
+ <view style="width: 50%; font-size: 3vw;">鍚嶇О: {{item.maknx}}</view>
+ <!-- <view style="width: 33%; font-size: 3vw;">鐢熶骇鏃ユ湡: {{item.manuDate}}</view> -->
- <view style="width: 33%; font-size: 3vw;">鍨嬪彿: {{item.model}}</view>
- <view style="width: 33%; font-size: 3vw;">鑶滅被鍨�: {{item.specs}}</view>
- <view style="width: 33%; font-size: 3vw;">闀垮害: {{item.length}}</view>
- <view style="width: 33%; font-size: 3vw;">瀹藉害: {{item.weight}}</view>
- <view style="width: 33%; font-size: 3vw;">闈㈢Н: {{item.volume}}</view>
+ <view style="width: 50%; font-size: 3vw;">瑙勬牸: {{item.specs}}</view>
+ <view style="width: 50%; font-size: 3vw;">鎵规: {{item.batch}}</view>
+ <view style="width: 33%; font-size: 3vw;">鏁伴噺: {{item.count}}</view>
</swiper-item>
@@ -304,6 +302,7 @@
<script>
import demodata from '@/mockdata/demodata.json';
import ycqdata from '@/pages/index/data.json';
+ import {WebSocketClient} from "@/static/js/WebSocketClient"
let socket;
export default {
data() {
@@ -369,7 +368,10 @@
timeOut: false,
times: 0,
currDate: '',
- locList:[]
+ locList:[],
+ oldHours:'',
+ oldMin:''
+
}
},
@@ -400,10 +402,10 @@
const BasePort = uni.getStorageSync('BasePort');
const BaseCrnId = uni.getStorageSync('BaseCrnId');
const PROJ = uni.getStorageSync('UPROJ');
- that.baseUrl = PROJ
- that.baseIP = BaseIP
+ that.baseUrl = "gtwcs"
+ that.baseIP = "10.0.100.120"
that.baseLedId = BaseLedId
- that.basePort = BasePort
+ that.basePort = "8088"
that.baseCrnId = BaseCrnId
that.webSockerInit();
},
@@ -420,56 +422,122 @@
// // this.getInfo2()
// // this.getError2()
// this.getUrl()
- // this.controller()
+ this.controller()
// this.statisticalModel()
// 娴嬭瘯鐢�
},1000)
+
+ setInterval(()=> {
+ setTimeout(()=>{
+ plus.runtime.restart();
+ },100)
+
+ },1000*60*60*4)
+
+ setInterval(()=> {
+ setTimeout(()=>{
+ var time = new Date();
+ var hh = time.getHours();
+ var mm = time.getMinutes();
+ if(hh > this.oldHours && mm >this.oldMin && this.oldMin - mm < 55){
+ plus.runtime.restart();
+ }
+ if(mm >this.oldMin && mm - this.oldMin >2){
+ plus.runtime.restart();
+ }
+ },100)
+
+ },1000*30)
},
methods: {
webSockerInit(){
let that = this;
that.commonUrl = that.baseIP + ':' +that.basePort + "/" +that.baseUrl
- if(typeof(WebSocket) == "undefined"){
- console.log("涓嶆敮鎸亀ebsocket")
- }else{
- let socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId
- console.log("ws://"+that.commonUrl+"/led/"+that.baseLedId)
- if (socket != null) {
- socket.close();
- socket = null;
- }
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
- //鎵撳紑浜嬩欢
- socket.onopen = function () {
- console.log("websocket宸叉墦寮�");
- };
- socket.onmessage = function(msg){
- let data = JSON.parse(msg.data)
- that.chartsData.Pie.series[0].data = data.pie
- that.baseInfo.stockCount = data.stockCunt
- that.baseInfo.emptyCount = data.emptyCount
- that.baseInfo.noneCount =data.noneCount
- that.baseInfo.used = data.used
- that.baseInfo.usedPr = data.usedPr
-
- that.chartsData.Line.categories = [
- that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
- that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
- that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
- that.chartsData.Line.series = data.rows
- that.calendar = data.year + "骞�" + data.month + "鏈�" + data.day + "鏃� " + data.hour + ":" + data.minute + ":" + data.second + " " + data.week
- that.currDate = data.year + "/" + data.month + "/" + data.day
- that.locList = data.inventoryData
- }
- socket.onclose = function(){
- console.log("websocket宸插叧闂�");
- }
- socket.onerror = function(){
- console.log("websocket閿欒");
- }
- }
+ let socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId
+ // socketUrl = "ws://10.0.100.150:8080/gtctu/led/113"
+ const ws = new WebSocketClient(socketUrl);
+ ws.connect()
+ ws.onmessage((msg)=>{
+ let data = JSON.parse(msg.data)
+ if(data.type === "default"){
+ that.chartsData.Pie.series[0].data = data.pie
+ that.baseInfo.stockCount = data.stockCunt
+ that.baseInfo.emptyCount = data.emptyCount
+ that.baseInfo.noneCount =data.noneCount
+ that.baseInfo.used = data.used
+ that.baseInfo.usedPr = data.usedPr
+
+ that.chartsData.Line.categories = [
+ that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
+ that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
+ that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
+ that.chartsData.Line.series = data.rows
+ that.calendar = data.year + "骞�" + data.month + "鏈�" + data.day + "鏃� " + data.hour + ":" + data.minute + ":" + data.second + " " + data.week
+ that.currDate = data.year + "/" + data.month + "/" + data.day
+ that.locList = data.inventoryData
+ that.oldHours = data.hour
+ that.oldMin = data.minute
+ }else if(data.type === "error"){
+ if (data.errMsg && data.errMsg !== "") {
+ var errorInfo = data.errMsg
+ if (that.infoType == 1) {
+ that.infoType = 3
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
+ return
+ }
+ that.infoType = 2
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
+ } else {
+ if (that.infoType == 1) {
+ return
+ }
+ that.infoType = 0
+ }
+ }else if(data.type === "task"){
+ if (data.taskList && data.taskList !== "" && data.taskList.length !=0) {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
+ that.infoType = 1
+ if (data.taskList[0].ioType === 101) {
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ } else if(data.taskList[0].ioType === 103) {
+ that.infoText.title = '鎷ｆ枡鍑哄簱'
+ } else if(data.taskList[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if(data.taskList[0].ioType === 1) {
+ that.infoText.title = '鍏ュ簱'
+ } else if(data.taskList[0].ioType === 10) {
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ } else if(data.taskList[0].ioType === 110) {
+ that.infoText.title = '绌烘墭鍑哄簱'
+ }else if(data.taskList[0].ioType === 104) {
+ that.infoText.title = '骞舵澘鍑哄簱'
+ }
+ that.infoText.barcode = data.taskList[0].barcode
+ that.infoText.workNo = data.taskList[0].workNo
+ that.infoText.sourceLocNo = data.taskList[0].sourceLocNo
+ that.infoText.staNo = data.taskList[0].staNo
+ that.swiperList = data.taskList[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;
+ }
+ that.infoType = 0
+ }
+ }
+
+ })
},
statisticalModel() {
let that = this
--
Gitblit v1.9.1