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 | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index bd12872..6ed6177 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -217,7 +217,7 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view>鐩爣绔欙細{{infoText.staNo}}</view>
+ <view>鎵樼洏鐮侊細{{infoText.barcode}}</view>
<view>鍟嗗搧缂栧彿</view>
<view>鍟嗗搧鍚嶇О</view>
<view>瑙勬牸</view>
@@ -234,7 +234,7 @@
circular="true" :autoplay="true" :interval="3000" :duration="1000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
<view>No:{{i+1}}</view>
- <view>{{item.matNo}}</view>
+ <view>{{item.matnr}}</view>
<view>{{item.maknx}}</view>
<view>{{item.specs}}</view>
<view>{{item.count}}</view>
@@ -378,7 +378,8 @@
maknx: "",
specs: "",
count: "",
- error: ""
+ error: "",
+ barcode: ""
},
swiperList: []
}
@@ -409,7 +410,8 @@
this.initlineChart()
this.initPieChart()
this.getOther()
- this.getDate()
+ // this.getDate()
+ this.getDate2()
this.getInfo()
this.getError()
// this.getInfo2()
@@ -444,7 +446,7 @@
} else if(res.data[0].ioType === 103) {
that.infoText.title = '妫�鏂欏嚭搴�'
}
- that.infoText.staNo = res.data[0].staNo
+ 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
@@ -499,8 +501,14 @@
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.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
@@ -658,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