From 8dbcf49091f41d784b777a932910552e5ff84a93 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 07 二月 2024 18:13:16 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  890 +++++++++++++++++-----------------------------------------
 1 files changed, 268 insertions(+), 622 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 7d387f6..01dc996 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -2,290 +2,50 @@
 	<view class="container">
 		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
-				<view class="head">
-					<text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+				<view v-if="locs.length==0"><button size="mini" @click="ejected()" >閰嶇疆</button></view>
+				<!-- <view class="main" v-if="locs" >
+					<view class="main-b" v-for="item in locs" :class="item.color">
+						<view style="background-color: aquamarine;height: 100%;border: 1px solid #999;">
+							<image style="background-color: #FFF;margin: 16rpx;" src="../../static/moren.png" mode="heightFix"></image>
+						</view>
+					</view>
+				</view> -->
+				<view style="font-size: 32px;">
+					AGV 鏂欑
 				</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-subTitle">Automatic Storageand Retrieval System</text>
-									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
-								</view>
-								<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 class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<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>
-										</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: 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>
-										</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: 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>
-										</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: 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>
-										</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>
-							</y-box>
+				<!-- <view>
+					<view><text>宸ヤ綔鍙凤細</text><text>{{locs[0].wrkNo ? locs[0].wrkNo : '--'}}</text></view>
+				</view> -->
+				<view class="linke" v-if="locs" >
+					<view class="linke-item" v-for="item in locs" :class="item.color">
+						<view style="background-color: aquamarine;height: 100%;border: 1px solid #999;">
+							<image style="background-color: #FFF;margin: 16rpx;" src="../../static/moren.png" mode="heightFix"></image>
 						</view>
-					</view>
-					<view class="mian-item">
-						<view class="mian-item-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;">{{baseInfo.stockCount}}</view>
-													</view>
-													<view class="flex-row sub-info" style="margin-top: 2vh;">
-														<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/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>
-										</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;">
-											<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
-											<!-- 鑷姩浠撳簱WCS鐩戞帶骞冲彴 -->
-											<image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image>
-										</view>
-									</y-box>
-								</view>
-							</view>
+						<view style="display: flex;flex-direction: column;font-size: 10px;text-indent: 1em;text-align: start;" v-if="item.wrkNo">
+							<view><text>璁㈠崟鍙凤細</text><text>{{item.orderNo ? item.orderNo : '--'}}</text></view>
+							<view><text>宸ヤ綔鍙凤細</text><text>{{item.wrkNo ? item.wrkNo : '--'}}</text></view>
+							<view><text>绠辩爜锛�</text><text>{{item.suppCode ? item.suppCode : '--'}}</text></view>
+							<view><text>鐗╂枡鍚嶇О锛�</text><text>{{item.maktx ? item.maktx : '--'}}</text></view>
+							<view><text>鐗╂枡鍙凤細</text><text>{{item.matnr ? item.matnr : '--'}}</text></view>
+							<view><text>瑙勬牸锛�</text><text>{{item.specs ? item.specs : '--'}}</text></view>
+							<view><text>鏁伴噺锛�</text><text>{{item.anfme ? item.anfme : '--'}}</text></view>
+							<view><text>缁撲綑锛�</text><text>{{item.volume ? item.volume : '--'}}</text></view>
 						</view>
-					</view>
+						<view style="display: flex;flex-direction: column;font-size: 10px;text-indent: 1em;text-align: start;" v-if="!item.wrkNo">
+							<view><text>璁㈠崟鍙凤細</text><text>{{item.orderNo ? item.orderNo : '--'}}</text></view>
+							<view><text>绠辩爜锛�</text><text>{{item.suppCode ? item.suppCode : '--'}}</text></view>
+							<view><text>鐗╂枡鍚嶇О锛�</text><text>{{item.maktx ? item.maktx : '--'}}</text></view>
+							<view><text>鐗╂枡鍙凤細</text><text>{{item.matnr ? item.matnr : '--'}}</text></view>
+							<view><text>瑙勬牸锛�</text><text>{{item.specs ? item.specs : '--'}}</text></view>
+							<view><text>鏁伴噺锛�</text><text>{{item.anfme ? item.anfme : '--'}}</text></view>
+							<view><text>缁撲綑锛�</text><text>{{item.volume ? item.volume : '--'}}</text></view>
+						</view>
+ 					</view>
 				</view>
 				
 			</view>
 		</uni-transition>
 		<!-- 鍏ㄦ澘/鎷f枡淇℃伅 -->
-		<uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
-			<view class="home-view">
-				<view class="head">
-					<text>{{infoText.title}}</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>
-							<!-- 鏂囨湰瀹瑰櫒 -->
-							<view class="text-content">
-								<!-- head -->
-								<view class="swiper-head">
-									<view>宸ヤ綔鍙�: {{infoText.workNo}}</view>
-									<view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
-									<view>鐩爣绔�: {{infoText.staNo}}</view>
-									<view v-show="infoText.ctnNo" style="color: red">閿佺爜鐗╂枡</view>
-									<!-- <view style="width: 10%;">鏁伴噺</view> -->
-								</view>
-								<!-- body -->
-								<view class="swiper-body" :class="textred" >
-									<!-- swiper 涓�浜涜鏄�
-									circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
-									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
-									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
-									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="2"
-									circular="true" :autoplay="true" :interval="3000" :duration="2000">
-										<swiper-item class="swiper-item">
-											<view>
-												<view>鏂欏彿锛歿{infoText.matnr}}</view>
-												<view class="swiper-margin">瑙勬牸锛歿{infoText.specs}}</view>
-												<view v-show="!infoText.orderNo" class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
-											</view>
-											<view>
-												<view>鎵规锛歿{infoText.batch}}</view>
-												<view class="swiper-margin">鍑哄簱鏁伴噺锛歿{infoText.count}}</view>
-											</view>
-										</swiper-item>
-										<!-- <swiper-item class="swiper-item" v-show="!infoText.orderNo">
-											
-										</swiper-item> -->
-										<swiper-item class="swiper-item" v-show="infoText.orderNo">
-											<view>
-												<view>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
-												<view class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
-											</view>
-											<view>
-												<view>宸插嚭绠辨暟锛歿{infoText.doneOfTray}}</view>
-												<view class="swiper-margin">鎬荤鏁帮細{{infoText.totalOfTray}}</view>
-											</view>
-										</swiper-item>
-									</swiper>
-								</view>
-							</view>
-						</y-box>
-					</view>
-				</view>
-			</view>
-		</uni-transition>
-		<!-- 寮傚父淇℃伅 -->
-		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
-			<view class="error-info-view">
-				<view class="head">
-					<text>{{infoText.title}}</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>
-							<view class="info-box-text">
-								<view class="flex-col info-box-text-item">{{infoText.error}}</view>
-							</view>
-						</y-box>
-					</view>
-				</view>
-			</view>
-		</uni-transition>
 		
 		<!-- 鑷畾涔夊脊鍑哄眰 -->
 		<view class="eject-mask" v-show="ejectShow">
@@ -306,24 +66,36 @@
 							<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 class="item">
 						<view class="desc">Url锛�</view>
 						<view class="input">
 							<input type="text" v-model="baseUrl">
 						</view>
 					</view>
+					
+					
+					<view class="item">
+						<view class="desc">妤煎眰锛�</view>
+						<radio-group @change="floor">
+							<label>
+								<radio :checked="ck1" style="margin-left: 50rpx;"/><text>1妤�</text>
+							</label>
+							<label>
+								<radio :checked="ck2" style="margin-left: 50rpx;"/><text>3妤�</text>
+							</label>
+						</radio-group>
+					</view>
+					
+					<view class="item">
+						<view class="desc">缂撳瓨璐ф灦锛�</view>
+						<radio-group @change="radioChange" >
+							<label v-for="(item, index) in rows" :key="item.value">
+									<radio style="margin-left: 50rpx;" :value="item.value" :checked="index === current" />{{item.name}}
+							</label>
+						</radio-group>
+					</view>
+					
 				</scroll-view>
 				<!-- button -->
 				<view class="eject-button">
@@ -344,6 +116,52 @@
 	export default {
 		data() {
 			return {
+				locs: [
+					// {devNo:'CS-309-005-03@3',locSts$:'O.绌哄簱浣�',
+					// agvWrkMast:{},
+					// agvWaitPakin: [
+					// 		{matnr:"123123",maktx:"hhahah"},
+					// 		{}
+					// 	]
+					// },
+					{
+						wrkNo:'',
+						anfme:6.0,
+						matnr:"420201001209204",
+						maktx: '纭呰兌骞茬嚗鍓�10g',
+						suppCode: "cdoedad"
+					},
+					{
+						wrkNo:137207,
+						anfme:6.0,
+						matnr:"420201001209204"
+					},
+					{
+						wrkNo:137207,
+						anfme:6.0,
+						matnr:"420201001209204"
+					},
+					{
+						wrkNo:137207,
+						anfme:6.0,
+						matnr:"420201001209204"
+					},
+					{
+						wrkNo:137207,
+						anfme:6.0,
+						matnr:"420201001209204"
+					},
+					{
+						wrkNo:137207,
+						anfme:6.0,
+						matnr:"420201001209204"
+					},
+					],
+				floors: [{value: 1,name:'1妤�'},{value:2,name:'3妤�'}],
+				rows: [{value: 'cs-101',name:'101'},{value: 'cs-102',name:'102'}],
+				ck1: true,
+				ck2: false,
+				current: 'cs-101',
 				series: [],
 				homeViewShow: true,
 				infoViewShow: false	,
@@ -382,11 +200,14 @@
 				height: '',
 				showCharts: false,
 				ejectShow: false,
-				baseIP: '',
-				basePort: '',
+				baseIP: '10.10.10.40',
+				basePort: '8081',
 				baseLedId: '',
 				baseCrnId: '',
-				baseUrl: '',
+				baseUrl: 'tzskwms',
+				floor1: true,
+				floor2: false,
+				row: '',
 				info: null,
 				error: null,
 				infoType: 0,
@@ -412,7 +233,9 @@
 				timeOut: false,
 				times: 0,
 				currDate: '',
-				textred: 'textred'
+				textred: 'textred',
+				result: '',
+				color: ''
 			}
 		},
 		onShow() {
@@ -428,29 +251,100 @@
 			const BasePort = uni.getStorageSync('BasePort');
 			const BaseCrnId = uni.getStorageSync('BaseCrnId');
 			const PROJ = uni.getStorageSync('UPROJ');
+			const CURRENT = uni.getStorageSync('current');
 			that.baseUrl = PROJ
 			that.baseIP = BaseIP
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
-			// this.getUrl()
+			that.current = CURRENT
+			this.getUrl()
+			this.getVisualized()
+			
 		},
 		onLoad() {
 			setInterval(()=>{
-				this.getServerData()
-				this.initlineChart()
-				this.initPieChart()
-				this.getOther()
-				this.getDate2()
+				// this.getDate2()
 				// this.getInfo()
 				// this.getError()
-				this.getInfo2()
-				this.getError2()
-				this.getUrl()
-				this.controller()
+				// this.getInfo2()
+				// this.getError2()
+				// this.getUrl()
+				// this.controller()
+				this.getVisualized()
 			},1000)
+			setTimeout(()=>{
+				console.log(this.result);
+			},3000)
 		},
 		methods: {
+			// 鎷f枡/鐩樼偣鍏ュ簱
+			pickIn(e) {
+				let _this = this
+				uni.request({
+					url: `${_this.commonUrl}/agv/basDevp/visualized/container/pickIn`,
+					data: {devNo: e},
+					method: 'POST',
+					success(res) {
+					}
+				})
+			},
+			// 瀹瑰櫒绂诲満
+			containerMoveOut(e) {
+				let _this = this
+				let devNo = {devNo:[e]}
+				// console.log(JSON.stringify(devNo));
+				uni.request({
+					url: `${_this.commonUrl}/agv/basDevp/visualized/container/moveOut`,
+					data: JSON.stringify(devNo),
+					method: 'POST',
+					success(res) {
+						
+					}
+				})
+			},
+			floor() {
+				var temp = this.ck1
+				this.ck1 = this.ck2
+				this.ck2 = temp
+				if (this.ck1) {
+					this.rows = [{value: 'cs-101',name:'101'},{value: 'cs-102',name:'102'}]
+				} else {
+					this.rows = [{value: 'CS-313',name:'313'},{value: 'CS-312',name:'312'},{value: 'CS-311',name:'311'},{value: 'CS-310',name:'310'}]
+				}
+			},
+			radioChange(evt) {
+				for (let i = 0; i < this.rows.length; i++) {
+					if (this.rows[i].value === evt.detail.value) {
+						this.current = evt.detail.value;
+						break;
+					}
+				}
+			},
+			getVisualized() {
+				let that = this
+				let param = {devNo: `${that.current}`}
+				uni.request({
+					url: `${that.commonUrl}/rpc/info`,
+					header: {
+						'Access-Control-Allow-Origin': '*',
+						'Access-Control-Allow-Methods': 'GET,POST,OPTIONS',
+						'Access-Control-Allow-Headers': 'X-Request-with,Content-Type',
+						},
+					sslVerify: false,
+					withCredentials: true,
+					method: 'POST',
+					data: JSON.stringify(param),
+					success(res) {
+						res = res.data
+						console.log(res);
+						that.result = res
+						if (res.code === 200 && res.data) {
+							that.locs = res.data
+						}
+					}
+				})
+			},
 			timeOuts() {
 				console.log(this.times);
 			},
@@ -460,231 +354,6 @@
 			getServerData() {
 				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.dataInfo3
-				var	res = result.data
-				that.infoModel(res)
-			},
-			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
-						that.infoModel(res)
-					},
-					fail(err) {
-						that.timeOut = true
-						that.times = that.times+1
-						that.infoType = 0
-					}
-				})
-				
-			},
-			infoModel(res) {
-				let that = this
-				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.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.ctnNo = res.data[0].ctnNo
-					if (res.data[0].ctnNo) {
-						that.infoText.orderNo = ''
-						that.textred = 'textred'
-					} else {
-						that.infoText.orderNo = res.data[0].orderNo
-						that.textred = ''
-					}
-					that.infoText.matnr = res.data[0].matDtos[0].matnr
-					that.infoText.barcode = res.data[0].barcode
-					that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
-					that.infoText.specs = res.data[0].matDtos[0].specs
-					that.infoText.count = res.data[0].matDtos[0].count
-					that.infoText.doneOfTray = res.data[0].doneOfTray
-					that.infoText.totalOfTray = res.data[0].totalOfTray
-					that.infoText.doneOfUnit = res.data[0].doneOfUnit
-					that.infoText.totalOfUnit = res.data[0].totalOfUnit
-				} else {
-					if (that.infoType == 2 || that.infoType == 3) {
-						return;
-					}
-					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() {
-				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) {
@@ -716,12 +385,16 @@
 				uni.setStorageSync('BasePort',this.basePort);
 				uni.setStorageSync('BaseCrnId',this.baseCrnId);
 				uni.setStorageSync('UPROJ',this.baseUrl);
+				uni.setStorageSync('current',this.current);
 				this.getUrl()
 				this.ejectShow = false
 			},
 			// 鏃ュ巻 鏈嶅姟鍣�
 			getDate2() {
 				let that = this
+				if(that.commonUrl == 'undefined') {
+					return
+				}
 				uni.request({
 					url: that.commonUrl + "/monitor/date",
 					method:"GET",
@@ -729,100 +402,14 @@
 						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
+					},
+					fail(res) {
+						console.log(res);
 					}
+					
 				})
 			},
 			
-			// 鏃ュ巻
-			getDate() {
-				var dt = new Date();
-				var year,month,day,hours,minutes,seconds,weeks
-				year = dt.getFullYear();
-				month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
-				day = dt.getDate() < 10 ? '0'+dt.getDate() : dt.getDate();
-				hours = dt.getHours() < 10 ? '0' + dt.getHours() : dt.getHours();
-				minutes = dt.getMinutes() < 10 ? '0' + dt.getMinutes() : dt.getMinutes();
-				seconds = dt.getSeconds() < 10 ? '0' + dt.getSeconds() : dt.getSeconds(); 
-				weeks = dt.getDay(); 
-				switch (weeks) {
-					case 0: weeks = "鏄熸湡鏃�"; break;
-					case 1: weeks = "鏄熸湡涓�"; break;
-					case 2: weeks = "鏄熸湡浜�"; break;
-					case 3: weeks = "鏄熸湡涓�"; break;
-					case 4: weeks = "鏄熸湡鍥�"; break;
-					case 5: weeks = "鏄熸湡浜�"; break;
-					default : weeks = "鏄熸湡鍏�";
-				}
-				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) {
-						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 {
-							
-						}
-					}
-				})
-			},
 		}
 		
 	}
@@ -831,6 +418,65 @@
 <style>
 	/* @import url("../../static/css/common.css"); */
 	@import url("home.css");
+	
+	.main-y {
+		font-size: 22rpx;
+		/* background-color: rgba(255, 255, 255, .05); */
+		background-color: rgba(0, 189, 47, 0.3);
+		width:19vw; 
+		height: 28vh;
+		margin-top: 4px;
+		backdrop-filter: blur(3px);
+		display: flex;
+		flex-direction: column;
+		align-items: stretch;
+		justify-content: center;
+		/* text-align: left; */
+	}
+	.main {
+		height: 100vh;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+		position: relative;
+	}
+	.linke {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.linke-item {
+		width: 50vw;
+		height: 31.5vh;
+		display: flex;
+		background-color: rgba(255, 255, 255, .05);
+		
+	}
+	.main-b {
+		font-size: 24rpx;
+		background-color: rgba(255, 255, 255, .05);
+		/* background-color: rgba(0, 189, 47, 0.3); */
+		width:49.8vw; 
+		height: 33vh;
+		backdrop-filter: blur(3px);
+		display: flex;
+		/* flex-direction: column; */
+	}
+	.pakin {
+		background-color: rgba(0, 189, 47, 0.3);
+	}
+	
+	.y-it {
+		display: flex;
+		/* background-color: #FF5722; */
+	}
+	.y-it-desc {
+		text-align: right;
+		/* background-color: #FF5722; */
+	}
+	.margin {
+		margin-left: 10rpx;
+	}
+	
 	/* 鍒� */
 	.flex-col {
 		display: flex;
@@ -854,7 +500,7 @@
 	.home-view {
 		width: 100vw;
 		min-height: 100vh;
-		background-image: url(../../static/background.png);
+		/* background-image: url(../../static/background.png); */
 		background-size: 100vw 100vh;
 	}
 	.home-right {
@@ -966,11 +612,11 @@
 	
 	/* 鍏辩敤 */
 	.main {
-		width: 100vw;
-		height: 88vh;
-		margin-top: 1vh;
+		height: 100vh;
 		display: flex;
-		
+		flex-wrap: wrap;
+		justify-content: space-around;
+		position: relative;
 	}
 	.mian-item {
 		width: 50%;

--
Gitblit v1.9.1