diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index 28208e2..8cfb941 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -23,6 +23,8 @@ power_on: '通电', power_off: '断电', last: '恢复最近一次的状态', + normal: '正常', + alarm: '警报' } }, diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index 28208e2..8cfb941 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -23,6 +23,8 @@ power_on: '通电', power_off: '断电', last: '恢复最近一次的状态', + normal: '正常', + alarm: '警报' } }, diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 2bb6692..0446b17 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -29,10 +29,15 @@ cooker_state_r: '右灶状态', cooker_remain_time_l: '左灶保持时间', cooker_remain_time_r: '右灶保持时间', - runtime_total: '累计工作时间', + runtime_total: '累计工作时间', + pm25: 'PM2.5', + countdown_set: '倒计时', + countdown_left: '倒计时剩余时间', + filter: '滤芯使用率', }, typeValue: { close: '关', + cancle: '取消', } }, @@ -60,7 +65,7 @@ getDeviceDetails(device_id), getDevFunctions(device_id), ]); - + console.log('总状态', functions) const { roDpList, rwDpList } = this.reducerDpList(status, functions) // 获取头部展示功能点信息 @@ -82,7 +87,9 @@ const devide_img = 'https://images.tuyacn.com/' + icon; this.setData({ titleItem, roDpList, rwDpList, device_name: name, isRoDpListShow, isRwDpListShow, roDpListLength, icon, devide_img}) - }, + console.log('rwDpList可控制状态', rwDpList) + console.log('roDpList', roDpList) + }, // 分离只上报功能点,可上报可下发功能点 reducerDpList: function (status, functions) { @@ -92,7 +99,12 @@ if (status && status.length) { status.map((item) => { const { code, value } = item; - let isExit = functions.find(element => element.code == code); + let isExit = functions.find(element => element.code == code); + // 单独处理空气净化器的倒计时设置 + // if(code === 'countdown_set' && functions.find(element => element.code == 'countdown')) { + // isExit = functions.find(element => element.code == 'countdown') + // } + console.log('isExit',isExit) if (isExit) { let rightvalue = value // 兼容初始拿到的布尔类型的值为字符串类型 @@ -119,6 +131,7 @@ return { roDpList, rwDpList } }, + //下发指令 sendDp: async function (e) { const { dpCode, value } = e.detail const { device_id } = this.data @@ -129,6 +142,7 @@ }) }, + //更新状态 updateStatus: function (newStatus) { let { roDpList, rwDpList, titleItem } = this.data diff --git a/packageA/home_center/common_panel/components/Enum/index.js b/packageA/home_center/common_panel/components/Enum/index.js index 28208e2..8cfb941 100644 --- a/packageA/home_center/common_panel/components/Enum/index.js +++ b/packageA/home_center/common_panel/components/Enum/index.js @@ -23,6 +23,8 @@ power_on: '通电', power_off: '断电', last: '恢复最近一次的状态', + normal: '正常', + alarm: '警报' } }, diff --git a/packageA/home_center/common_panel/index.js b/packageA/home_center/common_panel/index.js index 2bb6692..0446b17 100644 --- a/packageA/home_center/common_panel/index.js +++ b/packageA/home_center/common_panel/index.js @@ -29,10 +29,15 @@ cooker_state_r: '右灶状态', cooker_remain_time_l: '左灶保持时间', cooker_remain_time_r: '右灶保持时间', - runtime_total: '累计工作时间', + runtime_total: '累计工作时间', + pm25: 'PM2.5', + countdown_set: '倒计时', + countdown_left: '倒计时剩余时间', + filter: '滤芯使用率', }, typeValue: { close: '关', + cancle: '取消', } }, @@ -60,7 +65,7 @@ getDeviceDetails(device_id), getDevFunctions(device_id), ]); - + console.log('总状态', functions) const { roDpList, rwDpList } = this.reducerDpList(status, functions) // 获取头部展示功能点信息 @@ -82,7 +87,9 @@ const devide_img = 'https://images.tuyacn.com/' + icon; this.setData({ titleItem, roDpList, rwDpList, device_name: name, isRoDpListShow, isRwDpListShow, roDpListLength, icon, devide_img}) - }, + console.log('rwDpList可控制状态', rwDpList) + console.log('roDpList', roDpList) + }, // 分离只上报功能点,可上报可下发功能点 reducerDpList: function (status, functions) { @@ -92,7 +99,12 @@ if (status && status.length) { status.map((item) => { const { code, value } = item; - let isExit = functions.find(element => element.code == code); + let isExit = functions.find(element => element.code == code); + // 单独处理空气净化器的倒计时设置 + // if(code === 'countdown_set' && functions.find(element => element.code == 'countdown')) { + // isExit = functions.find(element => element.code == 'countdown') + // } + console.log('isExit',isExit) if (isExit) { let rightvalue = value // 兼容初始拿到的布尔类型的值为字符串类型 @@ -119,6 +131,7 @@ return { roDpList, rwDpList } }, + //下发指令 sendDp: async function (e) { const { dpCode, value } = e.detail const { device_id } = this.data @@ -129,6 +142,7 @@ }) }, + //更新状态 updateStatus: function (newStatus) { let { roDpList, rwDpList, titleItem } = this.data diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 41f1960..80943c1 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -4,8 +4,8 @@ + +