From 14c720ec39f268564d9176c03a09e175c5c78d0c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 16:50:51 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |  394 +++---------------------------------------------
 Monitor-APP/pages/home/home.vue   |   49 +++--
 2 files changed, 58 insertions(+), 385 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 54b6c40..9f5253b 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -215,11 +215,11 @@
 							<view class="text-content">
 								<!-- head -->
 								<view class="swiper-head">
-									<view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
-									<view style="width: 30%;">鍟嗗搧缂栧彿</view>
-									<view style="width: 20%;">鍟嗗搧鍚嶇О</view>
-									<view style="width: 20%;">瑙勬牸</view>
-									<view style="width: 10%;">鏁伴噺</view>
+									<view style="width: 25%;">鐩爣绔欙細{{infoText.staNo}}</view>
+									<view style="width: 25%;">鍟嗗搧缂栧彿</view>
+									<view style="width: 25%;">鍟嗗搧鍚嶇О</view>
+									<!-- <view style="width: 20%;">瑙勬牸</view> -->
+									<view style="width: 25%;">鏁伴噺</view>
 								</view>
 								<!-- body -->
 								<view class="swiper-body">
@@ -231,11 +231,11 @@
 									display-multiple-items="8"
 									circular="true" :autoplay="true" :interval="3000" :duration="1000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">No:{{i+1}}</view>
-											<view style="width: 30%;">{{item.matNo}}</view>
-											<view style="width: 20%;">{{item.maknx}}</view>
-											<view style="width: 20%;">{{item.specs}}</view>
-											<view style="width: 10%;">{{item.count}}</view>
+											<view style="width: 25%;">No:{{i+1}}</view>
+											<view style="width: 25%;">{{item.matNo}}</view>
+											<view style="width: 25%;">{{item.maknx}}</view>
+											<!-- <view style="width: 20%;">{{item.specs}}</view> -->
+											<view style="width: 25%;">{{item.count}}</view>
 										</swiper-item>
 									</swiper>
 								</view>
@@ -244,10 +244,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="btn">
+			<!-- <view class="btn"> -->
 				<!-- <button >鎷f枡鍥炲簱</button> -->
-				<button  size="mini" type="primary" @click="">鎷f枡鍥炲簱</button>
-			</view>
+				<!-- <button  size="mini" type="primary" @click="">鎷f枡鍥炲簱</button> -->
+			<!-- </view> -->
 		</uni-transition>
 		<!-- 寮傚父淇℃伅 -->
 		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
@@ -421,19 +421,26 @@
 			// this.getUrl()
 		},
 		onLoad() {
+			this.getServerData()
+			this.initlineChart()
+			this.initPieChart()
+			this.getOther()
+			this.getDate2()
+			this.getUrl()
+			setInterval(()=>{
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
+				this.controller()
+			},1000)
 			setInterval(()=>{
 				this.getServerData()
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
 				this.getDate2()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
-				this.getUrl()
-				this.controller()
-			},1000)
+			},600000)
 		},
 		methods: {
 			timeOuts() {
@@ -989,7 +996,7 @@
 	}
 	.info-main {
 		width: 100vw;
-		height: 80vh;
+		height: 88vh;
 		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 285208a..29bc8cc 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,376 +1,42 @@
 {
 	"dataInfo2":
 		{"data":{"msg": "鎿嶄綔鎴愬姛","code": 200,"data": [{
-													"title":"鍏ㄦ澘鍑哄簱",
+													"title":"鐩樼偣鍑哄簱",
 																"workNo":8046,
 																"staNo":4,
 																"sourceStaNo":null,
 																"locNo":null,
 																"sourceLocNo":"1500502",
 																"barcode": "80009901",
-																"matDtos":[
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		},
-																		{
-																			"matNo":"LPJ.SLJ.XG.037",
-																			"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
-																			"batch":null,"count":40.0,
-																			"specs":"gcslxwt"
-																		}
-																		
-																	],
+																"matDtos": [{
+																			"matNo": "040609000182",
+																			"maknx": "鍏铻烘瘝",
+																			"count": 1072.0
+																		}, {
+																			"matNo": "040619000007",
+																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
+																			"count": 870.0
+																		}, {
+																			"matNo": "040619000008",
+																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
+																			"count": 39600.0
+																		}, {
+																			"matNo": "040619000009",
+																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
+																			"count": 8090.0
+																		}, {
+																			"matNo": "040619000010",
+																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
+																			"count": 430.0
+																		}, {
+																			"matNo": "040619000011",
+																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
+																			"count": 16030.0
+																		}, {
+																			"matNo": "040619000012",
+																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
+																			"count": 235.0
+																		}],
 																"emptyMk":false,
 																"ioType":101
 												}]

--
Gitblit v1.9.1