From 162cd70e899ae27e8e1b344fefc3e5c326c19a5b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 27 十一月 2024 13:09:47 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 284 ++++++++++++++++++++++++++++----------------------------
1 files changed, 143 insertions(+), 141 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 07787b7..5451fb0 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -3,7 +3,7 @@
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
<view class="head">
- <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+ <text>涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -15,52 +15,86 @@
<view class="mian-item-box">
<y-box>
<view class="box-item">
- <text class="item-title">绌挎杞﹁繍琛屾暟鎹�</text>
- <text class="item-subTitle">Shuttle operation data</text>
- <view style="width: 100%;height: 28vh;">
- <qiun-data-charts type="column" :chartData="chartsDataLine2" :opts="opts1" />
- </view>
+ <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">Hoist operating data</text>
+ <text class="item-title">浠撳簱鏁版嵁</text>
+ <text class="item-subTitle">warehouse data</text>
<view class="img-box">
- <view style="width: 100%;height: 25vh;">
- <qiun-data-charts type="column" :chartData="chartsDataPie3" :opts="opts" />
+
+ <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;">
+ <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;">
+ <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-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
<!-- 杩涘害鏉� -->
- <view class="flex-row" style="width: 100%;position: relative;">
+ <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 style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
</view>
</view>
</view>
@@ -76,16 +110,14 @@
<view class="box-item">
<view class="flex-row" style="width: 100%;">
<!-- 宸︿晶 -->
- <view class="flex-col"
- style="align-items: flex-start;justify-content: flex-start;">
+ <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;">
+ <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>
@@ -93,34 +125,31 @@
</view>
</view>
<view class="charts-box">
- <qiun-data-charts type="line" :chartData="chartsDataLine1"
- :opts="opts3" />
+ <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;">
+ <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>
+ <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>
@@ -128,47 +157,36 @@
<view class="flex-row" style="width: 100%;">
<!-- 宸� -->
<view class="charts-box-ring">
- <qiun-data-charts type="pie" :opts="opts4"
- :chartData="chartsDataPie2" />
+ <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 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 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 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鐩戞帶骞冲彴
+ <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
+ 涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
</view>
</y-box>
</view>
@@ -176,7 +194,7 @@
</view>
</view>
</view>
-
+
</view>
</uni-transition>
<!-- 鍏ㄦ澘/鎷ｆ枡淇℃伅 -->
@@ -191,8 +209,8 @@
<view class="button-right" @click="ejected()"></view>
<!-- 涓讳綋 -->
<view class="info-main">
- <view class="info-box">
- <y-box>
+ <view class="info-box" style="display: flex;overflow: hidden;">
+ <y-box v-for="info in infoText">
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
@@ -200,12 +218,10 @@
<view style="flex: 1;">浣滀笟鏁伴噺锛歿{infoText.barcode}}</view>
<view style="flex: 1;">鍓╀綑鏁伴噺</view>
</view> -->
- <view class="swiper-head" v-show="swiperList.length > 0">
- <view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
- <view style="flex: 2;">{{infoText.title2}} <br />鍟嗗搧缂栧彿</view>
- <view style="flex: 2;">绠辩爜</view>
+ <view class="swiper-head">
+ <view style="flex: 2;">鎵樼洏鐮侊細{{info.barcode}} <br /> 鐗╂枡鍙�</view>
+ <view style="flex: 2;">{{info.staNo}}-绔欑偣 <br />绫诲埆</view>
<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
- <view style="flex: 5;">瑙勬牸</view>
<view style="flex: 1;">浣滀笟鏁伴噺</view>
<view style="flex: 1;">鍓╀綑鏁伴噺</view>
</view>
@@ -215,17 +231,15 @@
circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
- <swiper class="swiper-body-main" vertical="true" display-multiple-items="15"
+ <swiper class="swiper-body-main" vertical="true" display-multiple-items="5"
circular="true" :autoplay="true" :interval="3000" :duration="1000">
- <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i"
+ <swiper-item class="swiper-item" v-for="(item,i) in info.matDtos" :key="i"
:style="item.color">
<view style="flex: 2;word-break: break-all;">
- {{item.orderNo ? item.orderNo : '--'}}
+ {{item.matnr ? item.matnr : '--'}}
</view>
- <view style="flex: 2;">{{item.matNo}}</view>
- <view style="flex: 2;">{{item.containerCode}}</view>
+ <view style="flex: 2;">{{item.name}}</view>
<view style="flex: 2;">{{item.maknx}}</view>
- <view style="flex: 5;">{{item.specs}}</view>
<view style="flex: 1;">{{item.count}}</view>
<view style="flex: 1;">{{item.total}}</view>
</swiper-item>
@@ -309,7 +323,7 @@
<view class="board">
<uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
<view class="error-board">
- <text v-for="item in carInfo">{{item}}</text>
+ <text>{{infoText.error}}</text>
</view>
</uni-transition>
</view>
@@ -317,6 +331,13 @@
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
</view>
+
+ <!-- 鐗堟湰鍙� -->
+ <!-- #ifdef APP-PLUS -->
+ <view class="version">
+ 褰撳墠鐗堟湰:{{version}}
+ </view>
+ <!-- #endif -->
</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}]} -->
@@ -326,6 +347,7 @@
export default {
data() {
return {
+ version: '1231313',
newModeClass: 'slide-top',
errorBoardShow: false,
carInfo: [],
@@ -386,7 +408,7 @@
error: null,
infoType: 0,
text: '',
- infoText: {
+ infoText: [{
title: '鑷姩浠撳簱WCS鐩戞帶骞冲彴',
title2: '',
staNo: "",
@@ -403,7 +425,7 @@
doneOfUnit: '',
totalOfUnit: '',
ctnNo: '1'
- },
+ }],
swiperList: [],
timeOut: false,
times: 0,
@@ -492,9 +514,9 @@
},
onShow() {
// 闅愯棌鏃堕棿,鐢甸噺,淇″彿绛�
- // #ifdef APP-PLUS
- plus.navigator.setFullscreen(true)
- // #endif
+ // // #ifdef APP-PLUS
+ // plus.navigator.setFullscreen(true)
+ // // #endif
},
mounted() {
let that = this
@@ -510,23 +532,21 @@
that.baseCrnId = BaseCrnId
-
+ // this.getVersion()
this.getDate2()
setTimeout(() => {
+ this.getShuttle()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
setTimeout(() => {
- this.getShuttleTest()
+ this.getShuttle()
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
- setTimeout(() => {
- this.getShuttleTest()
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- }, 3000)
- }, 1000)
+ }, 2000)
}, 1000)
},
onLoad() {
@@ -536,7 +556,7 @@
this.getUrl()
this.getInfo()
this.getError()
- this.getCarInfo()
+ // this.getCarInfo()
// this.getCarInfoTest()
// this.getInfo2()
// this.getError2()
@@ -547,14 +567,27 @@
// this.changeErrorShow()
// },5000)
setInterval(() => {
- this.getShuttleTest()
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
}, 600000)
+
+ // // #ifdef APP-PLUS
+ // setTimeout(()=>{
+ // plus.runtime.restart()
+ // },28800000)
+ // // #endif
+
+
},
methods: {
+ getVersion() {
+ let that = this
+ plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+ that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
+ })
+ },
getShuttleTest() {
let res = ycqdata.infoData2.data
this.shuttleInfoModel(res)
@@ -670,22 +703,12 @@
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
+ if (res.code == 200 && res.data != '') {
+ that.infoText.title = "鍏朵粬淇℃伅"
+ that.infoText.error = res.data
+ this.errorBoardShow = true
} else {
- if (that.infoType == 1) {
- return
- }
- that.infoType = 0
+ this.errorBoardShow = false
}
},
getInfo() {
@@ -713,25 +736,12 @@
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
+ if (res.code == 200 && res.data != '') {
that.infoText.title = "鍏朵粬淇℃伅"
- // that.infoText.title = "寮傚父"
- that.infoText.error = errorInfo
+ that.infoText.error = res.data
+ that.errorBoardShow = true
} else {
- if (that.infoType == 1) {
- return
- }
- that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
- that.infoType = 0
+ that.errorBoardShow = false
}
}
})
@@ -745,26 +755,9 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- that.infoText.title2 = '鍏ㄦ澘鍑哄簱'
- } else if (res.data[0].ioType === 103) {
- that.infoText.title = '鎷ｆ枡鍑哄簱'
- that.infoText.title2 = '鎷ｆ枡鍑哄簱'
- } else if (res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- that.infoText.title2 = '鐩樼偣鍑哄簱'
- }
- res.data[0].matDtos
- for (let k in res.data[0].matDtos) {
-
- if (res.data[0].matDtos[k].count == 0) {
- res.data[0].matDtos[k]['color'] = 'color: #df741c'
- }
- }
- that.infoText.staNo = res.data[0].staNo
- that.infoText.barcode = res.data[0].barcode
- that.swiperList = res.data[0].matDtos
+ that.infoText = res.data
+ that.infoText.title = '绔欑偣鍑哄簱'
+
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -1099,7 +1092,15 @@
<style>
/* @import url("../../static/css/common.css"); */
@import url("home.css");
-
+ /* 鐗堟湰鍙� */
+ .version {
+ min-width: 100rpx;
+ position: fixed;
+ right: 20rpx;
+ bottom: 10rpx;
+ font-size: .1rem;
+ color: #909399;
+ }
/* 鍒� */
.flex-col {
display: flex;
@@ -1464,7 +1465,8 @@
.error-board {
margin: .2rem;
- height: 11vh;
+ padding: .2rem;
+ /* height: 11vh; */
background-color: #F56C6C;
box-shadow: rgba(0, 0, 0, .35) 0px 5px 15px;
border-radius: .2rem;
--
Gitblit v1.9.1