wx-program
parent
80f6a17a79
commit
7d0f4dae70
|
|
@ -182,9 +182,23 @@
|
|||
<span>手机控制</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="lishui-status" v-if="Number(item.progress) == ''">
|
||||
静止状态:
|
||||
<span>{{ item.progress }}%</span>
|
||||
<view class="lishui-status" v-if="item.progress_num">
|
||||
<!-- 静止状态:
|
||||
<span>{{ item.progress }}%</span> -->
|
||||
{{ getNumberStatus(item.progress_state) }}:
|
||||
<span :style="item.progress_state != 1 ? 'color:#FF6C6C' : '#24B383'">{{ item.progress }}%</span>
|
||||
</view>
|
||||
<view class="lishui-status" v-if="item.open_num">
|
||||
<view class="btn" :class="item.open == 1 ? 'btn-on' : 'btn-off'">
|
||||
<image class="fan-img" v-if="item.open == 1 && item.open_num == 1001" src="../../static/fanwetcurtain.png" alt="" style="animation: unset;width: 34rpx;height: 34rpx;">
|
||||
</image>
|
||||
<image class="fan-img" v-if="item.open == 1 && item.open_num == 1003" src="../../static/fan-on.png" alt="" style="width: 34rpx;height: 34rpx;">
|
||||
</image>
|
||||
<image class="fan-img" v-if="item.open == 1 && item.open_num == 1014" src="../../static/status-icon2.png" alt="" style="animation: unset;width: 34rpx;height: 34rpx;">
|
||||
</image>
|
||||
<image v-if='item.open != 1' src="../../static/fan-off.png" alt=""></image>
|
||||
<span>{{item.open == 1 ? '打开' : '关闭'}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="status-noTrue">
|
||||
|
|
@ -1561,20 +1575,26 @@
|
|||
title: '加温水泵',
|
||||
controlState: 0,
|
||||
num: '1000',
|
||||
close_btn: false
|
||||
close_btn: false,
|
||||
open_num: 1001,
|
||||
open:0
|
||||
},
|
||||
{
|
||||
title: '地热风机',
|
||||
controlState: 0,
|
||||
num: '1002',
|
||||
close_btn: false
|
||||
close_btn: false,
|
||||
open_num: 1003,
|
||||
open:0
|
||||
},
|
||||
{
|
||||
title: '上风口',
|
||||
controlState: 0,
|
||||
num: '1004',
|
||||
close_btn: true,
|
||||
progress_num: '1006',
|
||||
progress_state_num: 1005,//状态
|
||||
progress_state:0,//状态值
|
||||
progress_num: '1006',//开度值
|
||||
progress: ''
|
||||
},
|
||||
{
|
||||
|
|
@ -1582,6 +1602,8 @@
|
|||
controlState: 0,
|
||||
num: '1007',
|
||||
close_btn: true,
|
||||
progress_state_num: 1008,//状态
|
||||
progress_state:0,//状态值
|
||||
progress_num: '1009',
|
||||
progress: ''
|
||||
},
|
||||
|
|
@ -1589,13 +1611,19 @@
|
|||
title: '卷被',
|
||||
controlState: 0,
|
||||
num: '1010',
|
||||
close_btn: true
|
||||
close_btn: true,
|
||||
progress_state_num: 1011,//状态
|
||||
progress_state:0,//状态值
|
||||
progress_num: '1012',
|
||||
progress: ''
|
||||
},
|
||||
{
|
||||
title: '除雪',
|
||||
controlState: 0,
|
||||
num: '1013',
|
||||
close_btn: false
|
||||
close_btn: false,
|
||||
open_num: 1014,
|
||||
open:0
|
||||
},
|
||||
],
|
||||
|
||||
|
|
@ -2237,8 +2265,13 @@
|
|||
el.controlState = res.data[el.num];
|
||||
if (el.progress_num) {
|
||||
el.progress = res.data[el.progress_num];
|
||||
el.progress_state = res.data[el.progress_state_num];
|
||||
}
|
||||
if(el.open_num){
|
||||
el.open = res.data[el.open_num]
|
||||
}
|
||||
});
|
||||
console.log(this.fiveControlList,'this.fiveControlList');
|
||||
}
|
||||
|
||||
// 补光灯状态值获取
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -169,7 +169,10 @@ var render = function () {
|
|||
g2 != -1
|
||||
? _vm.__map(_vm.fiveControlList, function (item, index) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var m5 = item.controlState != 0 ? Number(item.progress) : null
|
||||
var m5 =
|
||||
item.controlState != 0 && item.progress_num
|
||||
? _vm.getNumberStatus(item.progress_state)
|
||||
: null
|
||||
return {
|
||||
$orig: $orig,
|
||||
m5: m5,
|
||||
|
|
@ -1675,6 +1678,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
var _default = {
|
||||
data: function data() {
|
||||
return {
|
||||
|
|
@ -1910,36 +1927,57 @@ var _default = {
|
|||
title: '加温水泵',
|
||||
controlState: 0,
|
||||
num: '1000',
|
||||
close_btn: false
|
||||
close_btn: false,
|
||||
open_num: 1001,
|
||||
open: 0
|
||||
}, {
|
||||
title: '地热风机',
|
||||
controlState: 0,
|
||||
num: '1002',
|
||||
close_btn: false
|
||||
close_btn: false,
|
||||
open_num: 1003,
|
||||
open: 0
|
||||
}, {
|
||||
title: '上风口',
|
||||
controlState: 0,
|
||||
num: '1004',
|
||||
close_btn: true,
|
||||
progress_state_num: 1005,
|
||||
//状态
|
||||
progress_state: 0,
|
||||
//状态值
|
||||
progress_num: '1006',
|
||||
//开度值
|
||||
progress: ''
|
||||
}, {
|
||||
title: '下风口',
|
||||
controlState: 0,
|
||||
num: '1007',
|
||||
close_btn: true,
|
||||
progress_state_num: 1008,
|
||||
//状态
|
||||
progress_state: 0,
|
||||
//状态值
|
||||
progress_num: '1009',
|
||||
progress: ''
|
||||
}, {
|
||||
title: '卷被',
|
||||
controlState: 0,
|
||||
num: '1010',
|
||||
close_btn: true
|
||||
close_btn: true,
|
||||
progress_state_num: 1011,
|
||||
//状态
|
||||
progress_state: 0,
|
||||
//状态值
|
||||
progress_num: '1012',
|
||||
progress: ''
|
||||
}, {
|
||||
title: '除雪',
|
||||
controlState: 0,
|
||||
num: '1013',
|
||||
close_btn: false
|
||||
close_btn: false,
|
||||
open_num: 1014,
|
||||
open: 0
|
||||
}],
|
||||
valveControlShow: false,
|
||||
//电磁阀
|
||||
|
|
@ -2635,8 +2673,13 @@ var _default = {
|
|||
el.controlState = res.data[el.num];
|
||||
if (el.progress_num) {
|
||||
el.progress = res.data[el.progress_num];
|
||||
el.progress_state = res.data[el.progress_state_num];
|
||||
}
|
||||
if (el.open_num) {
|
||||
el.open = res.data[el.open_num];
|
||||
}
|
||||
});
|
||||
console.log(_this7.fiveControlList, 'this.fiveControlList');
|
||||
}
|
||||
|
||||
// 补光灯状态值获取
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -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
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Loading…
Reference in New Issue