From d51f51b5816158c35de6f3d3c1524ebdc16c7a5f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 22 二月 2024 09:59:16 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  264 +++++-----------------------------------------------
 1 files changed, 25 insertions(+), 239 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index ac80de9..6866376 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,210 +1,10 @@
 <template>
     <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="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>
-                                
-                                
-                                <!-- 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>
-                        </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>
+                    <text>鍏ュ簱灞�</text>
                 </view>
                 <!-- 鏃ュ巻 -->
                 <view class="time-tools">{{calendar}}</view>
@@ -218,11 +18,13 @@
                             <view class="text-content">
                                 <!-- head -->
                                 <view class="swiper-head">
-                                    <view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
-                                    <view style="width: 30%;">鍟嗗搧缂栧彿</view>
-                                    <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
-                                    <view style="width: 20%;">瑙勬牸</view>
-                                    <view style="width: 10%;">鏁伴噺</view>
+                                    <view style="width: 10%;">搴忓彿</view>
+                                    <view style="width: 15%;">鍝佺暘</view>
+                                    <view style="width: 10%;">寰呰ˉ璐ф暟閲�</view>
+                                    <view style="width: 15%;">琛ヨ揣鐘舵��</view>
+                                    <view style="width: 10%;">宸茶ˉ璐ф暟閲�</view>
+									<view style="width: 20%;">宸ュ崟鐢熸垚鏃堕棿</view>
+									<view style="width: 20%;">琛ヨ揣鎴鏃堕棿</view>
                                 </view>
                                 <!-- body -->
                                 <view class="swiper-body">
@@ -234,11 +36,13 @@
                                     display-multiple-items="8"
                                     circular="true" :autoplay="true" :interval="3000" :duration="1000">
                                         <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-                                            <view style="width: 20%;">No:{{i+1}}</view>
-                                            <view style="width: 30%;">{{item.matNo}}</view>
-                                            <view style="width: 20%;">{{item.maknx}}</view>
-                                            <view style="width: 20%;">{{item.specs}}</view>
-                                            <view style="width: 10%;">{{item.count}}</view>
+                                            <view style="width: 10%;">No:{{i+1}}</view>
+                                            <view style="width: 15%;">{{item.matnr}}</view>
+                                            <view style="width: 10%;">{{item.itnum1}}</view>
+                                            <view style="width: 15%;">{{item.itnum2}}</view>
+                                            <view style="width: 10%;">{{item.itnum3}}</view>
+											<view style="width: 20%;">{{item.itnum4}}</view>
+											<view style="width: 20%;">{{item.itnum5}}</view>
                                         </swiper-item>
                                     </swiper>
                                 </view>
@@ -326,8 +130,8 @@
         data() {
             return {
                 series: [],
-                homeViewShow: true,
-                infoViewShow: false    ,
+                homeViewShow: false,
+                infoViewShow: true    ,
                 errorInfoViewShow: false,
                 homeMode: [],
                 infoMode: [],
@@ -403,35 +207,17 @@
             that.basePort = BasePort
             that.baseCrnId = BaseCrnId
             this.getUrl()
-			setTimeout(()=>{
-				this.getServerData()
-				this.initlineChart()
-				this.initPieChart()
-				this.getOther()
-				setTimeout(()=>{
-					this.getServerData()
-					this.initlineChart()
-					this.initPieChart()
-					this.getOther()
-					setTimeout(()=>{
-						this.getServerData()
-						this.initlineChart()
-						this.initPieChart()
-						this.getOther()
-					},500)
-				},500)
-			},500)
         },
         onLoad() {
 			setInterval(()=>{
-				this.getServerData()
-				this.getDate2()
-				this.getUrl()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
-				this.controller()
+				// this.getServerData()
+				// this.getDate2()
+				// this.getUrl()
+				// this.getInfo()
+				// this.getError()
+				this.getInfo2()
+				this.getError2()
+				// this.controller()
 			},1000)
 			
 			// setInterval(()=>{

--
Gitblit v1.9.1