From 36909d121a6f1b4c3f4540b8c64c80e872d105ae Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 五月 2025 15:12:32 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/index.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index ec4e206..b24e432 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>
@@ -187,7 +189,6 @@
 								<p class="english">Today</p>
 							</view>
 							<view class="sub-main">
-								<!-- 鎶樼嚎鍥� -->
 								<view class="charts-box ring">
 									<qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
 								</view>
@@ -353,6 +354,7 @@
 				staNo:'',
 				matnr:'',
 				maknx:'',
+				specs:'',
 				count:'',
 				orderNo:null,
 				doneOfTray:'',
@@ -386,6 +388,9 @@
 				that.baseCrnId = BaseCrnId
 			this.getUrl()
 		},
+		onLoad() {
+			
+		},
 		onReady() {
 			setInterval(() => {
 				// 鑾峰緱鍒濆鏁版嵁
@@ -400,13 +405,15 @@
 				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() {
@@ -417,6 +424,7 @@
 				// 娴嬭瘯鐢� 鈫�
 				// 杩斿洖缁撴灉鏈夊�� 涓斿�间笉绛変簬绌哄�� 灏辨槸鏈夐敊璇俊鎭渶瑕佸睍绀�
 				if (res.data && res.data !== "") {
+					
 					that.errorMsg = res.data
 					that.errorShow = true
 					that.move = false // 鏄剧ず
@@ -527,6 +535,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 +559,6 @@
 				});
 			},
 			animation() {
-				console.log(this.move);
 				if (this.move) { 
 					this.topMove = 'topUp'
 					this.floorMove = 'floorUp'
@@ -575,6 +583,7 @@
 					method:'GET',
 					success(result) {
 						var res = result.data
+						console.log(result);
 						if (res.code === 200) {
 							that.chartsData.Line.categories = [
 								that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),

--
Gitblit v1.9.1