From cc8abcd322a4b22bb7c7ff512a768a970b8bb442 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期六, 26 十一月 2022 08:45:53 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/index.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index ec4e206..a6ba62d 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -25,9 +25,11 @@
 								<!-- 鐩爣绔� -->
 								<view class="box-items">{{staNo}}</view>
 								<!-- 鍟嗗搧缂栧彿 -->
-								<view class="box-items">{{matnr}}</view>
+								<!-- <view class="box-items">{{matnr}}</view> -->
 								<!-- 鍟嗗搧鍚嶇О -->
 								<view class="box-items">{{maknx}}</view>
+								<!-- 鍟嗗搧鍚嶇О -->
+								<view class="box-items">{{specs}}</view>
 								<!-- 鍑哄簱鏁伴噺 -->
 								<view class="box-items">{{count}}</view>
 							</view>
@@ -353,6 +355,7 @@
 				staNo:'',
 				matnr:'',
 				maknx:'',
+				specs:'',
 				count:'',
 				orderNo:null,
 				doneOfTray:'',
@@ -386,6 +389,9 @@
 				that.baseCrnId = BaseCrnId
 			this.getUrl()
 		},
+		onLoad() {
+			
+		},
 		onReady() {
 			setInterval(() => {
 				// 鑾峰緱鍒濆鏁版嵁
@@ -394,19 +400,22 @@
 				// 涓婚〉淇℃伅
 				this.getServerData();
 				this.getOther();
+				this.getDateFormat();
 				// 鍏朵粬淇℃伅
 				this.getDate();
 				this.getPakin();
 				this.getError();
 				// this.getYYY();
 				// this.getEEE();
-				this.animation();
+				this.animation()
+				this.getUrl()
 			},1000)
 		},
 		methods: {
 			// 鑾峰彇url
 			getUrl() {
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + this.baseUrl
+				this.chartsDataLine1 = JSON.parse(JSON.stringify(demodata.Line))
 			},
 			// 鑾峰彇閿欒淇℃伅
 			getYYY() {
@@ -527,6 +536,7 @@
 							that.staNo = '鐩爣绔�:' + res.data[0].staNo
 							that.matnr = '鍟嗗搧缂栧彿锛�' + res.data[0].matDtos[0].matnr
 							that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].maknx
+							that.specs = '瑙勬牸锛�' + 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
@@ -550,7 +560,6 @@
 				});
 			},
 			animation() {
-				console.log(this.move);
 				if (this.move) { 
 					this.topMove = 'topUp'
 					this.floorMove = 'floorUp'

--
Gitblit v1.9.1