From 24b91cde32383c18533e516d7241e880d993d63c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 17 十一月 2023 09:55:51 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  899 +++++++++++++++++++++--------------------------------------
 1 files changed, 324 insertions(+), 575 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index d855474..50c2982 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -2,273 +2,90 @@
 	<view class="container">
 		<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
 			<view class="home-view">
-				<view class="head">
-					<text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
-				</view>
+				<!-- <view class="head">
+					<text>鑷姩浠撳簱鐩戞帶骞冲彴</text>
+				</view> -->
 				<!-- 鏃ュ巻 -->
-				<view class="time-tools">{{calendar}}</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;">m</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;">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: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">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: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">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>
-							</y-box>
-						</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>
+				<view class="button-right" @click="ejected()"></view> -->
+				<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 class="flex-col" style="width: 100%;font-size: 24rpx;">
+							<view class="flex-row">
+								<view style="flex: 1;" @click="ejected()">{{item.devNo}}</view>
+								<view style="flex: 1;">{{item.locSts$}}</view>
+							</view>
+							<view class="flex-row">
+								<view style="flex: 1;" v-if="item.agvWrkMast">宸ヤ綔鍙凤細{{item.agvWrkMast.wrkNo}}</view>
+								<view style="flex: 1;" v-if="item.agvWrkMast" >{{item.agvWrkMast.wrkSts$}}</view>
+							</view>
+							<view class="flex-row">
+								<view style="flex: 1;" v-if="item.agvWaitPakin">鏂欑鐮�: {{item.agvWaitPakin.suppCode}}</view>
+								<view style="flex: 1;" v-if="item.agvWrkDetl">鏂欑鐮侊細{{item.agvWrkDetl.suppCode}}</view>
+								<view style="flex: 1;" v-if="!item.agvWaitPakin && !item.agvWrkDetl"></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/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
-										</view>
-									</y-box>
-								</view>
+								<view style="flex: 1;" v-if="item.agvWrkMast">{{item.agvWrkMast.ioType$}}</view>
+								<view style="flex: 1;" v-if="!item.agvWrkMast"></view>
+							</view>
+							<view class="flex-row">
+								<view style="flex: 1;" ></view>
+								<view style="flex: 1;" ></view>
 							</view>
 						</view>
+						
+						<view class="flex-col" style="width: 100%;"  v-if="item.agvWaitPakin">
+							<view class="flex-row" style="background-color: #007aff;">
+								<view style="flex: 3;">璁㈠崟鍙�</view>
+								<view style="flex: 3;">鐗╂枡鍙�</view>
+								<view style="flex: 1;">鏁伴噺</view>
+								<view style="flex: 1;">缁撲綑</view>
+							</view>
+							<view class="flex-row" v-for="k in item.agvWaitPakin.orderNo">
+								<view style="flex: 3;">{{k.orderNo}}</view>
+								<view style="flex: 3;">{{item.agvWaitPakin.matnr}}</view>
+								<view style="flex: 1;">{{k.anfme}}</view>
+								<view style="flex: 1;">{{item.agvWaitPakin.volume}}</view>
+							</view>
+						</view>
+						
+						<view class="flex-col" style="width: 100%;"  v-if="item.agvWrkDetl">
+							<view class="flex-row" style="background-color: #007aff;">
+								<view style="flex: 3;">璁㈠崟鍙�</view>
+								<view style="flex: 3;">鐗╂枡鍙�</view>
+								<view style="flex: 1;">鏁伴噺</view>
+								<view style="flex: 1;">缁撲綑</view>
+							</view>
+							<view class="flex-row" v-for="k in item.agvWrkDetl.orderNo">
+								<view style="flex: 3;">{{k.orderNo}}</view>
+								<view style="flex: 3;">{{item.agvWrkDetl.matnr}}</view>
+								<view style="flex: 1;">{{k.anfme}}</view>
+								<view style="flex: 1;">{{item.agvWrkDetl.volume}}</view>
+							</view>
+						</view>
+						<view style="align-self: center;margin-top: auto;width: 100%;display: flex;align-items: center;justify-content: center;" v-if="item.agvWrkMast && item.agvWrkMast.ioType == 103 && item.agvWrkDetl">
+							<view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 24rpx;
+								border-radius: 8rpx;" @click="pickIn(item.devNo)">鎷f枡鍥炲簱</view>
+						</view>
+						
+						<view style="align-self: center;margin-top: auto;width: 100%;display: flex;align-items: center;justify-content: center;" v-if="item.agvWrkMast && item.agvWrkMast.ioType == 107 && item.agvWrkDetl">
+							<view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 24rpx;
+								border-radius: 8rpx;" @click="pickIn(item.devNo)">鐩樼偣鍥炲簱</view>
+						</view>
+						
+						<view style="align-self: center;margin-top: auto;width: 100%;display: flex;align-items: center;justify-content: center;" v-if="item.agvWrkMast && item.agvWrkMast.ioType == 101 && item.agvWrkDetl">
+							<view style="width: 60%;background-color: #007aff;height: 3vh;display: flex;align-items: center;justify-content: center;font-size: 24rpx;
+								border-radius: 8rpx;" @click="containerMoveOut(item.devNo)">瀹瑰櫒绂诲満</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 style="width: 20%;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
-									<view style="width: 30%;">鍟嗗搧缂栧彿</view>
-									<view style="width: 20%;">鍟嗗搧鍚嶇О</view>
-									<view style="width: 20%;">瑙勬牸</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="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.matnr}}</view>
-											<view style="width: 20%;">{{item.maknx}}</view>
-											<view style="width: 20%;">{{item.specs}}</view>
-											<view style="width: 10%;">{{item.count}}</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">
@@ -276,7 +93,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">
@@ -289,25 +106,37 @@
 							<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>
+					
+					
+					<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">
 					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -315,15 +144,29 @@
 				</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 {
+				locs: [
+					// {devNo:'CS-309-005-03@3',locSts$:'O.绌哄簱浣�',
+					// agvWrkMast:{wrkNo:23879,wrkSts$: "205.宸ヤ綔瀹屾垚"},
+					// agvWaitPakin: {}
+					// },
+					],
+				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	,
@@ -362,11 +205,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,
@@ -379,9 +225,22 @@
 					specs: "",
 					count: "",
 					error: "",
-					barcode: ""
+					barcode: "",
+					orderNo: '',
+					batch: '',
+					doneOfTray: '',
+					totalOfTray: '',
+					doneOfUnit: '',
+					totalOfUnit: '',
+					ctnNo: '1'
 				},
-				swiperList: []
+				swiperList: [],
+				timeOut: false,
+				times: 0,
+				currDate: '',
+				textred: 'textred',
+				result: '',
+				color: ''
 			}
 		},
 		onShow() {
@@ -397,234 +256,136 @@
 			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.getDate()
-				this.getInfo()
-				this.getError()
+				// this.getDate2()
+				// this.getInfo()
+				// this.getError()
 				// this.getInfo2()
 				// this.getError2()
-				this.getUrl()
-				this.controller()
-				// 娴嬭瘯鐢�
-				
+				// 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-305',name:'305'},{value: 'CS-306',name:'306'},{value: 'CS-307',name:'307'},{value: 'CS-308',name:'308'},{value: 'CS-309',name:'309'}]
+				}
+			},
+			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 = {stationCode: `${that.current}`}
+				uni.request({
+					url: `${that.commonUrl}/agv/basDevp/visualized/list/auth`,
+					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
+						that.result = res
+						if (res.code === 200 && res.data.body.length>0) {
+							that.locs = [];
+							for (let k of res.data.body) {
+								for (let i of k.loc) {
+									if (i.agvWrkDetl) {
+										let a = i.agvWrkDetl.orderNo
+										if (RegExp(/{/).test(a)) {
+											i.agvWrkDetl.orderNo =	JSON.parse(a)
+										} else {
+											i.agvWrkDetl.orderNo = []
+											// console.log(i.agvWrkDetl);
+											i.agvWrkDetl.orderNo.push({anfme:i.agvWrkDetl.anfme,orderNo:a})
+										}
+									}
+									if (i.agvWaitPakin) {
+										let a = i.agvWaitPakin.orderNo
+										if (RegExp(/{/).test(a)) {
+											i.agvWaitPakin.orderNo =	JSON.parse(a)
+										} else {
+											i.agvWaitPakin.orderNo = []
+											// console.log(i.agvWrkDetl);
+											i.agvWaitPakin.orderNo.push({anfme:i.agvWaitPakin.anfme,orderNo:a})
+										}
+									}
+									if(i.locSts == 'F') {
+										i['color'] = 'pakin'
+									}
+									that.locs.push(i)
+								}
+							}
+						}
+					}
+				})
+			},
+			timeOuts() {
+				console.log(this.times);
+			},
 			getUrl() {
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
 			},
 			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.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 = '妫�鏂欏嚭搴�'
-					}
-					that.infoText.barcode = res.data[0].barcode
-					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.error = errorInfo
-						return
-					}
-					that.infoType = 2
-					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) {
-						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 = '鐩樼偣鍑哄簱'
-							}
-							that.infoText.barcode = res.data[0].barcode
-							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
-						}
-					}
-				})
-				
-			},
-			getError() {
-				let that = this
-				uni.request({
-					url: that.commonUrl + "/monitor/led/error",
-					data: {ledId:that.baseLedId},
-					method:"GET",
-					success(result) {
-						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
-						}
-					}
-				})
-				
-			},
-			// 鎺у埗鍣�
-			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) {
@@ -656,99 +417,31 @@
 				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
 			},
-			// 鏃ュ巻
-			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 = "鏄熸湡鍏�";
+			// 鏃ュ巻 鏈嶅姟鍣�
+			getDate2() {
+				let that = this
+				if(that.commonUrl == 'undefined') {
+					return
 				}
-				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',
+					url: that.commonUrl + "/monitor/date",
+					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,
+						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
 					},
-					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 {
-							
-						}
+					fail(res) {
+						console.log(res);
 					}
+					
 				})
 			},
+			
 		}
 		
 	}
@@ -757,6 +450,52 @@
 <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-b {
+		font-size: 24rpx;
+		background-color: rgba(255, 255, 255, .05);
+		/* background-color: rgba(0, 189, 47, 0.3); */
+		width:19.8vw; 
+		height: 33vh;
+		/* margin-top: 4px; */
+		backdrop-filter: blur(3px);
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		/* align-items: stretch; */
+		/* justify-content: center; */
+	}
+	.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;
@@ -780,7 +519,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 {
@@ -883,17 +622,20 @@
 		width: 3.5vw;
 		height: 3.5vw;
 	}
+	.red{
+		color: red
+	}
 	
 	
 	
 	
 	/* 鍏辩敤 */
 	.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%;
@@ -986,12 +728,15 @@
 		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;
 	}
@@ -1050,5 +795,9 @@
 	.info-box-text-item {
 		height: 20%;font-size: 8vh;
 		justify-content: center;
+		white-space: pre-line;
+	}
+	.textred{
+		color: red;
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1