From ac3e1bb671ace5e0495bae218ca8508817e35e5a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 10 三月 2024 22:43:50 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.css | 1 +
Monitor-APP/pages/home/home.vue | 53 +++++++++++++++++++++++++----------------------------
2 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index e484741..5fcb589 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -10,6 +10,7 @@
background-color: #095dbe;
display: flex;
color: #fefefe;
+ font-size: 13px;
/* grid-template-columns: 2fr 3fr 2fr 2fr 1fr; */
align-items: center;
font-weight: bold;
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a479f89..b992a29 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -8,7 +8,7 @@
<view class="logo"></view>
</view>
<view class="head-mid">
- <text style="z-index: 999;">琛ヨ揣鍗曞垪琛�</text>
+ <text style="z-index: 999;">鍑哄簱鍗曞垪琛�</text>
</view>
<view class="head-right">
<view class="time-tools">{{calendar}}</view>
@@ -26,14 +26,14 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view class="item-box1" style="width: 10%;">宸ュ崟缂栧彿</view>
- <view class="item-box1" style="width: 15%;">鍝佺暘</view>
- <view class="item-box1" style="width: 15%;">寰呰ˉ璐ф暟閲�</view>
- <view class="item-box1" style="width: 15%;">宸茶ˉ璐ф暟閲�</view>
- <view class="item-box1" style="width: 15%;">琛ヨ揣鐘舵��</view>
- <view class="item-box1" style="width: 10%;">鍒涘缓鏃堕棿</view>
- <view class="item-box1" style="width: 10%;">棰勮瀹屾垚鏃堕棿</view>
- <view class="item-box1" style="width: 9.5%;">鎿嶄綔</view>
+ <view class="item-box1" style="width: 10%;">鍛煎彨缂栧彿</view>
+ <view class="item-box1" style="width: 15%;">鍛煎彨浜х嚎</view>
+ <view class="item-box1" style="width: 15%;">浜х嚎浠ｇ爜</view>
+ <view class="item-box1" style="width: 15%;">鍛煎彨宸ュ崟</view>
+ <view class="item-box1" style="width: 15%;">浠诲姟鍚嶇О</view>
+ <view class="item-box1" style="width: 10%;">鍑哄簱鍗曠姸鎬�</view>
+ <view class="item-box1" style="width: 10%;">鍛煎彨鏃堕棿</view>
+ <view class="item-box1" style="width: 9.5%;">鏈�鏅氶�佽揪鏃堕棿</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -44,32 +44,30 @@
<swiper class="swiper-body-main" vertical="true"
display-multiple-items="10"
circular="true" :autoplay="false" :interval="3000" :duration="1000" disable-touch='true'>
- <swiper-item :class="item.inspectSts" class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view class="item-box" style="width: 10%;" >{{item.suppCode ? item.suppCode : '--'}}</view>
- <view class="item-box" style="width: 15%;">{{item.maktx}}</view>
- <view class="item-box" style="width: 15%;">{{item.storeReplenishment}}</view>
+ <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
+ <view class="item-box" style="width: 10%;" >{{item.callNo ? item.callNo : '--'}}</view>
+ <view class="item-box" style="width: 15%;">{{item.callLine}}</view>
+ <view class="item-box" style="width: 15%;">{{item.callLineNo}}</view>
<view class="item-box" style="width: 15%;">
<text style="color: #25E51E ;" v-if="item.inspectSts == 'inspectWhite'">{{item.storeAdd}}</text>
- <text v-if="item.inspectSts == 'inspectRed'">{{item.storeAdd}}</text>
+ <text v-if="item.inspectSts == 'inspectRed'">{{item.callOrder}}</text>
</view>
- <view class="item-box" style="width: 15%;">
- <text class="beBatch1" v-if="item.beBatch == 2 ">
- {{item.beBatch$}}
+
+ <view class="item-box" style="width: 15%;">{{item.callName}}</view>
+ <view class="item-box" style="width: 10%;">
+ <text class="beBatch1" v-if="item.callSettle == 2 ">
+ {{item.callSettle$}}
</text>
- <text class="beBatch2" v-if="item.beBatch != 2 ">
- {{item.beBatch$}}
+ <text class="beBatch2" v-if="item.callSettle != 2 ">
+ {{item.callSettle$}}
</text>
<!-- <text class="beBatch3" v-if="item.inspectSts != 'inspectWhite'">
{{item.beBatch$}}
</text> -->
</view>
- <view class="item-box" style="width: 10%;">{{item.appeTime$}}</view>
- <view class="item-box" style="width: 10%;">{{item.appeTime$}}</view>
- <view class="item-box" style="width: 9.5%;">
- <button class="start-btn" size="mini" v-if="item.beBatch == 1" @click="complete(item.matnr)">寮�濮�</button>
- <button class="end-btn" size="mini" v-if="item.beBatch == 2" @click="cancel(item.matnr)">瀹屾垚</button>
- </view>
+ <view class="item-box" style="width: 10%;">{{item.callTime$}}</view>
+ <view class="item-box" style="width: 9.5%;">{{item.lastTime$}}</view>
</swiper-item>
<view style="height: 1px;"></view>
</swiper>
@@ -389,11 +387,10 @@
getInfo3() {
let that = this
uni.request({
- url: that.commonUrl + "/open/loc/query/auth/v1",
+ url: that.commonUrl + "/mobile/order/list",
method:"GET",
- data: {ledId:that.baseLedId},
+ data: {},
success(result) {
- // console.log(result);
var res = result.data
for (let k of res.data) {
if (k.inspect == 1) {
--
Gitblit v1.9.1