From 269a02ebfd5deb83b6fec053c3a89c618214c877 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 四月 2023 08:00:55 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6715bc2..6ed6177 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -173,7 +173,7 @@
</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;">閿佸畾</view>
<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
</view>
</view>
@@ -217,9 +217,11 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view>鐩爣绔欙細</view>
+ <view>鎵樼洏鐮侊細{{infoText.barcode}}</view>
<view>鍟嗗搧缂栧彿</view>
<view>鍟嗗搧鍚嶇О</view>
+ <view>瑙勬牸</view>
+ <view>鏁伴噺</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -228,10 +230,14 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="16"
+ 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>{{item}}</view>
+ <view>No:{{i+1}}</view>
+ <view>{{item.matnr}}</view>
+ <view>{{item.maknx}}</view>
+ <view>{{item.specs}}</view>
+ <view>{{item.count}}</view>
</swiper-item>
</swiper>
</view>
@@ -372,12 +378,10 @@
maknx: "",
specs: "",
count: "",
- error: ""
+ error: "",
+ barcode: ""
},
swiperList: []
-
-
-
}
},
onShow() {
@@ -406,11 +410,12 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- this.getDate()
- // this.getInfo()
- // this.getError()
- this.getInfo2()
- this.getError2()
+ // this.getDate()
+ this.getDate2()
+ this.getInfo()
+ this.getError()
+ // this.getInfo2()
+ // this.getError2()
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
@@ -441,11 +446,12 @@
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
}
- that.infoText.staNo = res.data[0].staNo
- that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.specs = res.data[0].matDtos[0].specs
- that.infoText.maknx = res.data[0].matDtos[0].maknx
- that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.barcode = res.data[0].barcode
+ that.swiperList = res.data[0].matDtos
+ // that.infoText.matnr = res.data[0].matDtos[0].matnr
+ // that.infoText.specs = res.data[0].matDtos[0].specs
+ // that.infoText.maknx = res.data[0].matDtos[0].maknx
+ // that.infoText.count = res.data[0].matDtos[0].count
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -493,12 +499,21 @@
that.infoText.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
+ } else if(res.data[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ } else if(res.data[0].ioType === 1) {
+ that.infoText.title = '鍏ュ簱'
+ } else if(res.data[0].ioType === 10) {
+ that.infoText.title = '绌烘墭鍏ュ簱'
+ } else if(res.data[0].ioType === 110) {
+ that.infoText.title = '绌烘墭鍑哄簱'
}
- that.infoText.staNo = res.data[0].staNo
- that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.specs = res.data[0].matDtos[0].specs
- that.infoText.maknx = res.data[0].matDtos[0].maknx
- that.infoText.count = res.data[0].matDtos[0].count
+ that.infoText.barcode = res.data[0].barcode
+ that.swiperList = res.data[0].matDtos
+ // that.infoText.matnr = res.data[0].matDtos[0].matnr
+ // that.infoText.specs = res.data[0].matDtos[0].specs
+ // that.infoText.maknx = res.data[0].matDtos[0].maknx
+ // that.infoText.count = res.data[0].matDtos[0].count
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -517,17 +532,18 @@
method:"GET",
success(result) {
var res = result.data
- console.log(res);
if (res.data && res.data !== "") {
var errorInfo = res.data
if (that.infoType == 1) {
that.infoType = 3
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
return
}
that.infoType = 2
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
@@ -650,6 +666,19 @@
this.getUrl()
this.ejectShow = false
},
+ // 鏃ュ巻 鏈嶅姟鍣�
+ 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
+ }
+ })
+ },
+
// 鏃ュ巻
getDate() {
var dt = new Date();
--
Gitblit v1.9.1