From ed17381fd47260f30a42e49663924ef6bbfd83c0 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 09:16:26 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 199 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 168 insertions(+), 31 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index f7614f1..00e6de4 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -214,12 +214,16 @@
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
- <view class="swiper-head">
- <view style="flex: 1;">绔欏彿锛歿{infoText.staNo}}</view>
- <view style="flex: 2;">鍟嗗搧缂栧彿</view>
+ <!-- <view class="swiper-head">
+ <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 style="flex: 2;">鍟嗗搧鍚嶇О</view>
- <view style="flex: 1;">瑙勬牸</view>
+ <view style="flex: 5;">瑙勬牸</view>
<view style="flex: 1;">浣滀笟鏁伴噺</view>
<view style="flex: 1;">鍓╀綑鏁伴噺</view>
</view>
@@ -233,11 +237,11 @@
display-multiple-items="15"
circular="true" :autoplay="true" :interval="3000" :duration="1000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i" :style="item.color">
- <view style="flex: 1;">No:{{i+1}}</view>
+ <view style="flex: 2;word-break: break-all;">{{item.orderNo ? item.orderNo : '--'}}</view>
<view style="flex: 2;">{{item.matNo}}</view>
<view style="flex: 2;">{{item.containerCode}}</view>
<view style="flex: 2;">{{item.maknx}}</view>
- <view style="flex: 1;">{{item.specs}}</view>
+ <view style="flex: 5;">{{item.specs}}</view>
<view style="flex: 1;">{{item.count}}</view>
<view style="flex: 1;">{{item.total}}</view>
</swiper-item>
@@ -317,6 +321,15 @@
</view>
</view>
</view>
+ <!-- 灏忚溅寮傚父 -->
+ <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>
+ </view>
+ </uni-transition>
+ </view>
+
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
</view>
@@ -329,9 +342,12 @@
export default {
data() {
return {
+ newModeClass: 'slide-top',
+ errorBoardShow: false,
+ carInfo: [],
series: [],
- homeViewShow: true,
- infoViewShow: false ,
+ homeViewShow: false,
+ infoViewShow: true ,
errorInfoViewShow: false,
homeMode: [],
infoMode: [],
@@ -377,7 +393,8 @@
infoType: 0,
text: '',
infoText: {
- title: '',
+ title: '鑷姩浠撳簱WCS鐩戞帶骞冲彴',
+ title2: '',
staNo: "",
matnr: "",
maknx: "",
@@ -428,15 +445,15 @@
// this.initPieChart()
// this.getOther()
setTimeout(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
setTimeout(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
},3000)
},1000)
},1000)
@@ -447,19 +464,60 @@
this.getUrl()
this.getInfo()
this.getError()
+ this.getCarInfo()
+ // this.getCarInfoTest()
// this.getInfo2()
// this.getError2()
- this.controller()
+ this.controller2()
},1000)
+ // setInterval(()=>{
+ // this.changeErrorShow()
+ // },5000)
+
setInterval(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
},600000)
},
methods: {
+ changeErrorShow() {
+ this.errorBoardShow = !this.errorBoardShow
+ },
+ getCarInfoTest() {
+ let that = this
+ var result = ycqdata.carError
+ var res = result.data
+ that.carInfoModel(res)
+ },
+ getCarInfo() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/monitor/device/error",
+ method:"GET",
+ success(result) {
+ var res = result.data
+ that.carInfoModel(res)
+ }
+ })
+ },
+ carInfoModel(res) {
+ let infoList = []
+
+ if (res.code == 200 && res.data != '') {
+ let str = ''
+ for (let k of res.data) {
+ str = `${k.deviceNo}鍙�${k.device}-${k.errorMsg}`
+ infoList.push(str)
+ }
+ this.carInfo = infoList
+ this.errorBoardShow = true
+ } else {
+ this.errorBoardShow = false
+ }
+ },
timeOuts() {
console.log(this.times);
},
@@ -537,7 +595,8 @@
if (that.infoType == 1) {
return
}
- that.infoType = 0
+ that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
+ that.infoType = 1
}
}
})
@@ -553,30 +612,88 @@
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) {
+ if(res.data[0].matDtos[k].count == 0) {
res.data[0].matDtos[k]['color'] = 'color: #df741c'
}
}
- console.log(that.swiperList);
that.infoText.staNo = res.data[0].staNo
+ 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
+ that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
+ that.infoType = 1
+ }
+ },
+ controller2() {
+ 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;
+
}
},
// 鎺у埗鍣�
@@ -715,7 +832,6 @@
that.currDate = res.year + "/" + res.month + "/" + res.day
},
fail(res) {
- console.log(res);
}
})
@@ -1132,4 +1248,25 @@
.textred{
color: red;
}
+
+ .board {
+ position: absolute;
+ top: 0;
+ right: 0;
+ /* background-color: #aa00ff; */
+ /* height: 13vh; */
+ width: 100%;
+ /* box-shadow: rgba(0,0,0,.35) 0px 5px 15px; */
+ }
+ .error-board {
+ margin: .2rem;
+ height: 11vh;
+ background-color: #F56C6C;
+ box-shadow: rgba(0,0,0,.35) 0px 5px 15px;
+ border-radius: .2rem;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ font-size: 2rem;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1