From b0ea24bd2656abdab213afbdc895268bcc3679da Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 03 一月 2026 13:59:13 +0800
Subject: [PATCH] 完善视频显示
---
Monitor-APP/pages/home/home.vue | 153 ++++++++++++++++++++++++++------------------------
1 files changed, 80 insertions(+), 73 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 84f070f..2cf9f04 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,16 +217,13 @@
</y-box>
</view>
- <view style="height: 2%;"></view>
- <view style="height: 18%">
-
-
+ <!-- <view style="height: 2%;"></view>
+ <view style="height: 18%" class="flex-row">
<image style="height: 100%;"
src="../../static/barcode.png" mode="aspectFit"></image>
- <image style="float:right; 100%;margin-top: -5%;margin-right: 5%;"
+ <image style="height: 100%;"
src="../../static/zy_logo.png" mode="aspectFit"></image>
-
- </view>
+ </view> -->
</view>
</view>
</view>
@@ -235,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 ? 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="5"
+ 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;">{{item.barcode}}</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">
@@ -360,7 +355,7 @@
</view>
</view>
<!-- 灏忚溅寮傚父 -->
- <view class="board">
+ <!-- <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>
@@ -369,7 +364,7 @@
</view>
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
- </view>
+ </view> -->
</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}]} -->
@@ -429,6 +424,7 @@
infoType: 0,
text: '',
infoText: {
+ workNo: '',
title: '',
staNo: "",
matnr: "",
@@ -501,8 +497,8 @@
this.getError()
// this.getInfo2()
// this.getError2()
- this.controller()
- this.getCarInfo()
+ // this.controller()
+ // this.getCarInfo()
}, 1000)
setInterval(() => {
@@ -620,17 +616,20 @@
that.infoText.title = "鍏朵粬淇℃伅"
// that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
+ that.controller()
return
}
that.infoType = 2
that.infoText.title = "鍏朵粬淇℃伅"
// that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
+ that.controller()
} else {
if (that.infoType == 1) {
return
}
that.infoType = 0
+ that.controller()
}
}
})
@@ -644,10 +643,8 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if (res.data[0].ioType === 103) {
- that.infoText.title = '鎷ｆ枡鍑哄簱'
+ if (res.data[0].ioType === 101||res.data[0].ioType === 103) {
+ that.infoText.title = '鍑哄簱'
} else if (res.data[0].ioType === 107) {
that.infoText.title = '鐩樼偣鍑哄簱'
} else if (res.data[0].ioType === 1) {
@@ -665,7 +662,16 @@
}
that.infoText.staNo = res.data[0].staNo
- that.swiperList = res.data[0].matDtos
+ that.infoText.workNo = res.data[0].workNo
+ let list = []
+ for (let i = 0; i < res.data.length; i++) {
+ let mats = res.data[i].matDtos || []
+ for (let j = 0; j < mats.length; j++) {
+ list.push(mats[j])
+ }
+ }
+ that.swiperList = list
+ that.controller()
// 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
@@ -675,6 +681,7 @@
return;
}
that.infoType = 0
+ that.controller()
}
},
// 鎺у埗鍣�
@@ -1317,4 +1324,4 @@
justify-content: space-around;
font-size: 2rem;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1