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

fix(merge): merge 

merge

Signed-off-by: liubaixun <liubaixun@yinxiang.com>
mini-program
liubaixun 2023-10-19 17:40:19 +08:00
parent b68cf11c78 738d268aa0
commit 6ea08e8063
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.vue
View File

@ -4,7 +4,7 @@
title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar> title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
<view class="content"> <view class="content">
<view class="item" v-for="item,index in deviceList" :key="index"> <view class="item" v-for="item,index in deviceList" :key="index" v-if="item.equipmentName==1">
<image src="../../static/icon_precise.png" mode=""></image> <image src="../../static/icon_precise.png" mode=""></image>
<view class="center"> <view class="center">
<text>{{item.deviceTypeName}}</text> <text>{{item.deviceTypeName}}</text>

2
pages/timeEnvironment/timeEnvironment.vue
View File

@ -348,7 +348,7 @@
} }
}) })
this.waterAndFertilizerParamsList.forEach((i,index)=>{ this.waterAndFertilizerParamsList.forEach((i,index)=>{
console.log(i.deviceId,'i.deviceId'); // console.log(i.deviceId,'i.deviceId');
if(i.deviceId == 2023042214250018) return if(i.deviceId == 2023042214250018) return
this.$http({ this.$http({
url: this.api.getFs_rtdata + "?equipmentId=" + i.deviceId, url: this.api.getFs_rtdata + "?equipmentId=" + i.deviceId,

4
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

4
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/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 class="{{[item.deviceState==1?'state':'state_act']}}">{{item.deviceState==1?"在线":"离线"}}</text></view><block wx:if="{{item.deviceState==1}}"><view data-event-opts="{{[['tap',[['toFertilizer',['$0'],[[['deviceList','',index]]]]]]]}}" class="right" bindtap="__e"><text>状态</text><image src="../../static/right-arrow.png" mode></image></view></block></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"><block wx:if="{{item.equipmentName==1}}"><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><block wx:if="{{item.deviceState==1}}"><view data-event-opts="{{[['tap',[['toFertilizer',['$0'],[[['deviceList','',index]]]]]]]}}" class="right" bindtap="__e"><text>状态</text><image src="../../static/right-arrow.png" mode></image></view></block></view></block></block></view></view>

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

@ -758,7 +758,7 @@ var _default = {
}); });
}); });
_this.waterAndFertilizerParamsList.forEach(function (i, index) { _this.waterAndFertilizerParamsList.forEach(function (i, index) {
console.log(i.deviceId, 'i.deviceId'); // console.log(i.deviceId,'i.deviceId');
if (i.deviceId == 2023042214250018) return; if (i.deviceId == 2023042214250018) return;
_this.$http({ _this.$http({
url: _this.api.getFs_rtdata + "?equipmentId=" + i.deviceId, url: _this.api.getFs_rtdata + "?equipmentId=" + i.deviceId,