From 2ae18c2d63974ef9da0e297fc3365c7a5435c9eb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 29 五月 2024 13:48:19 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  554 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 481 insertions(+), 73 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a81bb72..e47311f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,22 +1,21 @@
 <template>
 	<view class="container">
-		<!-- 涓昏鍥� -->
 		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
 				<view class="head">
-					<text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+					<text>涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
 				</view>
 				<!-- 鏃ュ巻 -->
 				<view class="time-tools">{{calendar}}</view>
 				<view class="button-left" @click="ejected()"></view>
 				<view class="button-right" @click="ejected()"></view>
-				<!-- 涓讳綋 -->
+				<!-- 涓昏鍥� -->
 				<view class="main">
 					<view class="mian-item">
 						<view class="mian-item-box">
 							<y-box>
 								<view class="box-item">
-									<text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
+									<text class="item-title">涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
 									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
 									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
 								</view>
@@ -29,10 +28,10 @@
 											<image src="../../static/a1.png" mode="aspectFit"></image>
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
-													<view style="position: absolute;bottom: 0;left: 7vw;">m</view>
+													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
+													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
 												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(鍗冪背)</view>
 											</view>
 										</view>
 										
@@ -40,10 +39,10 @@
 											<image src="../../static/b1.png" mode="aspectFit"></image>
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
-													<view style="position: absolute;bottom: 0;left: 7vw;">m</view>
+													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
+													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
 												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(鍗冪背)</view>
 											</view>
 										</view>
 										
@@ -51,10 +50,10 @@
 											<image src="../../static/c1.png" mode="aspectFit"></image>
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 7vw;">s</view>
+													<view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
+													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
 												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(灏忔椂)</view>
 											</view>
 										</view>
 										
@@ -62,10 +61,10 @@
 											<image src="../../static/d1.png" mode="aspectFit"></image>
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 7vw;">s</view>
+													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
+													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
 												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(灏忔椂)</view>
 											</view>
 										</view>
 										
@@ -165,17 +164,17 @@
 													<view class="flex-row sub-info">
 														<image src="../../static/g1.png" mode="aspectFit"></image>
 														<view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">10000</view>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
 													</view>
 													<view class="flex-row sub-info" style="margin-top: 2vh;">
-														<image src="../../static/g1.png" mode="aspectFit"></image>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">10000</view>
+														<image src="../../static/f1.png" mode="aspectFit"></image>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
 													</view>
 													<view class="flex-row sub-info" style="margin-top: 2vh;">
-														<image src="../../static/g1.png" mode="aspectFit"></image>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
-														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">10000</view>
+														<image src="../../static/e1.png" mode="aspectFit"></image>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
+														<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
 													</view>
 												</view>
 											</view>
@@ -187,7 +186,7 @@
 								<view style="height: 18%;">
 									<y-box>
 										<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
-											鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃
+											涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
 										</view>
 									</y-box>
 								</view>
@@ -195,22 +194,59 @@
 						</view>
 					</view>
 				</view>
+				
 			</view>
 		</uni-transition>
 		<!-- 鍏ㄦ澘/鎷f枡淇℃伅 -->
 		<uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
-			<view class="info-view">
+			<view class="home-view">
 				<view class="head">
-					<text>鎷� 鏂�</text>
+					<text>{{infoText.title}}</text>
 				</view>
 				<!-- 鏃ュ巻 -->
 				<view class="time-tools">{{calendar}}</view>
-				<view class="button-left"></view>
-				<view class="button-right"></view>
+				<view class="button-left" @click="ejected()"></view>
+				<view class="button-right" @click="ejected()"></view>
 				<!-- 涓讳綋 -->
-				<view class="info-main" >
+				<view class="info-main">
 					<view class="info-box">
-						<y-box></y-box>
+						<y-box>
+							<!-- 鏂囨湰瀹瑰櫒 -->
+							<view class="text-content">
+								<!-- head -->
+								<view class="swiper-head">
+									<view style="width: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
+									<view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
+									<view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
+									<view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</view>
+									<!-- <view style="width: 10%;">鏁伴噺</view> -->
+								</view>
+								<!-- body -->
+								<view class="swiper-body">
+									<!-- swiper 涓�浜涜鏄�
+									circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
+									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+									<swiper class="swiper-body-main" vertical="true" 
+									display-multiple-items="3"
+									circular="true" :autoplay="true" :interval="3000" :duration="2000">
+										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
+											<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
+											<view style="width: 50%;">DI鍗曞彿: {{item.orderNo}}</view>
+											<view style="width: 50%;">鎹嗗寘鍙风爜: {{item.matnr}}</view>
+											<view style="width: 100%;">AS400: {{item.brand}}</view>
+											
+											<view style="width: 100%;">鏈虹鍙�: {{item.maknx}}</view>
+											<view style="width: 50%;">鍙版暟: {{item.number}}</view>
+											<view style="width: 50%;">鍑�閲�: {{item.weight}}KG</view>
+											
+											
+										</swiper-item>
+									</swiper>
+								</view>
+							</view>
+						</y-box>
 					</view>
 				</view>
 			</view>
@@ -219,7 +255,7 @@
 		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
 			<view class="error-info-view">
 				<view class="head">
-					<text>寮傚父</text>
+					<text>{{infoText.title}}</text>
 				</view>
 				<!-- 鏃ュ巻 -->
 				<view class="time-tools">{{calendar}}</view>
@@ -228,7 +264,11 @@
 				<!-- 涓讳綋 -->
 				<view class="info-main" >
 					<view class="info-box">
-						<y-box></y-box>
+						<y-box>
+							<view class="info-box-text">
+								<view class="flex-col info-box-text-item">{{infoText.error}}</view>
+							</view>
+						</y-box>
 					</view>
 				</view>
 			</view>
@@ -240,7 +280,7 @@
 				<!-- 寮瑰嚭title -->
 				<view class="eject-title">淇敼 / 閰嶇疆</view>
 				<!-- input -->
-				<view class="eject-input">
+				<scroll-view scroll-y class="eject-input">
 					<view class="item">
 						<view class="desc">ip锛�</view>
 						<view class="input">
@@ -265,7 +305,13 @@
 							<input type="text" v-model="baseCrnId">
 						</view>
 					</view>
-				</view>
+					<view class="item">
+						<view class="desc">Url锛�</view>
+						<view class="input">
+							<input type="text" v-model="baseUrl">
+						</view>
+					</view>
+				</scroll-view>
 				<!-- button -->
 				<view class="eject-button">
 					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -273,17 +319,21 @@
 				</view>
 			</view>
 		</view>
+		<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+			杩炴帴瓒呮椂: {{times}} s
+		</view>
 	</view>
 </template>
-
+<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
 <script>
 	import demodata from '@/mockdata/demodata.json';
+	import ycqdata from '@/pages/index/data.json';
 	export default {
 		data() {
 			return {
 				series: [],
 				homeViewShow: true,
-				infoViewShow: false,
+				infoViewShow: false	,
 				errorInfoViewShow: false,
 				homeMode: [],
 				infoMode: [],
@@ -294,7 +344,10 @@
 					xDuration: 3,
 					yDuration: 4,
 					usedPr: 50,
-					used: 3537
+					used: 3537,
+					stockCount: '',
+					emptyCount: '',
+					noneCount: '',
 				},
 				chartsData: {
 					"Line": {
@@ -320,6 +373,25 @@
 				basePort: '',
 				baseLedId: '',
 				baseCrnId: '',
+				baseUrl: '',
+				info: null,
+				error: null,
+				infoType: 0,
+				text: '',
+				infoText: {
+					title: '',
+					staNo: "",
+					matnr: "",
+					maknx: "",
+					specs: "",
+					count: "",
+					error: "",
+					barcode: ""
+				},
+				swiperList: [],
+				timeOut: false,
+				times: 0,
+				currDate: '',
 				
 			}
 		},
@@ -329,49 +401,289 @@
 			plus.navigator.setFullscreen(true)
 			// #endif
 		},
+		mounted() {
+			let that = this
+			const BaseIP = uni.getStorageSync('BaseIp');
+			const BaseLedId = uni.getStorageSync('BaseLedId');
+			const BasePort = uni.getStorageSync('BasePort');
+			const BaseCrnId = uni.getStorageSync('BaseCrnId');
+			const PROJ = uni.getStorageSync('UPROJ');
+			that.baseUrl = PROJ
+			that.baseIP = BaseIP
+			that.baseLedId = BaseLedId
+			that.basePort = BasePort
+			that.baseCrnId = BaseCrnId
+			// this.getUrl()
+		},
 		onLoad() {
-			this.getServerData()
-			this.getDate()
 			setInterval(()=>{
-				this.getDate()
+				this.getServerData()
+				this.initlineChart()
+				this.initPieChart()
+				this.getOther()
+				// this.getDate()
+				this.getDate2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
+				this.getUrl()
+				this.controller()
+				// 娴嬭瘯鐢�
 				
 			},1000)
-			setInterval(()=>{
-				// this.controller()
-			},5000)
 		},
 		methods: {
+			timeOut() {
+				console.log(this.times);
+			},
 			getUrl() {
-				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + this.baseUrl
+				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
 			},
 			getServerData() {
-				this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
-				this.chartsDataPie2=JSON.parse(JSON.stringify(demodata.PieA))
+				this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
+				this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
+			},
+			// 鑾峰彇閿欒淇℃伅
+			getInfo2() {
+				let that = this
+				var result = ycqdata.dataInfo2
+				var	res = result.data
+				if (res.data && res.data !== "") {
+					if (that.infoType == 2 || that.infoType == 3) {
+						return;
+					}
+					// infoType1:鍙湁鎷f枡绛変俊鎭�
+					that.infoType = 1
+					if (res.data[0].ioType === 101) {
+						that.infoText.title = '鍏ㄦ澘鍑哄簱'
+					} else if(res.data[0].ioType === 103) {
+						that.infoText.title = '妫�鏂欏嚭搴�'
+					} else if(res.data[0].ioType === 107) {
+						that.infoText.title = '鐩樼偣鍑哄簱'
+					} else if(res.data[0].ioType === 1) {
+						that.infoText.title = '鍏ュ簱'
+					} else if(res.data[0].ioType === 10) {
+						that.infoText.title = '绌烘墭鍏ュ簱'
+					} else if(res.data[0].ioType === 110) {
+						that.infoText.title = '绌烘墭鍑哄簱'
+					}
+					that.infoText.barcode = res.data[0].barcode
+					that.infoText.workNo = res.data[0].workNo
+					that.infoText.sourceLocNo = res.data[0].sourceLocNo
+					that.infoText.staNo = res.data[0].staNo
+					that.swiperList = res.data[0].matDtos
+					// that.infoText.matnr = res.data[0].matDtos[0].matnr
+					// that.infoText.specs = res.data[0].matDtos[0].specs
+					// that.infoText.maknx = res.data[0].matDtos[0].maknx
+					// that.infoText.count = res.data[0].matDtos[0].count
+				} else {
+					if (that.infoType == 2 || that.infoType == 3) {
+						return;
+					}
+					that.infoType = 0
+				}
+			},
+			getError2 () {
+				let that = this
+				let result = ycqdata.dataError2
+				var	res = result.data
+				if (res.data && res.data !== "") {
+					var errorInfo = res.data
+					if (that.infoType == 1) {
+						that.infoType = 3
+						that.infoText.title = "鍏朵粬淇℃伅" 
+						// that.infoText.title = "寮傚父"
+						that.infoText.error = errorInfo
+						return
+					}
+					that.infoType = 2
+					that.infoText.title = "鍏朵粬淇℃伅"
+					// that.infoText.title = "寮傚父"
+					that.infoText.error = errorInfo
+				} else {
+					if (that.infoType == 1) {
+						return
+					}
+					that.infoType = 0
+				}
+			},
+			getInfo() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/led",
+					method:"GET",
+					data: {ledId:that.baseLedId},
+					success(result) {
+						that.timeOut = false
+						that.times = 0
+						var	res = result.data
+						if (res.data && res.data !== "") {
+							if (that.infoType == 2 || that.infoType == 3) {
+								return;
+							}
+							// infoType1:鍙湁鎷f枡绛変俊鎭�
+							that.infoType = 1
+							if (res.data[0].ioType === 101) {
+								that.infoText.title = '鍏ㄦ澘鍑哄簱'
+							} else if(res.data[0].ioType === 103) {
+								that.infoText.title = '妫�鏂欏嚭搴�'
+							} else if(res.data[0].ioType === 107) {
+								that.infoText.title = '鐩樼偣鍑哄簱'
+							} else if(res.data[0].ioType === 1) {
+								that.infoText.title = '鍏ュ簱'
+							} else if(res.data[0].ioType === 10) {
+								that.infoText.title = '绌烘墭鍏ュ簱'
+							} else if(res.data[0].ioType === 110) {
+								that.infoText.title = '绌烘墭鍑哄簱'
+							}
+							that.infoText.barcode = res.data[0].barcode
+							that.infoText.workNo = res.data[0].workNo
+							that.infoText.sourceLocNo = res.data[0].sourceLocNo
+							that.infoText.staNo = res.data[0].staNo
+							that.swiperList = res.data[0].matDtos
+							// that.infoText.matnr = res.data[0].matDtos[0].matnr
+							// that.infoText.specs = res.data[0].matDtos[0].specs
+							// that.infoText.maknx = res.data[0].matDtos[0].maknx
+							// that.infoText.count = res.data[0].matDtos[0].count
+						} else {
+							if (that.infoType == 2 || that.infoType == 3) {
+								return;
+							}
+							that.infoType = 0
+						}
+					},
+					fail(err) {
+						that.timeOut = true
+						that.times = that.times+1
+						that.infoType = 0
+					}
+				})
+				
+			},
+			getError() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/led/error",
+					data: {ledId:that.baseLedId},
+					method:"GET",
+					success(result) {
+						that.timeOut = false
+						that.times = 0
+						var	res = result.data
+						if (res.data && res.data !== "") {
+							var errorInfo = res.data
+							if (that.infoType == 1) {
+								that.infoType = 3
+								that.infoText.title = "鍏朵粬淇℃伅" 
+								// that.infoText.title = "寮傚父"
+								that.infoText.error = errorInfo
+								return
+							}
+							that.infoType = 2
+							that.infoText.title = "鍏朵粬淇℃伅"
+							// that.infoText.title = "寮傚父"
+							that.infoText.error = errorInfo
+						} else {
+							if (that.infoType == 1) {
+								return
+							}
+							that.infoType = 0
+						}
+					},
+					fail(err) {
+						that.timeOut = true
+						that.infoType = 0
+					}
+				})
+				
 			},
 			// 鎺у埗鍣�
 			controller() {
-				if (this.homeViewShow) {
-					this.homeViewShow = !this.homeViewShow
-					this.homeMode = ['fade', 'slide-bottom']
-					setTimeout(()=>{
-						this.infoViewShow = !this.infoViewShow
-						this.infoMode = ['fade', 'slide-bottom']
-					},1100)
-				} else if(this.infoViewShow) {
-					this.infoViewShow = !this.infoViewShow
-					this.infoMode = ['fade', 'slide-bottom']
-					setTimeout(()=>{
-						this.errorInfoViewShow = !this.errorInfoViewShow
-						this.errorInfoMode = ['fade', 'slide-bottom']
-					},1100)
-				} else {
-					this.errorInfoViewShow = !this.errorInfoViewShow
-					this.errorInfoMode = ['fade', 'slide-bottom']
-					setTimeout(()=>{
-						this.homeViewShow = !this.homeViewShow
-						this.homeMode = ['fade', 'slide-bottom']
-					},1100)
+				switch(this.infoType) {
+					// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+					case 0: 
+						if (this.errorInfoViewShow) {
+							this.errorInfoViewShow = false
+							this.errorInfoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.homeViewShow = true
+								this.homeMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.infoViewShow) {
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.homeViewShow = true
+								this.homeMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.errorInfoViewShow && this.infoViewShow) {
+							this.errorInfoViewShow = false
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.homeViewShow = true
+								this.homeMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
+					case 1: 
+						if (this.homeViewShow) {
+							this.homeViewShow = false
+							this.homeMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.infoViewShow = true
+								this.infoMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.errorInfoViewShow) {
+							this.errorInfoViewShow = false
+							this.errorInfoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.infoViewShow = true
+								this.infoMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						
+						return;
+						// 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
+					case 2:
+						if (this.homeViewShow) {
+							this.homeViewShow = false
+							this.homeMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.infoViewShow) {
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
+					// 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
+					case 3:
+						if (this.homeViewShow) {
+							this.homeViewShow = false
+							this.homeMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						} else if (this.infoViewShow) {
+							this.infoViewShow = false
+							this.infoMode = ['fade', 'slide-bottom']
+							setTimeout(()=>{
+								this.errorInfoViewShow = true
+								this.errorInfoMode = ['fade', 'slide-bottom']
+							},1000)
+						}
+						return;
+					
 				}
+				
 			},
 			// 涓诲睆骞�
 			handle(type) {
@@ -402,9 +714,24 @@
 				uni.setStorageSync('BaseLedId', this.baseLedId);
 				uni.setStorageSync('BasePort',this.basePort);
 				uni.setStorageSync('BaseCrnId',this.baseCrnId);
+				uni.setStorageSync('UPROJ',this.baseUrl);
 				this.getUrl()
 				this.ejectShow = false
 			},
+			// 鏃ュ巻 鏈嶅姟鍣�
+			getDate2() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/date",
+					method:"GET",
+					success(result) {
+						var res = result.data.data
+						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+						that.currDate = res.year + "/" + res.month + "/" + res.day
+					}
+				})
+			},
+			
 			// 鏃ュ巻
 			getDate() {
 				var dt = new Date();
@@ -427,13 +754,83 @@
 				}
 				this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
 			},
+			getDateFormat(value) {
+				var date = new Date(this.currDate);// 鑾峰彇褰撳墠鏃堕棿
+				date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
+				var m = date.getMonth() + 1
+				var d = date.getDate()
+				var newDate = m + '-' + d
+				return newDate
+			},
+			/*************** 鎶樼嚎鍥� *****************************************************************************************************/
+			initlineChart() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/line/charts",
+					method:'GET',
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.chartsData.Line.categories = [
+								that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
+								that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
+								that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
+							that.chartsData.Line.series = res.data.rows
+						}
+					}
+				})
+			},
+			/*************** 楗煎浘 *****************************************************************************************************/
+			initPieChart() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/loc/rep",
+					method:'GET',
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.chartsData.Pie.series[0].data = res.data.pie
+							that.baseInfo.stockCount = res.data.stockCunt
+							that.baseInfo.emptyCount = res.data.emptyCount
+							that.baseInfo.noneCount = res.data.noneCount
+							that.baseInfo.used = res.data.used
+							that.baseInfo.usedPr = res.data.usedPr
+						}
+					}
+				})
+			},
+			getOther() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/other",
+					data: {
+						crnId: that.baseCrnId, 
+						ledId: that.baseLedId,
+					},
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200) {
+							that.baseInfo.xDistance = res.data.xDistance
+							that.baseInfo.yDistance = res.data.yDistance
+							that.baseInfo.xDuration = res.data.xDuration
+							that.baseInfo.yDuration = res.data.yDuration
+						} else if (res.code === 403) {
+							
+						} else {
+							
+						}
+					}
+				})
+			},
 		}
 		
 	}
 </script>
 
 <style>
-	@import url("../../static/css/common.css");
+	/* @import url("../../static/css/common.css"); */
+	@import url("home.css");
 	/* 鍒� */
 	.flex-col {
 		display: flex;
@@ -655,20 +1052,23 @@
 	}
 	.eject-title {
 		width: 100%;
-		height: 10vh;
-		line-height: 10vh;
-		font-size: 2vw;
+		height: 5vh;
+		line-height: 6vh;
+		font-size: 3vh;
 		font-weight: 700;
 		color: 	#606266;
 		text-align: center;
 	}
 	.eject-input {
-		
+		margin-top: 2vh;
+		height: 25vh;
+		/* background-color: #00163E; */
+		::-webkit-scrollbar{display:none}
 	}
 	.item {
 		display: flex;
 		align-items: center;
-		margin: 2vh 0 0 0;
+		margin: 1vh 0 0 0;
 		font-size: 1.5vw;
 		color: #363636;
 	}
@@ -720,4 +1120,12 @@
 		
 		border-left: 1px solid #ccc;
 	}
+	.info-box-text {
+		width: 100%;height: 100%;
+		display: flex;flex-direction: column;align-items: center;justify-content: center;
+	}
+	.info-box-text-item {
+		height: 20%;font-size: 8vh;
+		justify-content: center;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1