From 6fbb59250c36d18f7e82dcd05f9b366b2fba4fa4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 21 十二月 2023 15:56:34 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 82 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index dc05b0f..97f1ea4 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -215,11 +215,15 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view style="width: 25%;">鐩爣绔欙細{{infoText.staNo}}</view>
- <view style="width: 25%;">鍟嗗搧缂栧彿</view>
- <view style="width: 25%;">鍟嗗搧鍚嶇О</view>
- <!-- <view style="width: 20%;">瑙勬牸</view> -->
- <view style="width: 25%;">鏁伴噺</view>
+ <view style="width: 10vw;">鐩爣绔欙細{{infoText.staNo}}</view>
+ <view style="flex: 1;">鍟嗗搧缂栧彿</view>
+ <view style="flex: 1;">鍟嗗搧鍚嶇О</view>
+ <view style="flex: 1;">瑙勬牸</view>
+ <!-- <view style="flex: 1;">鎵瑰彿</view> -->
+ <view style="width: 10vw;">鏁伴噺</view>
+ <!-- <view style="flex: 1;">绠辩爜</view> -->
+ <view style="width: 10vw;">搴撳瓨鏁伴噺</view>
+ <view style="width: 10vw;">鐜板瓨鏁伴噺</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -231,11 +235,14 @@
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: 25%;">No:{{i+1}}</view>
- <view style="width: 25%;">{{item.matNo}}</view>
- <view style="width: 25%;">{{item.maknx}}</view>
- <!-- <view style="width: 20%;">{{item.specs}}</view> -->
- <view style="width: 25%;">{{item.count}}</view>
+ <view style="width: 10vw;">No:{{i+1}}</view>
+ <view style="flex: 1;">{{item.matNo}}</view>
+ <view style="flex: 1;">{{item.maknx}}</view>
+ <view style="flex:1">{{item.specs}}</view>
+ <view style="width: 10vw;">{{item.count}}</view>
+ <!-- <view style="flex: 1;">{{item.zpallet}}</view> -->
+ <view style="width: 10vw;">{{item.anfme}}</view>
+ <view style="width: 10vw;">{{parseInt(item.anfme) - parseInt(item.count)}}</view>
</swiper-item>
</swiper>
</view>
@@ -244,10 +251,10 @@
</view>
</view>
</view>
- <!-- <view class="btn"> -->
+ <view class="btn">
<!-- <button >鎷ｆ枡鍥炲簱</button> -->
- <!-- <button size="mini" type="primary" @click="">鎷ｆ枡鍥炲簱</button> -->
- <!-- </view> -->
+ <button size="mini" type="primary" @click="">鐩樼偣鍥炲簱</button>
+ </view>
</uni-transition>
<!-- 寮傚父淇℃伅 -->
<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
@@ -420,18 +427,27 @@
that.basePort = BasePort
that.baseCrnId = BaseCrnId
+
+
this.getDate2()
- this.getUrl()
- this.getServerData()
- // this.initlineChart()
- // this.initPieChart()
- this.getOther()
setTimeout(()=>{
- this.initlineChart()
- this.getServerData()
- this.initPieChart()
- this.getOther()
- },1000)
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
+ setTimeout(()=>{
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ setTimeout(()=>{
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ },500)
+ },500)
+ },500)
},
onLoad() {
@@ -451,9 +467,6 @@
this.initPieChart()
this.getOther()
},600000)
-
-
-
},
methods: {
timeOuts() {
@@ -542,6 +555,7 @@
infoModel(res) {
let that = this
if (res.data && res.data !== "") {
+ that.infoText.title = res.data[0].title
if (that.infoType == 2 || that.infoType == 3) {
return;
}
@@ -736,7 +750,6 @@
var m = date.getMonth() + 1
var d = date.getDate()
var newDate = m + '-' + d
- console.log(newDate);
return newDate
},
/*************** 鎶樼嚎鍥� *****************************************************************************************************/
@@ -751,11 +764,14 @@
success(result) {
var res = result.data
if (res.code === 200) {
- that.chartsData.Line.categories = [
- that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-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
+ setTimeout(()=> {
+ that.chartsData.Line.categories = [
+ that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-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
+ },1000)
+
}
}
})
@@ -1010,7 +1026,7 @@
}
.info-main {
width: 100vw;
- height: 88vh;
+ height: 80vh;
display: flex;
justify-content: center;
align-items: center;
--
Gitblit v1.9.1