From 88bd5389ece5fc2e404cd1a17dbc2f5dea17eb78 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 23 十月 2023 18:05:10 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |  120 ++++++++++++++++++++--------------------
 Monitor-APP/pages/home/home.vue   |   23 ++++++-
 2 files changed, 78 insertions(+), 65 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 92ce788..54b6c40 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -244,6 +244,10 @@
 					</view>
 				</view>
 			</view>
+			<view class="btn">
+				<!-- <button >鎷f枡鍥炲簱</button> -->
+				<button  size="mini" type="primary" @click="">鎷f枡鍥炲簱</button>
+			</view>
 		</uni-transition>
 		<!-- 寮傚父淇℃伅 -->
 		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
@@ -423,10 +427,10 @@
 				this.initPieChart()
 				this.getOther()
 				this.getDate2()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
 				this.getUrl()
 				this.controller()
 			},1000)
@@ -792,6 +796,15 @@
 	/* @import url("../../static/css/common.css"); */
 	@import url("home.css");
 	/* 鍒� */
+	.btn {
+		position: fixed;
+		width: 100%;
+		height: 10vh;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 	.flex-col {
 		display: flex;
 		flex-direction: column;
@@ -976,7 +989,7 @@
 	}
 	.info-main {
 		width: 100vw;
-		height: 88vh;
+		height: 80vh;
 		display: flex;
 		justify-content: center;
 		align-items: center;
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6cb808b..285208a 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -10,361 +10,361 @@
 																"barcode": "80009901",
 																"matDtos":[
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"
 																		},
 																		{
-																			"matnr":"LPJ.SLJ.XG.037",
+																			"matNo":"LPJ.SLJ.XG.037",
 																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
 																			"batch":null,"count":40.0,
 																			"specs":"gcslxwt"

--
Gitblit v1.9.1