From 4309bbe6a29dd3c87bb29ce6ed2edf52c2278f58 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 12 十二月 2023 15:18:21 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 158 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 22 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 92ce788..76bb265 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -214,12 +214,18 @@
<!-- 鏂囨湰瀹瑰櫒 -->
<view class="text-content">
<!-- head -->
+ <!-- <view class="swiper-head">
+ <view style="flex: 1;">浣滀笟鏁伴噺锛歿{infoText.barcode}}</view>
+ <view style="flex: 1;">鍓╀綑鏁伴噺</view>
+ </view> -->
<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="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
+ <view style="flex: 2;">鍟嗗搧缂栧彿</view>
+ <view style="flex: 2;">绠辩爜</view>
+ <view style="flex: 2;">鍟嗗搧鍚嶇О</view>
+ <view style="flex: 5;">瑙勬牸</view>
+ <view style="flex: 1;">浣滀笟鏁伴噺</view>
+ <view style="flex: 1;">鍓╀綑鏁伴噺</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -228,14 +234,16 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="8"
+ 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">
- <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>
+ <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i" :style="item.color">
+ <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: 5;">{{item.specs}}</view>
+ <view style="flex: 1;">{{item.count}}</view>
+ <view style="flex: 1;">{{item.total}}</view>
</swiper-item>
</swiper>
</view>
@@ -313,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>
@@ -325,6 +342,9 @@
export default {
data() {
return {
+ newModeClass: 'slide-top',
+ errorBoardShow: false,
+ carInfo: [],
series: [],
homeViewShow: true,
infoViewShow: false ,
@@ -414,24 +434,89 @@
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
- // this.getUrl()
+
+
+
+ this.getDate2()
+ 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()
+ },3000)
+ },1000)
+ },1000)
},
onLoad() {
+ setInterval(()=>{
+ this.getDate2()
+ this.getUrl()
+ this.getInfo()
+ this.getError()
+ this.getCarInfo()
+ // this.getCarInfoTest()
+ // this.getInfo2()
+ // this.getError2()
+ this.controller()
+ },1000)
+
+ // setInterval(()=>{
+ // this.changeErrorShow()
+ // },5000)
+
setInterval(()=>{
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
- this.getDate2()
- // this.getInfo()
- // this.getError()
- this.getInfo2()
- this.getError2()
- this.getUrl()
- this.controller()
- },1000)
+ },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);
},
@@ -530,7 +615,15 @@
} else if(res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
}
+ 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.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -673,12 +766,12 @@
url: that.commonUrl + "/monitor/date",
method:"GET",
success(result) {
+ // console.log(result);
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
},
fail(res) {
- console.log(res);
}
})
@@ -1095,4 +1188,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