From e8c5367d345f56997d3092a081690e7c7b3b88c6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 16 四月 2025 14:04:06 +0800
Subject: [PATCH] 新增工序
---
Monitor-APP/pages/home/home.vue | 207 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 8d4873b..a847b57 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,13 +218,11 @@
</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>
- </y-box>
+ <view style="height: 18%" class="flex-row">
+ <image style="height: 100%;"
+ src="../../static/barcode.png" mode="aspectFit"></image>
+ <image style="height: 100%;"
+ src="../../static/zy_logo.png" mode="aspectFit"></image>
</view>
</view>
</view>
@@ -234,62 +232,60 @@
</view>
</uni-transition>
<!-- 鍏ㄦ澘/鎷ｆ枡淇℃伅 -->
- <uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
- <view class="home-view">
- <view class="head">
- <text>{{infoText.title}}</text>
- </view>
- <!-- 鏃ュ巻 -->
- <view class="time-tools">{{calendar}}</view>
- <view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ejected()"></view>
- <!-- 涓讳綋 -->
- <view class="info-main">
- <view class="info-box">
- <y-box>
- <!-- 鏂囨湰瀹瑰櫒 -->
- <view class="text-content" v-for="item in swiperList">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
- <view>鍟嗗搧缂栫爜锛歿{item.matnr}}</view>
- <view>鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鍥惧彿锛歿{item.model}}</view>
- <view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view>
-
-
-
- <!-- 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> -->
- <!-- body -->
- <!-- <view class="swiper-body"> -->
- <!-- swiper 涓�浜涜鏄�
- circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
- vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
- display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
- <!-- <swiper class="swiper-body-main" vertical="true"
- 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>
- </swiper-item>
- </swiper>
- </view> -->
- </view>
- </y-box>
- </view>
- </view>
- </view>
- </uni-transition>
+ <uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
+ <view class="home-view">
+ <view class="head">
+ <text>{{infoText.title}}</text>
+ </view>
+ <!-- 鏃ュ巻 -->
+ <view class="time-tools">{{calendar}}</view>
+ <view class="button-left" @click="ejected()"></view>
+ <view class="button-right" @click="ejected()"></view>
+ <!-- 涓讳綋 -->
+ <view class="info-main">
+ <view class="info-box">
+ <y-box>
+ <!-- 鏂囨湰瀹瑰櫒 -->
+ <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" v-show="swiperList.length > 0">
+ <view style="flex: 2;">浠诲姟鍙�</view>
+ <view style="flex: 3;">鍟嗗搧缂栧彿</view>
+ <view style="flex: 2;">鍟嗗搧鍚嶇О</view>
+ <view style="flex: 2;">瑙勬牸</view>
+ <view style="flex: 2;">宸ュ簭</view>
+ <view style="flex: 2;">鏁伴噺</view>
+
+ </view>
+ <!-- body -->
+ <view class="swiper-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="swiper-body-main" vertical="true" 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: 2;">{{infoText.workNo}}</view>
+ <view style="flex: 3;">{{item.matnr}}</view>
+ <view style="flex: 2;">{{item.maknx}}</view>
+ <view style="flex: 2;">{{item.specs}}</view>
+ <view style="flex: 2;">{{item.sku}}</view>
+ <view style="flex: 2;">{{item.count}}/{{item.total}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
+ </view>
+ </y-box>
+ </view>
+ </view>
+ </view>
+ </uni-transition>
<!-- 寮傚父淇℃伅 -->
<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
<view class="error-info-view">
@@ -358,6 +354,14 @@
</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>
@@ -374,7 +378,9 @@
homeViewShow: true,
infoViewShow: false,
errorInfoViewShow: false,
+ errorBoardShow: false,
homeMode: [],
+ carInfo: [],
infoMode: [],
errorInfoMode: [],
baseInfo: {
@@ -418,6 +424,7 @@
infoType: 0,
text: '',
infoText: {
+ workNo: '',
title: '',
staNo: "",
matnr: "",
@@ -491,6 +498,7 @@
// this.getInfo2()
// this.getError2()
this.controller()
+ this.getCarInfo()
}, 1000)
setInterval(() => {
@@ -501,6 +509,41 @@
}, 1800000)
},
methods: {
+ 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
+ }
+ },
+ changeErrorShow() {
+ this.errorBoardShow = !this.errorBoardShow
+ },
timeOuts() {
console.log(this.times);
},
@@ -600,11 +643,25 @@
if (res.data[0].ioType === 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
} else if (res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
+ that.infoText.title = '鎷ｆ枡鍑哄簱'
} else if (res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if (res.data[0].ioType === 1) {
+ that.infoText.title = '鍏ㄦ澘鍏ュ簱'
+ } else if (res.data[0].ioType === 10) {
+ that.infoText.title = '绌烘澘鍏ュ簱'
+ } else if (res.data[0].ioType === 54) {
+ that.infoText.title = '骞舵澘鍏ュ簱'
+ } else if (res.data[0].ioType === 110) {
+ that.infoText.title = '绌烘澘鍑哄簱'
+ } else if (res.data[0].ioType === 53) {
+ that.infoText.title = '鎷ｆ枡鍐嶅叆搴�'
+ } else if (res.data[0].ioType === 57) {
+ that.infoText.title = '鐩樼偣鍐嶅叆搴�'
}
+
that.infoText.staNo = res.data[0].staNo
+ that.infoText.workNo = res.data[0].workNo
that.swiperList = res.data[0].matDtos
// that.infoText.matnr = res.data[0].matDtos[0].matnr
// that.infoText.specs = res.data[0].matDtos[0].specs
@@ -1235,4 +1292,26 @@
.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