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

新增5s刷新和取消无用模块

pull/11/head
pangdundun 2023-10-09 18:07:25 +08:00
parent 424faa855f
commit c36307ecd8
46 changed files with 252 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages.json
View File

@ -28,7 +28,8 @@
"path": "pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
}, {

12
pages/fertilizer_machine/fertilizer_machine.vue
View File

@ -224,7 +224,7 @@
indexs: 1,
inputData1: [],
// timer: null
timer: null
};
},
watch: {
@ -234,13 +234,13 @@
this.deviceId = option.id
this.dataInit()
let that = this
// this.timer = setInterval(function() {
// that.dataInit();
// that.getReg();
// }, 3000);
this.timer = setInterval(function() {
that.dataInit();
}, 5000);
},
onUnload() {
// clearTimeout(this.timer)
let that = this
clearTimeout(that.timer)
},
onPullDownRefresh() {
// uni.showLoading({

206
pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.vue
View File

@ -1,14 +1,15 @@
<template>
<view class="preciseWaterAndFertilizer">
<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false"
title="精准水肥" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false" title="精准水肥"
title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
<view class="content">
<view class="item" v-for="item,index in deviceList" :key="index">
<image src="../../static/icon_precise.png" mode=""></image>
<view class="center">
<text>{{item.deviceTypeName}}</text>
<text>在线</text>
<text
:class="item.deviceState == 1 ? 'state' : 'state_act'">{{ item.deviceState == 1 ? "在线" : "离线"}}</text>
</view>
<view class="right" @click="toFertilizer(item)">
<text>状态</text>
@ -27,28 +28,55 @@
background: {
backgroundColor: '#24B383',
},
deviceList:[]
deviceList: []
};
},
onLoad() {
const that= this
uni.showLoading({
title: '加载中...'
})
uni.getStorage({
key: 'token',
success: function(res) {
that.getEquipmentInfo(uni.getStorageSync('userid'))
},
fail:function(err){
fail: function(err) {
uni.reLaunch({
url:'/pages/login/login'
url: '/pages/login/login'
})
}
})
const that = this
setInterval(function() {
uni.getStorage({
key: 'token',
success: function(res) {
uni.showLoading({
title: '加载中...'
})
that.getEquipmentInfo(uni.getStorageSync('userid'))
}
})
}, 120000);
},
methods:{
onPullDownRefresh() {
uni.showLoading({
title: '加载中...'
})
const that = this
uni.getStorage({
key: 'token',
success: function(res) {
that.getEquipmentInfo(uni.getStorageSync('userid'))
}
})
},
methods: {
// 离线或者在线
toFertilizer(item){
toFertilizer(item) {
uni.navigateTo({
url:'/pages/fertilizer_machine/fertilizer_machine?id='+item.deviceId
url: '/pages/fertilizer_machine/fertilizer_machine?id=' + item.deviceId
})
},
@ -59,9 +87,16 @@
url: this.api.sel_eqbyid + userid,
method: 'GET'
}).then(res => {
console.log(res, '根据用户id查询对应的设备数据');
// console.log(res, '根据用户id查询对应的设备数据');
if (res.code == 200) {
this.deviceList=res.data
uni.hideLoading()
uni.stopPullDownRefresh();
this.deviceList = res.data
}else {
this.$refs.uToast.show({
title: res.msg,
type: 'error',
})
}
})
},
@ -70,85 +105,102 @@
</script>
<style lang="scss">
.preciseWaterAndFertilizer{
width: 100%;
min-height: 100vh;
background-color: #F5F6FA;
.preciseWaterAndFertilizer {
width: 100%;
min-height: 100vh;
background-color: #F5F6FA;
.content{
box-sizing: border-box;
padding: 30rpx;
.item{
width: 690rpx;
height: 100rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(153,153,153,0.1);
border-radius: 15rpx;
display: flex;
align-items: center;
justify-content: space-between;
.content {
box-sizing: border-box;
padding: 0 20rpx 0 26rpx;
margin-bottom: 10rpx;
>image{
width: 60rpx;
height: 56rpx;
margin-right: 14rpx;
}
padding: 30rpx;
.center{
.item {
width: 690rpx;
height: 100rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(153, 153, 153, 0.1);
border-radius: 15rpx;
display: flex;
align-items: center;
flex: 1;
justify-content: space-between;
box-sizing: border-box;
padding: 0 20rpx 0 26rpx;
margin-bottom: 10rpx;
>text:nth-child(1){
font-size: 34rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #333333;
margin-right: 11rpx;
>image {
width: 60rpx;
height: 56rpx;
margin-right: 14rpx;
}
>text:nth-child(2){
width: 66rpx;
height: 34rpx;
background: #EFFCF7;
border: 2px solid rgba(58,187,144,0.25);
border-radius: 17rpx;
font-size: 20rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #24B383;
.center {
display: flex;
align-items: center;
flex: 1;
>text:nth-child(1) {
font-size: 34rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #333333;
margin-right: 11rpx;
}
>.state {
width: 66rpx;
height: 34rpx;
background: #EFFCF7;
border: 2px solid rgba(58, 187, 144, 0.25);
border-radius: 17rpx;
font-size: 20rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #24B383;
display: flex;
justify-content: center;
align-items: center;
}
>.state_act {
width: 66rpx;
height: 34rpx;
background: #F5F6FA;
border: 2px solid #E1E2E6;
border-radius: 17rpx;
font-size: 20rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #999999;
display: flex;
justify-content: center;
align-items: center;
}
}
.right {
width: 120rpx;
height: 54rpx;
background: #F5F6FA;
border: 2px solid #E1E2E6;
border-radius: 10rpx;
display: flex;
justify-content: center;
align-items: center;
}
}
.right{
width: 120rpx;
height: 54rpx;
background: #F5F6FA;
border: 2px solid #E1E2E6;
border-radius: 10rpx;
display: flex;
justify-content: center;
align-items: center;
>text {
font-size: 28rpx;
font-family: PingFang SC;
font-weight: bold;
color: #666666;
}
>text{
font-size: 28rpx;
font-family: PingFang SC;
font-weight: bold;
color: #666666;
}
>image{
width: 12rpx;
height: 20rpx;
margin-left: 20rpx;
>image {
width: 12rpx;
height: 20rpx;
margin-left: 20rpx;
}
}
}
}
}
}
</style>

8
pages/timeEnvironment/timeEnvironment.vue
View File

@ -40,7 +40,7 @@
</view>
</view>
<view class="testBase" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
<!-- <view class="testBase" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
<view class="nav">
<image src="../../static/base.png" mode=""></image>
<text>{{ item1.deviceTypeName }}</text>
@ -54,9 +54,9 @@
</view>
</view>
</view>
</view>
</view> -->
<view class="testBase1" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
<!-- <view class="testBase1" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
<view class="nav">
<image src="../../static/testBase1.png" mode=""></image>
<text>{{ item1.deviceTypeName }}</text>
@ -67,7 +67,7 @@
<text>{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</text>
<text>{{ item2.environmentData + getTypeList(item2.formula) }}</text>
</view>
</view>
</view> -->
</view>
</view>
</template>

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

File diff suppressed because one or more lines are too long

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/node-modules/uview-ui/components/u-avatar/u-avatar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-field/u-field.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-form/u-form.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-mask/u-mask.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-navbar/u-navbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/editSite/editSite.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/login/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/target_water_fertilizer_PH/target_water_fertilizer_PH.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/timeVideo/timeVideo.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

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

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
try {
data = data.call(context); // 支持 Vue.prototype 上挂的数据
} catch (e) {
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
}
}
@ -8934,7 +8934,7 @@ function type(obj) {
function flushCallbacks$1(vm) {
if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
var mpInstance = vm.$scope;
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
//1.nextTick 之前 已 setData 且 setData 还未回调完成
//2.nextTick 之前存在 render watcher
if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
var mpInstance = vm.$scope;
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
']:nextVueTick');
}
return nextTick(cb, vm)
}else{
if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
var mpInstance$1 = vm.$scope;
console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
']:nextMPTick');
@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
});
var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
if (Object.keys(diffData).length) {
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
']差量更新',
JSON.stringify(diffData));
@ -12310,7 +12310,7 @@ function _extends() {
var formatRegExp = /%[sdj%]/g;
var warning = function warning() {}; // don't print warning message when in production env or node runtime
if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
warning = function warning(type, errors) {
if (typeof console !== 'undefined' && console.warn) {
if (errors.every(function (e) {
@ -21388,7 +21388,8 @@ var _default = {
"path": "pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
}, {
"path": "pages/userCenter/userCenter",

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

@ -412,24 +412,22 @@ var _default = {
left1Act: -1,
topActive: 0,
indexs: 1,
inputData1: []
// timer: null
inputData1: [],
timer: null
};
},
watch: {},
onLoad: function onLoad(option) {
this.deviceId = option.id;
this.dataInit();
var that = this;
// this.timer = setInterval(function() {
// that.dataInit();
// that.getReg();
// }, 3000);
this.timer = setInterval(function () {
that.dataInit();
}, 5000);
},
onUnload: function onUnload() {
// clearTimeout(this.timer)
var that = this;
clearTimeout(that.timer);
},
onPullDownRefresh: function onPullDownRefresh() {
// uni.showLoading({

38
unpackage/dist/dev/mp-weixin/pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.js vendored
View File

@ -185,6 +185,7 @@ exports.default = void 0;
//
//
//
//
var _default = {
data: function data() {
return {
@ -196,7 +197,9 @@ var _default = {
};
},
onLoad: function onLoad() {
var that = this;
uni.showLoading({
title: '加载中...'
});
uni.getStorage({
key: 'token',
success: function success(res) {
@ -208,6 +211,30 @@ var _default = {
});
}
});
var that = this;
setInterval(function () {
uni.getStorage({
key: 'token',
success: function success(res) {
uni.showLoading({
title: '加载中...'
});
that.getEquipmentInfo(uni.getStorageSync('userid'));
}
});
}, 120000);
},
onPullDownRefresh: function onPullDownRefresh() {
uni.showLoading({
title: '加载中...'
});
var that = this;
uni.getStorage({
key: 'token',
success: function success(res) {
that.getEquipmentInfo(uni.getStorageSync('userid'));
}
});
},
methods: {
// 离线或者在线
@ -224,9 +251,16 @@ var _default = {
url: this.api.sel_eqbyid + userid,
method: 'GET'
}).then(function (res) {
console.log(res, '根据用户id查询对应的设备数据');
// console.log(res, '根据用户id查询对应的设备数据');
if (res.code == 200) {
uni.hideLoading();
uni.stopPullDownRefresh();
_this.deviceList = res.data;
} else {
_this.$refs.uToast.show({
title: res.msg,
type: 'error'
});
}
});
}

1
unpackage/dist/dev/mp-weixin/pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.json vendored
View File

@ -1,6 +1,7 @@
{
"navigationBarTitleText": "",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"usingComponents": {
"u-navbar": "/node-modules/uview-ui/components/u-navbar/u-navbar"
}

2
unpackage/dist/dev/mp-weixin/pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.wxml vendored
View File

@ -1 +1 @@
<view class="preciseWaterAndFertilizer"><u-navbar vue-id="cdd718f8-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="精准水肥" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" bind:__l="__l"></u-navbar><view class="content"><block wx:for="{{deviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item"><image src="../../static/icon_precise.png" mode></image><view class="center"><text>{{item.deviceTypeName}}</text><text>在线</text></view><view data-event-opts="{{[['tap',[['toFertilizer',['$0'],[[['deviceList','',index]]]]]]]}}" class="right" bindtap="__e"><text>状态</text><image src="../../static/right-arrow.png" mode></image></view></view></block></view></view>
<view class="preciseWaterAndFertilizer"><u-navbar vue-id="cdd718f8-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="精准水肥" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" bind:__l="__l"></u-navbar><view class="content"><block wx:for="{{deviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item"><image src="../../static/icon_precise.png" mode></image><view class="center"><text>{{item.deviceTypeName}}</text><text class="{{[item.deviceState==1?'state':'state_act']}}">{{item.deviceState==1?"在线":"离线"}}</text></view><view data-event-opts="{{[['tap',[['toFertilizer',['$0'],[[['deviceList','',index]]]]]]]}}" class="right" bindtap="__e"><text>状态</text><image src="../../static/right-arrow.png" mode></image></view></view></block></view></view>

16
unpackage/dist/dev/mp-weixin/pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.wxss vendored
View File

@ -63,7 +63,7 @@
color: #333333;
margin-right: 11rpx;
}
.preciseWaterAndFertilizer .content .item .center > text:nth-child(2) {
.preciseWaterAndFertilizer .content .item .center > .state {
width: 66rpx;
height: 34rpx;
background: #EFFCF7;
@ -77,6 +77,20 @@
justify-content: center;
align-items: center;
}
.preciseWaterAndFertilizer .content .item .center > .state_act {
width: 66rpx;
height: 34rpx;
background: #F5F6FA;
border: 2px solid #E1E2E6;
border-radius: 17rpx;
font-size: 20rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #999999;
display: flex;
justify-content: center;
align-items: center;
}
.preciseWaterAndFertilizer .content .item .right {
width: 120rpx;
height: 54rpx;

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

@ -145,53 +145,11 @@ var render = function () {
}
}
)
var l3 = _vm.__map(
_vm.waterAndFertilizerParamsList,
function (item1, index1) {
var $orig = _vm.__get_orig(item1)
var l2 = _vm.__map(item1.childList, function (item2, index2) {
var $orig = _vm.__get_orig(item2)
var m2 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
var m3 = _vm.getTypeList(item2.formula)
return {
$orig: $orig,
m2: m2,
m3: m3,
}
})
return {
$orig: $orig,
l2: l2,
}
}
)
var l5 = _vm.__map(
_vm.waterAndFertilizerParamsList,
function (item1, index1) {
var $orig = _vm.__get_orig(item1)
var l4 = _vm.__map(item1.childList, function (item2, index2) {
var $orig = _vm.__get_orig(item2)
var m4 = _vm.getStatus(item2.equipmentNumber, item2.targetValue)
var m5 = _vm.getTypeList(item2.formula)
return {
$orig: $orig,
m4: m4,
m5: m5,
}
})
return {
$orig: $orig,
l4: l4,
}
}
)
_vm.$mp.data = Object.assign(
{},
{
$root: {
l1: l1,
l3: l3,
l5: l5,
},
}
)

2
unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.wxml vendored
View File

@ -1 +1 @@
<view class="timeEnvironment data-v-34c343d8"><u-navbar vue-id="63a4351c-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="实时环境" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-34c343d8" bind:__l="__l"></u-navbar><view class="navbar data-v-34c343d8"><image src="../../static/timeEnvironment_bg.png" mode class="data-v-34c343d8"></image></view><view class="content data-v-34c343d8"><view class="title data-v-34c343d8"><image src="../../static/logo_1.png" mode class="data-v-34c343d8"></image><view class="right data-v-34c343d8"><view class="data-v-34c343d8">温室智慧云</view><view class="data-v-34c343d8">Greenhouse wisdom Cloud</view></view></view><view class="subtitle data-v-34c343d8">欢迎使用温室智慧云数据统计</view><block wx:for="{{$root.l1}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="waterAndFertilizerParams data-v-34c343d8"><view class="nav data-v-34c343d8"><image src="../../static/PH.png" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item1.$orig.deviceTypeName}}</text></view><view class="detail data-v-34c343d8"><block wx:for="{{item1.l0}}" wx:for-item="item2" wx:for-index="index2" wx:key="index2"><view data-event-opts="{{[['tap',[['toTarget_water_fertilizer_PH',['$0','$1'],[[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentData']]]]]]]}}" class="item data-v-34c343d8" bindtap="__e"><image src="{{'../../static/icon/icon'+(index2+1<9?index2+1:1)+'.png'}}" mode class="data-v-34c343d8"></image><view class="info data-v-34c343d8"><view class="data-v-34c343d8">{{item2.m0+item2.$orig.environmentDataId}}</view><view class="data-v-34c343d8">{{item2.$orig.environmentData+item2.m1}}</view></view></view></block></view></view></block><block wx:for="{{$root.l3}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="testBase data-v-34c343d8"><view class="nav data-v-34c343d8"><image src="../../static/base.png" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item1.$orig.deviceTypeName}}</text></view><view class="detail data-v-34c343d8"><block wx:for="{{item1.l2}}" wx:for-item="item2" wx:for-index="index2" wx:key="index2"><view data-event-opts="{{[['tap',[['toTarget_water_fertilizer_PH',['$0','$1'],[[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentData']]]]]]]}}" class="item data-v-34c343d8" bindtap="__e"><image src="{{'../../static/icon/icon@'+(item2.$orig.formula?item2.$orig.formula:1)+'.png'}}" mode class="data-v-34c343d8"></image><view class="info data-v-34c343d8"><view class="data-v-34c343d8">{{item2.m2+item2.$orig.environmentDataId}}</view><view class="data-v-34c343d8">{{item2.$orig.environmentData+item2.m3}}</view></view></view></block></view></view></block><block wx:for="{{$root.l5}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="testBase1 data-v-34c343d8"><view class="nav data-v-34c343d8"><image src="../../static/testBase1.png" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item1.$orig.deviceTypeName}}</text><text class="data-v-34c343d8">温室#1</text></view><block wx:for="{{item1.l4}}" wx:for-item="item2" wx:for-index="index2" wx:key="index2"><view data-event-opts="{{[['tap',[['toTarget_water_fertilizer_PH',['$0','$1'],[[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentData']]]]]]]}}" class="item data-v-34c343d8" bindtap="__e"><image src="{{'../../static/icon/'+(index2+1<5?index2+1:1)+'.png'}}" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item2.m4+item2.$orig.environmentDataId}}</text><text class="data-v-34c343d8">{{item2.$orig.environmentData+item2.m5}}</text></view></block></view></block></view></view>
<view class="timeEnvironment data-v-34c343d8"><u-navbar vue-id="63a4351c-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="实时环境" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-34c343d8" bind:__l="__l"></u-navbar><view class="navbar data-v-34c343d8"><image src="../../static/timeEnvironment_bg.png" mode class="data-v-34c343d8"></image></view><view class="content data-v-34c343d8"><view class="title data-v-34c343d8"><image src="../../static/logo_1.png" mode class="data-v-34c343d8"></image><view class="right data-v-34c343d8"><view class="data-v-34c343d8">温室智慧云</view><view class="data-v-34c343d8">Greenhouse wisdom Cloud</view></view></view><view class="subtitle data-v-34c343d8">欢迎使用温室智慧云数据统计</view><block wx:for="{{$root.l1}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="waterAndFertilizerParams data-v-34c343d8"><view class="nav data-v-34c343d8"><image src="../../static/PH.png" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item1.$orig.deviceTypeName}}</text></view><view class="detail data-v-34c343d8"><block wx:for="{{item1.l0}}" wx:for-item="item2" wx:for-index="index2" wx:key="index2"><view data-event-opts="{{[['tap',[['toTarget_water_fertilizer_PH',['$0','$1'],[[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentData']]]]]]]}}" class="item data-v-34c343d8" bindtap="__e"><image src="{{'../../static/icon/icon'+(index2+1<9?index2+1:1)+'.png'}}" mode class="data-v-34c343d8"></image><view class="info data-v-34c343d8"><view class="data-v-34c343d8">{{item2.m0+item2.$orig.environmentDataId}}</view><view class="data-v-34c343d8">{{item2.$orig.environmentData+item2.m1}}</view></view></view></block></view></view></block></view></view>

3
unpackage/dist/dev/mp-weixin/project.private.config.json vendored
View File

@ -2,7 +2,6 @@
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "wszhyWx",
"setting": {
"compileHotReLoad": true,
"urlCheck": false
"compileHotReLoad": true
}
}