From daf721176b66edb6344bb763275acb5fea94c56d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 25 六月 2025 10:54:02 +0800
Subject: [PATCH] 区分电视机区域
---
Monitor-APP/pages/home/home.vue | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a181dbf..90fda6b 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -138,10 +138,7 @@
<view style="margin-left: auto;">
<!-- 鐧惧垎姣� -->
<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>
+ style="align-items: flex-end;justify-content: flex-end;">sssss
</view>
</view>
</view>
@@ -218,12 +215,12 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%" class="flex-row">
+ <!-- <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>
</view>
</view>
@@ -253,13 +250,13 @@
<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: 3;">鍟嗗搧缂栧彿</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 style="flex: 2;">瑙勬牸</view>
+ <view style="flex: 2;">宸ュ簭</view>
+ <view style="flex: 2;">鏁伴噺</view>
+
</view>
<!-- body -->
<view class="swiper-body">
@@ -271,15 +268,12 @@
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;word-break: break-all;">
- {{item.orderNo ? item.orderNo : '--'}}
- </view>
- <view style="flex: 2;">{{item.matnr}}</view>
+ <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.model}}</view>
- <view style="flex: 5;">{{item.specs}}</view>
- <view style="flex: 1;">{{item.count}}</view>
- <view style="flex: 1;">{{item.total}}</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>
@@ -427,6 +421,7 @@
infoType: 0,
text: '',
infoText: {
+ workNo: '',
title: '',
staNo: "",
matnr: "",
@@ -516,17 +511,6 @@
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 = []
@@ -663,6 +647,7 @@
}
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
@@ -893,6 +878,10 @@
}
uni.request({
url: that.commonUrl + "/monitor/loc/rep",
+ data: {
+ crnId: that.baseCrnId,
+ ledId: that.baseLedId,
+ },
method: 'GET',
success(result) {
var res = result.data
--
Gitblit v1.9.1