From 3b5d14759dd495ba0d65c29ea145938f89f8795c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 10 九月 2024 15:05:40 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 204 +++++++++++++++++++++++++++++++-------------------
1 files changed, 125 insertions(+), 79 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 0cc7db0..6fb3b13 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -19,57 +19,7 @@
<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%;">
<!-- 宸︿晶 -->
@@ -82,21 +32,81 @@
<!-- 鐧惧垎姣� -->
<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>
+ <!-- <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 style="width: 100%;height: 100%;height: 3vh;"></view>
+ <view style="width: 100%;display: flex;">
+ <view style="flex: 1;padding: 10px;">
+ <!-- 鏁伴噺鏄剧ず鍖哄煙 -->
+ <view style="width: 100%;display: flex;">
+ <view style="margin-left: 10px;">绔嬪簱</view>
+ <view style="flex: 1;">{{baseInfo.asrsUsed}} / {{baseInfo.asrsTotal}}</view>
+ <view style="margin-right: 10px;">{{baseInfo.asrsUsedPr}}%</view>
+ </view>
+ <view style="height: 10px;width: 100%;"></view>
+ <view style="width: 100%;background-color: #233751;height: 2vh;border-radius: 2vh;">
+ <view class="progress" :style="'width:'+ baseInfo.asrsUsedPr + '%'"></view>
+ </view>
</view>
- <view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
+ <view style="flex: 1;padding: 10px;">
+ <!-- 鏁伴噺鏄剧ず鍖哄煙 -->
+ <view style="width: 100%;display: flex;">
+ <view style="margin-left: 10px;">骞冲簱</view>
+ <view style="flex: 1;">{{baseInfo.wmsUsed}} / {{baseInfo.wmsTotal}}</view>
+ <view style="margin-right: 10px;">{{baseInfo.wmsUsedPr}}%</view>
+ </view>
+ <view style="height: 10px;width: 100%;"></view>
+ <view style="width: 100%;background-color: #233751;height: 2vh;border-radius: 2vh;">
+ <view class="progress" :style="'width:'+ baseInfo.wmsUsedPr + '%'"></view>
+ </view>
+ </view>
</view>
</view>
+
+ <view class="box-item">
+ <text class="item-title">浠婃棩鍏ュ嚭搴撶粺璁�</text>
+ <text class="item-subTitle">TODAY'S INBOUND AND OUTBOUND STATISTICS</text>
+
+ <view style="height: 20px;"></view>
+ <view class="flex-col" style="width: 100%;height: 30vh;align-items: flex-start;font-size: 1vw">
+ <!-- head -->
+ <view class="manu-head">
+ <view style="width: 30%;">鍗曟嵁鍙�</view>
+ <view style="width: 20%;">鍗曟嵁绫诲瀷</view>
+ <view style="width: 30%;">鍑哄簱鏃堕棿</view>
+ <view style="width: 20%;">鍥炲簱鏃堕棿</view>
+ <view style="width: 10%;">鐢ㄦ椂</view>
+ </view>
+ <!-- body -->
+ <view class="manu-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="manu-body-main" vertical="true"
+ display-multiple-items="6"
+ circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ <swiper-item class="manu-item" v-for="(item,i) in swiperList" :key="i">
+ <view style="width: 30%;">{{item.maknx}}</view>
+ <view style="width: 20%;">{{item.owner}}</view>
+ <view style="width: 30%;">{{item.matnr}}</view>
+ <view style="width: 20%;">{{item.specs}}</view>
+ <view style="width: 10%;">{{item.orderNo}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
+ </view>
+ <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;">
+ <view>绱鐢ㄦ椂锛� {{mTime}}</view>
+ </view>
+ </view>
+
</view>
</y-box>
</view>
@@ -136,7 +146,7 @@
<view style="height: 2%;"></view>
- <view style="height: 43%;">
+ <view style="height: 40%;">
<y-box>
<view class="box-item">
<view class="flex-row" style="width: 100%;">
@@ -167,7 +177,7 @@
<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>
+ <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>
@@ -183,10 +193,40 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%;">
+ <view style="height: 21%;">
<y-box>
- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
- 涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
+ <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;">
+ <view class="flex-col" style="width: 100%;height: 30vh;align-items: flex-start;font-size: 1vw">
+ <!-- head -->
+ <view class="manu-head" style="height: 3vh;">
+ <view style="width: 20%;">浠ｇ爜</view>
+ <view style="width: 20%;">鍐呭</view>
+ <view style="width: 20%;">鏁呴殰鏃堕棿</view>
+ <view style="width: 20%;">淇鏃堕棿</view>
+ <view style="width: 20%;">鍋滄満鏃堕棿</view>
+ </view>
+ <!-- body -->
+ <view class="manu-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="manu-body-main" vertical="true"
+ display-multiple-items="3"
+ circular="true" :autoplay="true" :interval="3000" :duration="2000">
+ <swiper-item class="manu-item" v-for="(item,i) in swiperList" :key="i">
+ <view style="width: 20%;">{{item.maknx}}</view>
+ <view style="width: 20%;">{{item.owner}}</view>
+ <view style="width: 20%;">{{item.matnr}}</view>
+ <view style="width: 20%;">{{item.specs}}</view>
+ <view style="width: 20%;">{{item.orderNo}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
+ </view>
+ <view style="height: 20px;width: 100%;display: flex;flex-direction: column;align-items: flex-end;font-size: 1.2 vh;">
+ <view>绱鐢ㄦ椂锛� {{mTime}}</view>
+ </view>
</view>
</y-box>
</view>
@@ -231,15 +271,16 @@
display-multiple-items="3"
circular="true" :autoplay="true" :interval="3000" :duration="2000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
+ <view style="width: 20%;">{{i+1}} / {{swiperList.length}}</view>
<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
+ <view style="width: 30%;">鍚嶇О: {{item.maknx}}</view>
+ <view style="width: 20%;">鎵�灞�: {{item.owner}}</view>
+ <view style="width: 20%;">鍝佸彿: {{item.matnr}}</view>
<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 30%;">澶囨敞: {{item.memo}}</view>
+ <view style="width: 30%;">鍗曟嵁鍙�: {{item.orderNo}}</view>
</swiper-item>
@@ -343,8 +384,12 @@
yDistance: 2,
xDuration: 3,
yDuration: 4,
- usedPr: 50,
- used: 3537,
+ asrsUsedPr: 1,
+ asrsUsed: 3537,
+ asrsTotal: 45666,
+ wmsUsedPr: 15,
+ wmsUsed: 669,
+ wmsTotal: 1520,
stockCount: '',
emptyCount: '',
noneCount: '',
@@ -391,7 +436,8 @@
swiperList: [],
timeOut: false,
times: 0,
- currDate: ''
+ currDate: '',
+ mTime: 2
}
},
onShow() {
@@ -422,12 +468,12 @@
this.getOther()
// this.getDate()
this.getDate2()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.getUrl()
- this.controller()
+ // this.controller()
// 娴嬭瘯鐢�
},1000)
@@ -877,9 +923,9 @@
}
.time-tools {
position: absolute;
- right: 2%;
- top: 2%;
- font-size:1vw;
+ right: 0;
+ top: 1%;
+ font-size:1.5vw;
transform: scale(0.8);
}
.button-left {
@@ -934,7 +980,7 @@
border-radius: 5vw;
}
.progress {
- /* width: 90%; */
+ min-width: 5%;
height: 100%;
background-color: #FF5722;
border-radius: 5vw;
@@ -982,7 +1028,7 @@
}
.box-item {
width: 100%;
- margin-top: 4%;
+ margin-top: 2%;
display: flex;
flex-direction: column;
align-items: flex-start;
--
Gitblit v1.9.1