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

---
 Monitor-APP/pages/home/home.vue |  806 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 722 insertions(+), 84 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 0690806..e8041d0 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,40 +1,101 @@
 <template>
 	<view class="container">
-		<!-- 涓昏鍥� -->
-		<uni-transition :duration="duration" :mode-class="modeClass" :styles="homeView" :show="homeViewShow">
+		
+		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
 				<view class="head">
 					<text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</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="main">
 					<view class="mian-item">
 						<view class="mian-item-box">
 							<y-box>
-								<view class="content-item">
-									<text>鑷姩鍖栫珛浣撲粨搴�</text>
-									<p class="english">Automatic Storageand Retrieval System</p>
-									<p class="introduce-content">  鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛�
-									鑷姩鍖栫珛浣撲粨搴撴槸褰撳墠鎶�鏈按骞宠緝楂樼殑褰㈠紡銆�
-									鑷姩鍖栫珛浣撲粨搴撶殑涓讳綋鐢辫揣鏋躲�佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆�
-									璐ф灦鏄挗缁撴瀯鎴栭挗绛嬫贩鍑濆湡缁撴瀯鐨勫缓绛戠墿鎴栫粨鏋勪綋锛岃揣鏋跺唴鏄爣鍑嗗昂瀵哥殑璐т綅绌洪棿锛屽贩閬撳爢鍨涜捣閲嶆満绌胯浜庤揣
-									鏋朵箣闂寸殑宸烽亾涓紝瀹屾垚瀛樸�佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</p>
+								<view class="box-item">
+									<text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
+									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
+									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
 								</view>
-								<view class="content-item img">
-									<text>浠撳簱鏁版嵁</text>
-									<p class="english">warehouse data</p>
-									<view>
-										<view class="charge-info-item">
+								<view class="box-item">
+									<text class="item-title">浠撳簱鏁版嵁</text>
+									<text class="item-subTitle">warehouse data</text>
+									<view class="img-box">
+										
+										<view class="item-img">
 											<image src="../../static/a1.png" mode="aspectFit"></image>
-											<view>
-												<text class="count">{{xDistance}}</text>
-												<text class="unit">m</text>
+											<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>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
 											</view>
-											<view>绱璧拌璺濈(绫�)</view>
+										</view>
+										
+										<view class="item-img">
+											<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>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
+											</view>
+										</view>
+										
+										<view class="item-img">
+											<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>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
+											</view>
+										</view>
+										
+										<view class="item-img">
+											<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>
+												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
+											</view>
+										</view>
+										
+									</view>
+								</view>
+								<view class="box-item">
+									<view class="flex-row" style="width: 100%;">
+										<!-- 宸︿晶 -->
+										<view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
+											<text class="item-title">搴撲綅浣跨敤鐜�</text>
+											<text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
+										</view>
+										<!-- 鍙充晶 -->
+										<view style="margin-left: auto;">
+											<!-- 鐧惧垎姣� -->
+											<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
+												<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
+												<text class="item-title">{{baseInfo.usedPr}}%</text>
+												<text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text>
+											</view>
+										</view>
+									</view>
+									
+									<view class="flex-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
+										<!-- 杩涘害鏉� -->
+										<view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
+											<view class="progressBar" style="width: 80%;height: 2vw;">
+												<view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
+											</view>
+											<view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
 										</view>
 									</view>
 								</view>
@@ -43,72 +104,419 @@
 					</view>
 					<view class="mian-item">
 						<view class="mian-item-box">
-							<view style="height: 38%;">
-								<y-box></y-box>
-							</view>
-							<view style="height: 2%;"></view>
-							<view style="height: 38%;">
-								<y-box></y-box>
-							</view>
-							<view style="height: 2%;"></view>
-							<view style="height: 20%;">
-								<y-box></y-box>
+							<view style="width: 100%;height: 100%;">
+								<view style="height: 35%;">
+									<!-- 鎶樼嚎鍥� -->
+									<y-box>
+										<view class="box-item">
+											<view class="flex-row" style="width: 100%;">
+												<!-- 宸︿晶 -->
+												<view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
+													<text class="item-title">鍏ュ嚭搴撶粺璁�</text>
+													<text class="item-subTitle">ORDER STATISTICS</text>
+												</view>
+												<!-- 鍙充晶 -->
+												<view style="margin-left: auto;">
+													<!-- 鐧惧垎姣� -->
+													<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
+														<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
+														<text class="item-title">31</text>
+														<text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
+													</view>
+												</view>
+											</view>
+											<view class="charts-box">
+												<qiun-data-charts type="line" :chartData="chartsDataLine1" :echartsH5="true" :echartsApp="true"/>
+											</view>
+										</view>
+									</y-box>
+								</view>
+								
+								
+								<!-- null -->
+								<view style="height: 2%;"></view>
+								
+								
+								<view style="height: 43%;">
+									<y-box>
+										<view class="box-item">
+											<view class="flex-row" style="width: 100%;">
+												<!-- 宸︿晶 -->
+												<view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
+													<text class="item-title">搴撳瓨绫诲瀷</text>
+													<text class="item-subTitle">INCOME DATE</text>
+												</view>
+												<!-- 鍙充晶 -->
+												<view style="margin-left: auto;">
+													<!-- 鐧惧垎姣� -->
+													<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
+														<text class="item-title">浠婂ぉ</text> 
+														<text class="item-subTitle">Today</text>
+													</view>
+												</view>
+											</view>
+											<view class="flex-row" style="width: 100%;">
+												<!-- 宸� -->
+												<view class="charts-box-ring">
+													<qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
+												</view>
+												<!-- 鍙� -->
+												<view>
+													<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>
+													<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>
+													</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>
+													</view>
+												</view>
+											</view>
+										</view>
+										
+									</y-box>
+								</view>
+								<view style="height: 2%;"></view>
+								<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>
 							</view>
 						</view>
 					</view>
 				</view>
+				
 			</view>
 		</uni-transition>
 		<!-- 鍏ㄦ澘/鎷f枡淇℃伅 -->
-		<!-- <view class="info">
-			
-		</view> -->
+		<uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
+			<view class="home-view">
+				<view class="head">
+					<text>鍏ㄦ澘 / 鎷f枡</text>
+				</view>
+				<!-- 鏃ュ巻 -->
+				<view class="time-tools">{{calendar}}</view>
+				<view class="button-left" @click="ejected()"></view>
+				<view class="button-right" @click="ejected()"></view>
+				<!-- 涓讳綋 -->
+				<view class="info-main">
+					<view class="info-box">
+						<y-box>{{text}}</y-box>
+					</view>
+				</view>
+			</view>
+		</uni-transition>
 		<!-- 寮傚父淇℃伅 -->
-		<!-- <view class="error-info"></view> -->
+		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
+			<view class="error-info-view">
+				<view class="head">
+					<text>寮傚父</text>
+				</view>
+				<!-- 鏃ュ巻 -->
+				<view class="time-tools">{{calendar}}</view>
+				<view class="button-left"></view>
+				<view class="button-right"></view>
+				<!-- 涓讳綋 -->
+				<view class="info-main" >
+					<view class="info-box">
+						<y-box>{{text1}}</y-box>
+					</view>
+				</view>
+			</view>
+		</uni-transition>
+		
+		<!-- 鑷畾涔夊脊鍑哄眰 -->
+		<view class="eject-mask" v-show="ejectShow">
+			<view class="eject">
+				<!-- 寮瑰嚭title -->
+				<view class="eject-title">淇敼 / 閰嶇疆</view>
+				<!-- input -->
+				<view class="eject-input">
+					<view class="item">
+						<view class="desc">ip锛�</view>
+						<view class="input">
+							<input type="text" v-model="baseIP">
+						</view>
+					</view>
+					<view class="item">
+						<view class="desc">port锛�</view>
+						<view class="input">
+							<input type="text" v-model="basePort">
+						</view>
+					</view>
+					<view class="item">
+						<view class="desc">ledId锛�</view>
+						<view class="input">
+							<input type="text" v-model="baseLedId">
+						</view>
+					</view>
+					<view class="item">
+						<view class="desc">CrnId锛�</view>
+						<view class="input">
+							<input type="text" v-model="baseCrnId">
+						</view>
+					</view>
+				</view>
+				<!-- button -->
+				<view class="eject-button">
+					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
+					<view class="button-item" @click="ejectConfirm">纭� 璁�</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import demodata from '@/mockdata/demodata.json';
+	import ycqdata from '@/pages/index/data.json';
 	export default {
 		data() {
 			return {
+				series: [],
 				homeViewShow: true,
-				modeClass: ['fade', 'slide-top'],
-				homeView: {
-					justifyContent: 'center',
-					alignItems: 'center',
-					width: '100vw',
-					height: '100vh',
-					borderRadius: '5px',
-					textAlign: 'center',
-					backgroundColor: '#4cd964',
-					boxShadow: '0 0 5px 1px rgba(0,0,0,0.2)'
+				infoViewShow: false,
+				errorInfoViewShow: false,
+				homeMode: [],
+				infoMode: [],
+				errorInfoMode: [],
+				baseInfo: {
+					xDistance: 1,
+					yDistance: 2,
+					xDuration: 3,
+					yDuration: 4,
+					usedPr: 50,
+					used: 3537
+				},
+				chartsData: {
+					"Line": {
+						"categories": [],
+						"series": []
+					},
+					"Pie": {
+						"series": [{
+							"data": []
+						}]
+					},
 				},
 				duration: 1000,
 				calendar: '',
-				xDistance: '',
-				yDistance: '',
-				xDuration: '',
-				yDuration: '',
+				ringOpts:{},
+				chartsDataLine1: {},
+				chartsDataPie2: {},
+				fontSize: '',
+				height: '',
+				showCharts: false,
+				ejectShow: false,
+				baseIP: '',
+				basePort: '',
+				baseLedId: '',
+				baseCrnId: '',
+				info: null,
+				error: null,
+				infoType: 0,
+				text: '',
+				text1: '',
+				
+				
+				
+				
 			}
 		},
 		onShow() {
 			// 闅愯棌鏃堕棿,鐢甸噺,淇″彿绛�
+			// #ifdef APP-PLUS
 			plus.navigator.setFullscreen(true)
+			// #endif
 		},
 		onLoad() {
+			this.getServerData()
 			this.getDate()
 			setInterval(()=>{
 				this.getDate()
+				this.getInfo()
+				this.getError()
+				this.controller()
 			},1000)
 			setInterval(()=>{
-				// this.handle(['fade', 'slide-top'])
-			},4000)
+				// this.controller()
+			},2000)
 		},
 		methods: {
+			getUrl() {
+				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))
+			},
+			getInfo() {
+				let that = this
+				uni.request({
+					url: "http://192.168.1.111:8088/sxjzwms/system/error",
+					method:"GET",
+					success(result) {
+						var	res = result.data
+						if (res.data && res.data !== "") {
+							if (that.infoType == 2 || that.infoType == 3) {
+								return;
+							}
+							that.infoType = 1
+							that.text = res
+						} else {
+							if (that.infoType == 2 || that.infoType == 3) {
+								return;
+							}
+							that.infoType = 0
+						}
+					}
+				})
+				
+			},
+			getError() {
+				let that = this
+				uni.request({
+					url:"http://192.168.1.111:8088/sxjzwms/mat/info",
+					method:"GET",
+					success(result) {
+						var	res = result.data
+						if (res.data && res.data !== "") {
+							if (that.infoType == 1) {
+								that.infoType = 3
+								that.text1 = res
+								return
+							}
+							that.infoType = 2
+							that.text1 = res
+						} else {
+							if (that.infoType == 1) {
+								return
+							}
+							that.infoType = 0
+						}
+					}
+				})
+				
+			},
+			// 鎺у埗鍣�
+			controller() {
+				switch(this.infoType) {
+					// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+					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;
+					default :
+						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)
+						}
+						return;
+				}
+				
+			},
+			// 涓诲睆骞�
 			handle(type) {
 				this.homeViewShow = !this.homeViewShow
 				this.modeClass = type
+			},
+			// 鎷f枡
+			handle1(type) {
+				this.infoViewShow = !this.infoViewShow
+				this.modeClass = type
+			},
+			// 寮傚父
+			handle2(type) {
+				this.errorInfoViewShow = !this.errorInfoViewShow
+				this.modeClass = type
+			},
+			// 閰嶇疆
+			ejected () {
+				this.ejectShow = true
+			},
+			// 鍙栨秷閰嶇疆
+			ejectClose() {
+				this.ejectShow = false
+			},
+			// 纭閰嶇疆
+			ejectConfirm() {
+				uni.setStorageSync('BaseIp', this.baseIP);
+				uni.setStorageSync('BaseLedId', this.baseLedId);
+				uni.setStorageSync('BasePort',this.basePort);
+				uni.setStorageSync('BaseCrnId',this.baseCrnId);
+				this.getUrl()
+				this.ejectShow = false
 			},
 			// 鏃ュ巻
 			getDate() {
@@ -132,20 +540,101 @@
 				}
 				this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
 			},
+			getDateFormat(value) {
+							var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
+							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.stockCount = res.data.stockCunt
+										that.emptyCount = res.data.emptyCount
+										that.noneCount = res.data.noneCount
+										that.used = res.data.used
+										that.usedPr = res.data.usedPr
+									}
+								}
+							})
+						},
+						getOther() {
+							let that = this
+							uni.request({
+								// http://10.10.0.222:9090/jkwcs/monitor/led?ledId=186
+								url: that.commonUrl + "/monitor/other",
+								data: {
+									crnId: that.baseCrnId, 
+									ledId: 1,
+								},
+								success(result) {
+									console.log(result);
+									var res = result.data
+									if (res.code === 200) {
+										that.xDistance = res.data.xDistance
+										that.yDistance = res.data.yDistance
+										that.xDuration = res.data.xDuration
+										that.yDuration = res.data.yDuration
+									} else if (res.code === 403) {
+										
+									} else {
+										
+									}
+								}
+							})
+						},
 		}
 		
 	}
 </script>
 
 <style>
+	@import url("../../static/css/common.css");
+	/* 鍒� */
+	.flex-col {
+		display: flex;
+		flex-direction: column;
+	}
+	/* 琛� */
+	.flex-row {
+		display: flex;
+		flex-direction: row;
+	}
+	
 	.container{
 		width: 100vw;
 		min-height: 100vh;
-		background-color: blue;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
+		background-color: #00163E;
 		color: #fff;
+		text-align: center;
+		
 	}
 	/* 涓昏鍥� */
 	.home-view {
@@ -166,17 +655,19 @@
 	.head {
 		width: 100vw;
 		height: 11vh;
-		font-size: 4vh;
+		font-size:4vw;
 		font-weight: 700;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		transform: scale(0.7);
 	}
 	.time-tools {
 		position: absolute;
 		right: 2%;
 		top: 2%;
-		font-size: 1.5vh;
+		font-size:1vw;
+		transform: scale(0.8);
 	}
 	.button-left {
 		position: absolute;
@@ -197,14 +688,62 @@
 		width: 13.5%;
 		height: 8.5%;
 	}
-	.charge-info-item {
+	.img-box {
 		width: 100%;
-		height: 100%;
+		/* background-color: #666666; */
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		font-size: 1vw;
 	}
-	.charge-info-item image {
-		height: 100%;
-		width: 100%;
+	.item-img {
+		width: 50%;
+		margin-top: 5%;
+		display: flex;
+		flex-direction: row;
+		/* background-color: #00ffff; */
+		justify-content: flex-start;
+		align-items: flex-start;
 	}
+	.distance {
+		
+	}
+	.item-img image {
+		height: 5vw;
+		width: 5vw;
+	}
+	.progressBar {
+		margin-top: 9%;
+		/* width: 100%; */
+		height: 20%;
+		background-color: #233751;
+		border-radius: 5vw;
+	}
+	.progress {
+		/* width: 90%; */
+		height: 100%;
+		background-color: #FF5722;
+		border-radius: 5vw;
+	}
+	.charts-box {
+	  width: 80%;
+	  height: 24vh;
+	  margin-left: 10%;
+	} 
+	.charts-box-ring {
+		width: 50%;
+		height: 24vh;
+		/* background-color: #00ffff; */
+	}
+	.sub-info {
+		font-size: 1.5vw;
+	}
+	.sub-info image {
+		width: 3.5vw;
+		height: 3.5vw;
+	}
+	
 	
 	
 	
@@ -224,45 +763,144 @@
 		align-items: center;
 		justify-content: center;
 	}
-	.mian-item:last-child {
-		align-items: flex-start;
-	}
 	.mian-item-box {
 		width: 98%;
 		height: 98%;
 	}
-	.content-item {
+	.box-item {
+		width: 100%;
+		margin-top: 4%;
 		display: flex;
 		flex-direction: column;
 		align-items: flex-start;
 		justify-content: flex-start;
-		margin-top: 1vh;
-		margin-left: 4%;
-		margin-right: 4%;
 	}
-	.english {
-		font-size: 0.1vh;
+	.item-title {
+		font-size:1.5vw;
+		font-weight: 700;
 	}
-	.introduce-content {
-		font-size: 0.3vh;
-		padding-top: 2vh;
-		text-indent: 3vh;
-		letter-spacing: 0.3vh;
+	.item-subTitle {
+		font-size:0.5vw;
+		text-indent: 0em;
 	}
-	
-	
-	
+	.item-text {
+		font-size: 1vw;
+		text-indent: 2em;
+		letter-spacing: 1px;
+		line-height: 3vh;
+	}
 	
 	/* 鍏ㄦ澘/鎷f枡淇℃伅 */
-	.info {
+	.info-view {
 		width: 100vw;
 		min-height: 100vh;
-		background-color: #666666;
+		background-image: url(../../static/background.png);
+		background-size: 100vw 100vh;
+	}
+	.info-main {
+		width: 100vw;
+		height: 88vh;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.info-box {
+		width: 98%;
+		height: 98%;
 	}
 	/* 寮傚父淇℃伅 */
-	.error-info {
+	.error-info-view {
 		width: 100vw;
 		min-height: 100vh;
-		background-color: #00ffff;
+		background-image: url(../../static/background.png);
+		background-size: 100vw 100vh;
+	}
+	
+	/* 寮瑰嚭:閰嶇疆鍖哄煙 */
+	.eject-mask {
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		display: flex;
+		align-items: center;
+		justify-content: center;	
+	}
+	.eject{
+		position: relative;
+		width: 40vw;
+		height: 40vh;
+		background-color: #fff;
+		border-radius: 2rem;
+	}
+	.eject-title {
+		width: 100%;
+		height: 10vh;
+		line-height: 10vh;
+		font-size: 2vw;
+		font-weight: 700;
+		color: 	#606266;
+		text-align: center;
+	}
+	.eject-input {
+		
+	}
+	.item {
+		display: flex;
+		align-items: center;
+		margin: 2vh 0 0 0;
+		font-size: 1.5vw;
+		color: #363636;
+	}
+	.desc {
+		display: inline-block;
+		width: 40%;
+		text-align: right;
+		color: #606266;
+		
+	}
+	.input {
+		display: flex;
+		align-items: center;
+		padding-left: 5px;
+		padding-right: 5px;
+		width: 100%;
+		height: 3vh;
+		border: 0.1vh solid #cfd4dc;
+		margin-right: 20%;
+		text-align: start;
+	}
+	.eject-input input {
+		width: 100%;
+		height: 3vh;
+		font-size: 1vw;
+		
+		
+	}
+	.eject-button {
+		display: flex;
+		align-items: center;
+		position: absolute;
+		bottom: 0;
+		height: 6vh;
+		line-height: 6vh;
+		width: 100%;
+		border-top: 1px solid #ccc;
+	}
+	.button-item {
+		width: 50%;
+		height: 100%;
+		font-size: 1.5vw;
+		font-weight: bold;
+		text-align: center;
+		color: #909399;
+	}
+	.button-item:last-child {
+		color: #67C23A;
+		
+		border-left: 1px solid #ccc;
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1