xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决一直加载问题

pull/4/head
pangdundun 2023-10-07 16:53:26 +08:00
parent aaa4a9afda
commit 03e52f9e35
12 changed files with 126 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/nvuerequest.js
View File

@ -14,8 +14,10 @@ export const myRequest = (options) => {
data: options.data || {}, data: options.data || {},
success: (res) => { success: (res) => {
resolve(res.data) resolve(res.data)
if(res.data.code==200){
if (res.data.code == 401) { }
else if (res.data.code == 401) {
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/login' url: '/pages/login/login'
@ -32,6 +34,14 @@ export const myRequest = (options) => {
} }
}); });
}else{
uni.hideLoading()
uni.stopPullDownRefresh();
uni.showToast({
icon:'none',
title: res.data.msg,
duration: 2000,
})
} }
// 接口成功可以在此写成功需要的步骤 // 接口成功可以在此写成功需要的步骤
if (res.data.code != 1) { if (res.data.code != 1) {

156
pages/fertilizer_machine/fertilizer_machine.vue
View File

@ -59,12 +59,14 @@
</view> </view>
<view class="bottom"> <view class="bottom">
<view class="btn-1" :class="inputData['30'] == 1 || inputData['30'] == 3 ? 'in' : 'out'"> <view class="btn-1" :class="inputData['30'] == 1 || inputData['30'] == 3 ? 'in' : 'out'">
<image v-if="inputData['30'] == 1 || inputData['30'] == 3" src="../../static/in-sel.png" mode=""></image> <image v-if="inputData['30'] == 1 || inputData['30'] == 3" src="../../static/in-sel.png"
mode=""></image>
<image v-else src="../../static/in.png" mode=""></image> <image v-else src="../../static/in.png" mode=""></image>
<text>进水泵</text> <text>进水泵</text>
</view> </view>
<view class="btn-2" :class="inputData['30'] == 2 || inputData['30'] == 3 ? 'in' : 'out'"> <view class="btn-2" :class="inputData['30'] == 2 || inputData['30'] == 3 ? 'in' : 'out'">
<image v-if="inputData['30'] == 2 || inputData['30'] == 3" src="../../static/out-sel.png" mode=""></image> <image v-if="inputData['30'] == 2 || inputData['30'] == 3" src="../../static/out-sel.png"
mode=""></image>
<image v-else src="../../static/out.png" mode=""></image> <image v-else src="../../static/out.png" mode=""></image>
<text>配肥泵</text> <text>配肥泵</text>
</view> </view>
@ -90,7 +92,8 @@
</view> </view>
</view> </view>
<u-popup v-model="show" mode="center" :mask-close-able='false' width="640rpx" height="880rpx" :closeable='false'> <u-popup v-model="show" mode="center" :mask-close-able='false' width="640rpx" height="880rpx"
:closeable='false'>
<view class="contentPop"> <view class="contentPop">
<view class="contentPop_box"> <view class="contentPop_box">
<view class="title"> <view class="title">
@ -112,7 +115,8 @@
手动启动时间 手动启动时间
<view class="irrigate_input"> <view class="irrigate_input">
<input v-model="inputData1[10 + (indexs - 1) + '01']" <input v-model="inputData1[10 + (indexs - 1) + '01']"
@blur="changeData10(10 + (indexs - 1) + '01', $event)" type="digit" placeholder="0" step="0.1" /> @blur="changeData10(10 + (indexs - 1) + '01', $event)" type="digit" placeholder="0"
step="0.1" />
<!-- <u-input v-model="inputData[10 + (indexs - 1) + '01']" type="text" :border="false" input-align='center' <!-- <u-input v-model="inputData[10 + (indexs - 1) + '01']" type="text" :border="false" input-align='center'
height='66' :clearable='false' /> --> height='66' :clearable='false' /> -->
</view> </view>
@ -220,7 +224,7 @@
indexs: 1, indexs: 1,
inputData1: [], inputData1: [],
timer:null timer: null
}; };
}, },
watch: { watch: {
@ -229,40 +233,40 @@
onLoad(option) { onLoad(option) {
this.deviceId = option.id this.deviceId = option.id
this.dataInit() this.dataInit()
let that = this let that = this
this.timer = setInterval(function() { this.timer = setInterval(function() {
that.dataInit(); that.dataInit();
that.getReg(); that.getReg();
}, 3000); }, 3000);
}, },
onUnload() { onUnload() {
clearTimeout(this.timer) clearTimeout(this.timer)
}, },
onPullDownRefresh() { onPullDownRefresh() {
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
this.dataInit(); this.dataInit();
this.getReg(); this.getReg();
}, },
methods: { methods: {
toWebView(){ toWebView() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/web_view/web_view' url: '/pages/web_view/web_view'
}) })
}, },
countData10(data){ countData10(data) {
if(data){ if (data) {
return data/10 return data / 10
}else{ } else {
return 0 return 0
} }
}, },
dataInit() { dataInit() {
// uni.showLoading({ // uni.showLoading({
// title: '加载中...' // title: '加载中...'
// }) // })
const that= this const that = this
var deviceId = this.deviceId var deviceId = this.deviceId
var data = { var data = {
"equipmentId": deviceId, "equipmentId": deviceId,
@ -274,8 +278,8 @@
data: data data: data
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.hideLoading() uni.hideLoading()
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
this.inputData = res.data; this.inputData = res.data;
this.getData30() //数据30/进水出水泵 this.getData30() //数据30/进水出水泵
this.getData29() //数据29 启动方式/信号 this.getData29() //数据29 启动方式/信号
@ -283,19 +287,19 @@
this.getcenterBottom() //获取电磁阀 this.getcenterBottom() //获取电磁阀
} else { } else {
that.$refs.uToast.show({ that.$refs.uToast.show({
title: res.msg, title: res.msg,
type: 'error', type: 'error',
}) })
} }
}) })
}, },
getReg() { getReg() {
// uni.showLoading({ // uni.showLoading({
// title: '加载中...' // title: '加载中...'
// }) // })
const that= this const that = this
var data = { var data = {
equipmentId: this.deviceId, equipmentId: this.deviceId,
pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值 pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值
@ -308,17 +312,18 @@
}).then((res) => { }).then((res) => {
console.log(res, 11); console.log(res, 11);
if (res.code == 200) { if (res.code == 200) {
uni.hideLoading() uni.hideLoading()
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
this.inputData1 = res.data; this.inputData1 = res.data;
this.getType00(); this.getType00();
this.inputData1[10 + (this.indexs - 1) + '01']=this.countData10(this.inputData1[10 + (this.indexs - 1) + '01']) this.inputData1[10 + (this.indexs - 1) + '01'] = this.countData10(this.inputData1[10 + (
console.log(this.inputData1[10 + (this.indexs - 1) + '01'],111); this.indexs - 1) + '01'])
console.log(this.inputData1[10 + (this.indexs - 1) + '01'], 111);
} else { } else {
that.$refs.uToast.show({ that.$refs.uToast.show({
title: res.msg, title: res.msg,
type: 'error', type: 'error',
}) })
} }
}) })
}, },
@ -339,9 +344,9 @@
} }
}, },
change00(index) { change00(index) {
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
this.topActive = index this.topActive = index
var list = ["0", "0", "0"]; var list = ["0", "0", "0"];
if (index == 1) { if (index == 1) {
@ -407,15 +412,15 @@
// } // }
}, },
changeData10(code,el){ changeData10(code, el) {
var data=el.target.value*10 var data = el.target.value * 10
var sendData={ var sendData = {
target:{ target: {
value:data value: data
} }
} }
this.change(code,sendData) this.change(code, sendData)
}, },
//间隔灌溉天数 //间隔灌溉天数
change(code, el) { change(code, el) {
var data = { var data = {
@ -442,24 +447,24 @@
}, 100); }, 100);
}, },
changeData(data) { changeData(data) {
const that= this const that = this
this.$http({ this.$http({
url: this.api.writeFs, url: this.api.writeFs,
data: data data: data
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.hideLoading() uni.hideLoading()
this.getReg() this.getReg()
that.$refs.uToast.show({ that.$refs.uToast.show({
title: res.msg, title: res.msg,
type: 'success', type: 'success',
}) })
} else { } else {
that.$refs.uToast.show({ that.$refs.uToast.show({
title: res.msg, title: res.msg,
type: 'error', type: 'error',
}) })
} }
}); });
}, },
@ -575,8 +580,8 @@
}, },
closePop() { closePop() {
this.dataInit(); this.dataInit();
this.getReg(); this.getReg();
this.show = false this.show = false
} }
} }
@ -658,12 +663,12 @@
.item, .item,
.item1 { .item1 {
width: 25%; width: 25%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-shrink: 0; flex-shrink: 0;
>text:nth-child(2) { >text:nth-child(2) {
@ -1028,7 +1033,8 @@
border: 2px solid #E1E2E6; border: 2px solid #E1E2E6;
border-radius: 10rpx; border-radius: 10rpx;
margin: 0 15rpx; margin: 0 15rpx;
>input{
>input {
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center; text-align: center;

6
pages/timeEnvironment/timeEnvironment.vue
View File

@ -326,7 +326,7 @@
url: this.api.getFs_rtdata + "?equipmentId=" + i.deviceId, url: this.api.getFs_rtdata + "?equipmentId=" + i.deviceId,
method: 'post', method: 'post',
}).then(res => { }).then(res => {
// console.log(res, '主页查看施肥机实时数据'); console.log(res, '主页查看施肥机实时数据');
if(res.code == 200){ if(res.code == 200){
uni.hideLoading({ uni.hideLoading({
title: '完成' title: '完成'
@ -334,7 +334,11 @@
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
i.childList= res.data; i.childList= res.data;
// console.log(this.waterAndFertilizerParamsList); // console.log(this.waterAndFertilizerParamsList);
}else{
} }
}).catch(err=>{
console.log('接口失败');
}) })
}) })

2
pages/userCenter/userCenter.vue
View File

@ -112,7 +112,7 @@
}).then(res => { }).then(res => {
console.log(res, '退出'); console.log(res, '退出');
if (res.code == 200) { if (res.code == 200) {
uni.navigateTo({ uni.reLaunch({
url: '/pages/login/login' url: '/pages/login/login'
}); });
uni.removeStorage({ uni.removeStorage({

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/timeEnvironment/timeEnvironment.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/userCenter/userCenter.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
unpackage/dist/dev/mp-weixin/common/vendor.js vendored
View File

@ -12029,7 +12029,7 @@ var myRequest = function myRequest(options) {
data: options.data || {}, data: options.data || {},
success: function success(res) { success: function success(res) {
resolve(res.data); resolve(res.data);
if (res.data.code == 401) { if (res.data.code == 200) {} else if (res.data.code == 401) {
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/login' url: '/pages/login/login'
}); });
@ -12042,6 +12042,14 @@ var myRequest = function myRequest(options) {
}); });
} }
}); });
} else {
uni.hideLoading();
uni.stopPullDownRefresh();
uni.showToast({
icon: 'none',
title: res.data.msg,
duration: 2000
});
} }
// 接口成功可以在此写成功需要的步骤 // 接口成功可以在此写成功需要的步骤
if (res.data.code != 1) { if (res.data.code != 1) {

4
unpackage/dist/dev/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js vendored
View File

@ -360,6 +360,10 @@ var _methods;
// //
// //
// //
//
//
//
//
var _default = { var _default = {
data: function data() { data: function data() {
return { return {

6
unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.js vendored
View File

@ -772,7 +772,7 @@ var _default = {
url: _this.api.getFs_rtdata + "?equipmentId=" + i.deviceId, url: _this.api.getFs_rtdata + "?equipmentId=" + i.deviceId,
method: 'post' method: 'post'
}).then(function (res) { }).then(function (res) {
// console.log(res, '主页查看施肥机实时数据'); console.log(res, '主页查看施肥机实时数据');
if (res.code == 200) { if (res.code == 200) {
uni.hideLoading({ uni.hideLoading({
title: '完成' title: '完成'
@ -780,7 +780,9 @@ var _default = {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
i.childList = res.data; i.childList = res.data;
// console.log(this.waterAndFertilizerParamsList); // console.log(this.waterAndFertilizerParamsList);
} } else {}
}).catch(function (err) {
console.log('接口失败');
}); });
}); });
} }

2
unpackage/dist/dev/mp-weixin/pages/userCenter/userCenter.js vendored
View File

@ -140,7 +140,7 @@ var _default = {
}).then(function (res) { }).then(function (res) {
console.log(res, '退出'); console.log(res, '退出');
if (res.code == 200) { if (res.code == 200) {
uni.navigateTo({ uni.reLaunch({
url: '/pages/login/login' url: '/pages/login/login'
}); });
uni.removeStorage({ uni.removeStorage({