From d5fe669988a083bcdb4ff7f349b2e56fa5882a87 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 15 八月 2023 14:02:51 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 07cbaa4..bfc7b84 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -84,8 +84,8 @@
<!-- 鐧惧垎姣� -->
<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>
+ <text class="item-title">{{pakin}} / {{pikout}}</text>
+ <text class="item-subTitle">浠婃棩鍏�/鍑烘暟</text>
</view>
</view>
</view>
@@ -129,17 +129,17 @@
<view class="flex-row sub-info">
<image src="../../static/g1.png" mode="aspectFit"></image>
<view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;font-family: DS-DIGI-1;">{{baseInfo.stockCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
<image src="../../static/f1.png" mode="aspectFit"></image>
<view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;font-family: DS-DIGI-1;">{{baseInfo.emptyCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
<image src="../../static/e1.png" mode="aspectFit"></image>
<view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;font-family: DS-DIGI-1;">{{baseInfo.noneCount}}</view>
</view>
</view>
</view>
@@ -185,7 +185,7 @@
<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: 20%;">鎵规</view>
<view style="width: 10%;">鏁伴噺</view>
</view>
<!-- body -->
@@ -199,9 +199,9 @@
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: 30%;">{{item.matnr}}</view>
<view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
+ <view style="width: 20%;">{{item.batch}}</view>
<view style="width: 10%;">{{item.count}}</view>
</swiper-item>
</swiper>
@@ -341,12 +341,14 @@
staNo: "",
matnr: "",
maknx: "",
- specs: "",
+ batch: "",
count: "",
error: ""
},
swiperList: [],
- tableList: []
+ tableList: [],
+ pakin: 10,
+ pikout: 20,
}
},
onShow() {
@@ -375,7 +377,7 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- this.getDate()
+ this.getDate2()
this.getInfo()
this.getError()
// this.getInfo2()
@@ -646,9 +648,18 @@
}
this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
},
- // 鏃ュ巻
+ // 鏃ュ巻 鏈嶅姟鍣�
getDate2() {
-
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/monitor/date",
+ method:"GET",
+ success(result) {
+ var res = result.data.data
+ that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+ that.currDate = res.year + "/" + res.month + "/" + res.day
+ }
+ })
},
getDateFormat(value) {
var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
@@ -672,6 +683,8 @@
that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
that.chartsData.Line.series = res.data.rows
+ that.pakin = res.data.rows[0].data[11]
+ that.pikout = res.data.rows[1].data[11]
}
}
})
--
Gitblit v1.9.1