From c0439f172629206be5922cab056025c9eebb02ff Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期日, 23 四月 2023 12:53:35 +0800
Subject: [PATCH] # 连接超时
---
Monitor-APP/manifest.json | 3 +
Monitor-APP/pages/home/home.vue | 77 +++++++++++++++++++++++++++-----------
2 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/Monitor-APP/manifest.json b/Monitor-APP/manifest.json
index 1101148..78d9546 100644
--- a/Monitor-APP/manifest.json
+++ b/Monitor-APP/manifest.json
@@ -5,6 +5,9 @@
"versionName" : "1.0.1",
"versionCode" : "100",
"transformPx" : false,
+ "networkTimeout":{
+ "request":30000
+ },
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
"usingComponents" : true,
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6ed6177..c3f6cab 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/vietnam.jpg" mode="" style="width: 100%;"></image>
</view>
</y-box>
</view>
@@ -315,6 +315,9 @@
</view>
</view>
</view>
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ 杩炴帴瓒呮椂
+ </view>
</view>
</template>
@@ -381,7 +384,8 @@
error: "",
barcode: ""
},
- swiperList: []
+ swiperList: [],
+ timeOut: false
}
},
onShow() {
@@ -445,6 +449,14 @@
that.infoText.title = '鍏ㄦ澘鍑哄簱'
} else if(res.data[0].ioType === 103) {
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.barcode = res.data[0].barcode
that.swiperList = res.data[0].matDtos
@@ -467,12 +479,14 @@
var errorInfo = res.data
if (that.infoType == 1) {
that.infoType = 3
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
return
}
that.infoType = 2
- that.infoText.title = "寮傚父"
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
@@ -488,6 +502,7 @@
method:"GET",
data: {ledId:that.baseLedId},
success(result) {
+ that.timeOut = false
var res = result.data
if (res.data && res.data !== "") {
if (that.infoType == 2 || that.infoType == 3) {
@@ -520,6 +535,10 @@
}
that.infoType = 0
}
+ },
+ fail(err) {
+ that.timeOut = true
+ that.infoType = 0
}
})
@@ -531,6 +550,7 @@
data: {ledId:that.baseLedId},
method:"GET",
success(result) {
+ that.timeOut = false
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
@@ -551,6 +571,10 @@
}
that.infoType = 0
}
+ },
+ fail(err) {
+ that.timeOut = true
+ that.infoType = 0
}
})
@@ -559,6 +583,31 @@
controller() {
switch(this.infoType) {
// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+ case 0:
+ if (this.errorInfoViewShow) {
+ this.errorInfoViewShow = false
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.infoViewShow) {
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.errorInfoViewShow && this.infoViewShow) {
+ this.errorInfoViewShow = false
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
case 1:
if (this.homeViewShow) {
this.homeViewShow = false
@@ -613,23 +662,7 @@
},1000)
}
return;
- default :
- if (this.errorInfoViewShow) {
- this.errorInfoViewShow = false
- this.errorInfoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
+
}
},
--
Gitblit v1.9.1