From f28c3941955c56eef09778333b18df5db8b8a977 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 二月 2023 20:22:13 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 5e9d589..6715bc2 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -187,8 +187,8 @@
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
<!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
- <!-- 鑷姩浠撳簱WCS鐩戞帶骞冲彴 -->
- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image>
+ 鑷姩浠撳簱WCS鐩戞帶骞冲彴
+ <!-- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
</view>
</y-box>
</view>
@@ -213,12 +213,28 @@
<view class="info-main">
<view class="info-box">
<y-box>
- <view class="info-box-text">
- <view class="flex-col info-box-text-item">鐩爣绔欙細{{infoText.staNo}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧缂栧彿锛歿{infoText.matnr}}</view>
- <view class="flex-col info-box-text-item">鍟嗗搧鍚嶇О锛歿{infoText.maknx}}</view>
- <view class="flex-col info-box-text-item">鎵瑰彿锛歿{infoText.specs}}</view>
- <view class="flex-col info-box-text-item">鏁伴噺锛歿{infoText.count}}</view>
+ <!-- 鏂囨湰瀹瑰櫒 -->
+ <view class="text-content">
+ <!-- head -->
+ <view class="swiper-head">
+ <view>鐩爣绔欙細</view>
+ <view>鍟嗗搧缂栧彿</view>
+ <view>鍟嗗搧鍚嶇О</view>
+ </view>
+ <!-- body -->
+ <view class="swiper-body">
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <swiper class="swiper-body-main" vertical="true"
+ display-multiple-items="16"
+ circular="true" :autoplay="true" :interval="3000" :duration="1000">
+ <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
+ <view>{{item}}</view>
+ </swiper-item>
+ </swiper>
+ </view>
</view>
</y-box>
</view>
@@ -350,14 +366,15 @@
infoType: 0,
text: '',
infoText: {
- title: '鍏ㄦ澘鍑哄簱',
- staNo: "200",
- matnr: "300",
- maknx: "400",
- specs: "500",
- count: "600",
- error: "鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涖��"
+ title: '',
+ staNo: "",
+ matnr: "",
+ maknx: "",
+ specs: "",
+ count: "",
+ error: ""
},
+ swiperList: []
@@ -381,7 +398,7 @@
that.baseLedId = BaseLedId
that.basePort = BasePort
that.baseCrnId = BaseCrnId
- this.getUrl()
+ // this.getUrl()
},
onLoad() {
setInterval(()=>{
@@ -390,13 +407,14 @@
this.initPieChart()
this.getOther()
this.getDate()
- this.getInfo()
- this.getError()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
- // this.getInfo2()
- // this.getError2()
+
},1000)
},
methods: {
@@ -425,7 +443,7 @@
}
that.infoText.staNo = res.data[0].staNo
that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.batch = res.data[0].matDtos[0].batch
+ 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 {
@@ -478,7 +496,7 @@
}
that.infoText.staNo = res.data[0].staNo
that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.batch = res.data[0].matDtos[0].batch
+ 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 {
@@ -495,9 +513,11 @@
let that = this
uni.request({
url: that.commonUrl + "/monitor/led/error",
+ data: {ledId:that.baseLedId},
method:"GET",
success(result) {
var res = result.data
+ console.log(res);
if (res.data && res.data !== "") {
var errorInfo = res.data
if (that.infoType == 1) {
@@ -727,6 +747,7 @@
<style>
/* @import url("../../static/css/common.css"); */
+ @import url("home.css");
/* 鍒� */
.flex-col {
display: flex;
--
Gitblit v1.9.1