diff --git a/pages.json b/pages.json index 4498b63..aede24b 100644 --- a/pages.json +++ b/pages.json @@ -219,12 +219,6 @@ "navigationBarTitleText": "添加联机设备" } }, - { - "path": "pages/210/historyRecords/index", - "style": { - "navigationBarTitleText": "历史记录" - } - }, { "path": "pages/210/call/index", "style": { diff --git a/pages/210/deviceControl/index.vue b/pages/210/deviceControl/index.vue index 0b7e946..10115da 100644 --- a/pages/210/deviceControl/index.vue +++ b/pages/210/deviceControl/index.vue @@ -641,33 +641,37 @@ this.lightModeA = false; // console.log("保存的时间:", time); }, - handleIconClick(index) { - // 历史记录 - if (index === 0) { + handleIconClick(s, e) { + if (s === 0) { + console.log("消息",s); uni.navigateTo({ - url: '/pages/210/historyRecords/index', - events: { - ack: function(data) {} - }, + url: '/pages/670/History', success: (res) => { - res.eventChannel.emit('share', { - data: this.itemInfo, + res.eventChannel.emit('detailData', { + data: this.device, }); } }) - } else { + return; + } else if (s === 1) { + console.log("分享"); uni.navigateTo({ - url: '/pages/6170/share/index', + url: '/pages/common/share/index', events: { ack: function(data) {} }, success: (res) => { + let json = { + persissonType: '210' + }; + Object.assign(json, this.device); res.eventChannel.emit('share', { - data: this.itemInfo, + data: json }); } }) } + }, // 分享 diff --git a/pages/210/historyRecords/index.vue b/pages/210/historyRecords/index.vue deleted file mode 100644 index d9802c3..0000000 --- a/pages/210/historyRecords/index.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - - - \ No newline at end of file diff --git a/utils/Common.js b/utils/Common.js index 5b95b4d..edb350c 100644 --- a/utils/Common.js +++ b/utils/Common.js @@ -218,13 +218,13 @@ export default { value: "1", label: "灯光模式", checked: false, - type: ['210', '6170', '670'] + type: ['6170', '670'] }, { value: "2", label: "激光模式", checked: false, - type: ['210', '6170'] + type: ['6170'] }, { value: "3", @@ -259,7 +259,37 @@ export default { label: "SOS", checked: false, type: ['670'] - } + }, + { + value: "43", + label: "联机设备", + checked: false, + type: ['210'] + }, + { + value: "44", + label: "报警声音", + checked: false, + type: ['210'] + }, + { + value: "45", + label: "自动报警", + checked: false, + type: ['210'] + }, + { + value: "46", + label: "手动报警", + checked: false, + type: ['210'] + }, + { + value: "47", + label: "报警时长", + checked: false, + type: ['210'] + }, ] let arr = [];