From 8e8d6259ac5680a9c5eef963b809f07914828207 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 01 七月 2024 08:32:03 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 16 +++-------------
Monitor-APP/pages/index/index.vue | 8 ++++----
Monitor-APP/pages/home/home.css | 11 +++++++++--
Monitor-APP/pages/home/home.vue | 23 +++++++++++------------
4 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 46c9734..e4c6152 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -21,6 +21,8 @@
.swiper-body-main {
width: 100%;
height: 100%;
+ padding-bottom: 2px;
+
/* background-color: #00a8ff; */
}
.swiper-item {
@@ -28,9 +30,14 @@
flex-wrap: wrap;
align-items: center;
text-align: start;
- border-bottom: 2px solid #000;
background-color: rgba(0, 0, 0, .2);
}
.swiper-item:nth-child(2n-1) {
- /* background-color: rgba(255, 255, 255, .1); */
+ background-color: rgba(255, 255, 127, 0.1);
+}
+.swiper-item:first-child {
+ background-color: rgba(255, 85, 0, 1.0);
+}
+.swiper-item:nth-child(2) {
+ background-color: rgba(211, 70, 0, 1.0);
}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index c5eaf24..05e4dc7 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -228,7 +228,7 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="3"
+ display-multiple-items="6"
circular="true" :autoplay="true" :interval="3000" :duration="2000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
@@ -240,7 +240,6 @@
<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
-
<!-- 11 -->
</swiper-item>
</swiper>
@@ -319,7 +318,7 @@
</view>
</view>
</view>
- <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOuts">
杩炴帴瓒呮椂: {{times}} s
</view>
</view>
@@ -389,7 +388,7 @@
barcode: ""
},
swiperList: [],
- timeOut: false,
+ timeOuts: false,
times: 0,
currDate: ''
}
@@ -422,10 +421,10 @@
this.getOther()
// this.getDate()
this.getDate2()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.getUrl()
this.controller()
// 娴嬭瘯鐢�
@@ -514,7 +513,7 @@
method:"GET",
data: {ledId:that.baseLedId},
success(result) {
- that.timeOut = false
+ that.timeOuts = false
that.times = 0
var res = result.data
if (res.data && res.data !== "") {
@@ -553,7 +552,7 @@
}
},
fail(err) {
- that.timeOut = true
+ that.timeOuts = true
that.times = that.times+3
that.infoType = 0
}
@@ -567,7 +566,7 @@
data: {ledId:that.baseLedId},
method:"GET",
success(result) {
- that.timeOut = false
+ that.timeOuts = false
that.times = 0
var res = result.data
if (res.data && res.data !== "") {
@@ -591,7 +590,7 @@
}
},
fail(err) {
- that.timeOut = true
+ that.timeOuts = true
that.infoType = 0
}
})
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index d8a5284..3b4790b 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -48,7 +48,7 @@
"count": 40.0,
"specs": "gcslxwt",
"info": "娴欐睙涓壃",
- "bz": "",
+ "bz": "绾㈣壊",
"total" : 200
},
{
@@ -58,7 +58,7 @@
"count": 40.0,
"specs": "gcslxwt",
"info": "娴欐睙涓壃",
- "bz": "",
+ "bz": "绾㈣壊",
"total" : 200
},
{
@@ -68,17 +68,7 @@
"count": 40.0,
"specs": "gcslxwt",
"info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "17鍙锋",
+ "bz": "绾㈣壊",
"total" : 200
}
],
diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index b24e432..f84c4f0 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -401,10 +401,10 @@
this.getOther();
// 鍏朵粬淇℃伅
this.getDate();
- this.getPakin();
- this.getError();
- // this.getYYY();
- // this.getEEE();
+ // this.getPakin();
+ // this.getError();
+ this.getYYY();
+ this.getEEE();
this.animation()
this.getUrl()
},1000)
--
Gitblit v1.9.1