From b4745a4630154a4b0e7a409114c937b6ada608b3 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 29 十二月 2023 16:46:35 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 146 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 26012aa..bc34690 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,11 +218,11 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <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: 10%;">鏁伴噺</view>
+ <view style="flex:1">鐩爣绔欙細{{infoText.staNo}}</view>
+ <view style="flex:2">鍟嗗搧缂栧彿</view>
+ <view style="flex:2">鍟嗗搧鍚嶇О</view>
+ <!-- <view style="flex:1">瑙勬牸</view> -->
+ <view style="flex:1">鏁伴噺</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -234,11 +234,11 @@
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: 20%;">No:{{i+1}}</view>
- <view style="width: 30%;">{{item.matNo}}</view>
- <view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 10%;">{{item.count}}</view>
+ <view style="flex:1">No:{{i+1}}</view>
+ <view style="flex:2">{{item.matnr}}</view>
+ <view style="flex:2">{{item.maknx}}</view>
+ <!-- <view style="flex:1">{{item.specs}}</view> -->
+ <view style="flex:1">{{item.count}}</view>
</swiper-item>
</swiper>
</view>
@@ -402,52 +402,70 @@
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
- // this.getUrl()
+ this.getUrl()
+ setTimeout(()=>{
+ 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() {
- setInterval(()=>{
- this.getServerData()
- this.getDate2()
- this.getUrl()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
- this.controller()
- },1000)
-
- // setInterval(()=>{
- // this.changeErrorShow()
- // },5000)
-
- setInterval(()=>{
- // this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- },600000)
+ setInterval(()=>{
+ this.getServerData()
+ this.getDate2()
+ this.getUrl()
+ this.getInfo()
+ this.getError()
+ // this.getInfo2()
+ // this.getError2()
+ this.controller()
+ },1000)
+
+ // setInterval(()=>{
+ // this.changeErrorShow()
+ // },5000)
+
+ setInterval(()=>{
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ },600000)
},
methods: {
- // 鏃ュ巻 鏈嶅姟鍣�
- getDate2() {
- let that = this
- if(that.commonUrl == 'undefined') {
- return
- }
- uni.request({
- url: that.commonUrl + "/monitor/date",
- method:"GET",
- success(result) {
- // console.log(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
- },
- fail(res) {
- }
-
- })
- },
+ // 鏃ュ巻 鏈嶅姟鍣�
+ getDate2() {
+ let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
+ uni.request({
+ url: that.commonUrl + "/monitor/date",
+ method:"GET",
+ success(result) {
+ // console.log(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
+ },
+ fail(res) {
+ }
+
+ })
+ },
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -466,17 +484,9 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- }
+ that.infoText.title = res.data[0].title
that.infoText.staNo = res.data[0].staNo
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;
@@ -513,6 +523,7 @@
method:"GET",
data: {ledId:that.baseLedId},
success(result) {
+ // console.log(result);
var res = result.data
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
@@ -520,19 +531,9 @@
}
// infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- } else if(res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- }
+ that.infoText.title = res.data[0].title
that.infoText.staNo = res.data[0].staNo
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;
@@ -550,6 +551,7 @@
data: {ledId:that.baseLedId},
method:"GET",
success(result) {
+ console.log(result);
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
--
Gitblit v1.9.1