From 06773e6f22d3cfb197e9a678a5718c8c0d622b23 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 12 十二月 2023 10:57:40 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 15 +++++++
Monitor-APP/pages/home/home.vue | 72 +++++++++++++++++++++++++++++++++++-
2 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 4ad7fb8..064d6ca 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -219,7 +219,7 @@
<view style="flex: 1;">鍓╀綑鏁伴噺</view>
</view> -->
<view class="swiper-head">
- <view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
+ <view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}} <br /> 璁㈠崟鍙�</view>
<view style="flex: 2;">鍟嗗搧缂栧彿</view>
<view style="flex: 2;">绠辩爜</view>
<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
@@ -321,6 +321,15 @@
</view>
</view>
</view>
+ <!-- 灏忚溅寮傚父 -->
+ <view class="board">
+ <uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
+ <view class="error-board" >
+ <text v-for="item in carInfo">{{item}}</text>
+ </view>
+ </uni-transition>
+ </view>
+
<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
杩炴帴瓒呮椂: {{times}} s
</view>
@@ -333,6 +342,9 @@
export default {
data() {
return {
+ newModeClass: 'slide-top',
+ errorBoardShow: false,
+ carInfo: [],
series: [],
homeViewShow: true,
infoViewShow: false ,
@@ -451,6 +463,8 @@
this.getUrl()
this.getInfo()
this.getError()
+ this.getCarInfo()
+ // this.getCarInfoTest()
// this.getInfo2()
// this.getError2()
this.controller()
@@ -464,6 +478,40 @@
},600000)
},
methods: {
+ changeErrorShow() {
+ this.errorBoardShow = !this.errorBoardShow
+ },
+ getCarInfoTest() {
+ let that = this
+ var result = ycqdata.carError
+ var res = result.data
+ that.carInfoModel(res)
+ },
+ getCarInfo() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/monitor/device/error",
+ method:"GET",
+ success(result) {
+ var res = result.data
+ that.carInfoModel(res)
+ }
+ })
+ },
+ carInfoModel(res) {
+ let infoList = []
+ if (res.code == 200 && res.data != '') {
+ let str = ''
+ for (let k of res.data) {
+ str = `${k.deviceNo}鍙�${k.device}-${k.errorMsg}`
+ infoList.push(str)
+ }
+ this.carInfo = infoList
+ this.errorBoardShow = true
+ } else {
+ this.errorBoardShow = false
+ }
+ },
timeOuts() {
console.log(this.times);
},
@@ -719,7 +767,6 @@
that.currDate = res.year + "/" + res.month + "/" + res.day
},
fail(res) {
- console.log(res);
}
})
@@ -1136,4 +1183,25 @@
.textred{
color: red;
}
+
+ .board {
+ position: absolute;
+ top: 0;
+ right: 0;
+ /* background-color: #aa00ff; */
+ height: 13vh;
+ width: 100%;
+ /* box-shadow: rgba(0,0,0,.35) 0px 5px 15px; */
+ }
+ .error-board {
+ margin: .2rem;
+ height: 11vh;
+ background-color: #F56C6C;
+ box-shadow: rgba(0,0,0,.35) 0px 5px 15px;
+ border-radius: .2rem;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ font-size: 2rem;
+ }
</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 9555da8..45d6fd9 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -152,6 +152,21 @@
}]
}},
"dataError2":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}},
+ "carError": {"data": {
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": [
+ {
+ "deviceNo": 1,
+ "errorMsg": "涓㈠け鎰熺煡鐗�",
+ "device": "鍥涘悜杞�"
+ }, {
+ "deviceNo": 2,
+ "errorMsg": "鍓嶈秴闄愯秴閲�",
+ "device": "鎻愬崌鏈�"
+ }
+ ]
+ }},
"lineData":{
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
--
Gitblit v1.9.1