From 4041049945a930e3fe4adc54f1d8e12cd70be384 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 09 七月 2025 08:10:29 +0800
Subject: [PATCH] 删除不需要的部分
---
Monitor-APP/pages/home/home.vue | 154 ++++++++++++++++++++++-----------------------------
1 files changed, 66 insertions(+), 88 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index ffc8db9..7948851 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,16 +215,12 @@
</y-box>
</view>
<view style="height: 2%;"></view>
- <view style="height: 18%">
- <view style="font-size: 4vh">
- 鑷姩浠撳簱WCS鐩戞帶骞冲彴
- </view>
- <view style="height: 65%;float: right;">
- <image style="height: 100%;margin-top: -18%;margin-left: 25%;"
+ <!-- <view style="height: 18%" class="flex-row">
+ <image style="height: 100%;"
src="../../static/barcode.png" mode="aspectFit"></image>
- </view>
-
- </view>
+ <image style="height: 100%;"
+ src="../../static/zy_logo.png" mode="aspectFit"></image>
+ </view> -->
</view>
</view>
</view>
@@ -236,62 +229,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="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">
@@ -360,14 +351,6 @@
</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>
@@ -430,6 +413,7 @@
infoType: 0,
text: '',
infoText: {
+ workNo: '',
title: '',
staNo: "",
matnr: "",
@@ -519,17 +503,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 = []
@@ -666,6 +639,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
@@ -896,6 +870,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