From d63b3ca02cf31122ef73f641b448b815aee4c82d Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期六, 22 十月 2022 16:07:24 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/index.vue | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index 521c028..e35066a 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -402,7 +402,7 @@
setTimeout(() => {
this.getServerData();
this.getOther();
- this.getPakin();
+ // this.getPakin();
}, 1000);
setInterval(() => {
this.getDate();
@@ -416,7 +416,7 @@
methods: {
// 鑾峰彇url
getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort +this.baseUrl
},
// 鑾峰彇閿欒淇℃伅
getYYY() {
@@ -533,7 +533,7 @@
},
method:'GET',
success(result) {
- console.log(result);
+ // console.log(result);
res = result.data
if (res.data && res.data !== "") {
that.errorMsg = res.data
@@ -541,11 +541,11 @@
that.move = false // 鏄剧ず
} else {
that.errorShow = false
- if (that.pakinShow) {
- return;
- } else {
- that.move = true // 闅愯棌
- }
+ // if (that.pakinShow) {
+ // return;
+ // } else {
+ // that.move = true // 闅愯棌
+ // }
}
}
});
@@ -563,7 +563,6 @@
},
method:'GET',
success(result) {
- // console.log(result);
res = result.data
if(res.data && res.data !== null) {
// that.move = false
@@ -575,7 +574,7 @@
}
that.staNo = '鐩爣绔�:' + res.data[0].staNo
that.matnr = '鍟嗗搧缂栧彿锛�' + res.data[0].matDtos[0].matnr
- that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].maknx
+ that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].specs
that.count = '鍑哄簱鏁伴噺锛�' + res.data[0].matDtos[0].count
if (res.data[0].orderNo) {
that.orderNo = "璁㈠崟鍙凤細" + res.data[0].orderNo
@@ -590,13 +589,13 @@
that.totalOfTray = '鎵樼洏鎬绘暟閲忥細' + res.data[0].totalOfTray
that.doneOfUnit = '宸插嚭绠辨暟锛�' + res.data[0].doneOfUnit
that.totalOfUnit = '鎬荤鏁帮細' + res.data[0].totalOfUnit
- if (that.errorShow) {
- // that.pakinShow = false
- return;
- } else {
- that.newspaper = newsData
- that.move = false
- }
+ // if (that.errorShow) {
+ // // that.pakinShow = false
+ // return;
+ // } else {
+ // that.newspaper = newsData
+ // that.move = false
+ // }
}else {
that.move = true
}
@@ -604,12 +603,10 @@
});
},
animation() {
- if (this.move) {
- // 涓婂眰鍚戜笂 / 涓嬪眰鍚戜笂
+ if (this.move) { // true 鐪嬫澘涓婂崌 false 鐪嬫澘涓嬮檷
this.topMove = 'topUp'
this.floorMove = 'floorUp'
} else {
- // 涓婂眰鍚戜笅 / 涓嬪眰鍚戜笅
this.topMove = 'topDown'
this.floorMove = 'floorDown'
}
@@ -629,7 +626,6 @@
url: that.commonUrl + "/monitor/line/charts",
method:'GET',
success(result) {
- console.log(result)
var res = result.data
if (res.code === 200) {
that.chartsData.Line.categories = [
@@ -695,9 +691,6 @@
uni.setStorageSync('BasePort',this.basePort);
uni.setStorageSync('BaseCrnId',this.baseCrnId);
this.getUrl()
- console.log(uni.getStorageSync('BaseIp'));
- console.log(this.baseIP);
- console.log(this.commonUrl);
this.ejectShow = false
},
// 寮瑰嚭灞傚彇娑�
--
Gitblit v1.9.1