diff --git a/src/pages.json b/src/pages.json index 0792086..648f733 100644 --- a/src/pages.json +++ b/src/pages.json @@ -270,6 +270,12 @@ } }, { + "path": "pages/index/airC_manage", + "style" : { + "navigationBarTitleText": "空调管理" + } + }, + { "path": "pages/index/lease_ball_box_manage", "style" : { "navigationBarTitleText": "租球机管理" diff --git a/src/subpackage/device/pages/index/airC_manage.vue b/src/subpackage/device/pages/index/airC_manage.vue new file mode 100644 index 0000000..48d48ea --- /dev/null +++ b/src/subpackage/device/pages/index/airC_manage.vue @@ -0,0 +1,8 @@ + + + + + diff --git a/src/subpackage/device/pages/index/index.vue b/src/subpackage/device/pages/index/index.vue index 9124623..940bc1c 100644 --- a/src/subpackage/device/pages/index/index.vue +++ b/src/subpackage/device/pages/index/index.vue @@ -43,18 +43,18 @@ const tabArr = [ {id: 3, name: '风扇', path: `/pages/switch_manage/switch_manage`}, {id: 4, name: '门禁', path: `/pages/switch_manage/switch_manage`}, {id: 5, name: '门闸', path: `/pages/switch_manage/switch_manage`}, - {id: 6, name: '平板', path: `/pages/switch_manage/switch_manage`}, + // {id: 6, name: '平板', path: `/pages/switch_manage/switch_manage`}, {id: 7, name: '售货柜', path: `/pages/device_manage/device_manage`}, {id: 8, name: '租售柜', path: `/pages/device_manage/device_manage`}, {id: 9, name: '储物柜', path: `/pages/device_manage/device_manage`}, {id: 10, name: '咖啡机', path: `/pages/device_manage/device_manage`}, {id: 11, name: '水阀', path: `/pages/switch_manage/switch_manage`}, - {id: 12, name: '互动设备', path: `/pages/switch_manage/switch_manage`}, - {id: 13, name: '监控', path: `/pages/switch_manage/switch_manage`}, + // {id: 12, name: '互动设备', path: `/pages/switch_manage/switch_manage`}, + // {id: 13, name: '监控', path: `/pages/switch_manage/switch_manage`}, {id: 14, name: '音响', path: `/pages/audio_manage/audio_manage`}, //audio_manage - {id: 15, name: '机器人', path: ``}, - {id: 16, name: '租球机', path: ``}, - {id: 17, name: '窗帘', path: `/pages/switch_manage/switch_manage`}, + // {id: 15, name: '机器人', path: ``}, + // {id: 16, name: '租球机', path: ``}, + // {id: 17, name: '窗帘', path: `/pages/switch_manage/switch_manage`}, {id: 18, name: '路由器', path: `/pages/switch_manage/switch_manage`}, {id: 19, name: '物联卡', path: `/pages/switch_manage/switch_manage`}, diff --git a/src/subpackage/device/pages/index/sunblind_manage.vue b/src/subpackage/device/pages/index/sunblind_manage.vue index 2e954d6..947d1c9 100644 --- a/src/subpackage/device/pages/index/sunblind_manage.vue +++ b/src/subpackage/device/pages/index/sunblind_manage.vue @@ -33,8 +33,8 @@ - 目前状态{{voiceLevel}}% - 目前状态{{sliderLevel}}% + 0% @@ -43,7 +43,7 @@ - + 关闭 @@ -51,7 +51,7 @@ 暂停 - + 开启 @@ -91,7 +91,7 @@ return { update_time: new Date(), accountList: false, - voiceLevel:10,//测试回显给10 + sliderLevel:10,//测试回显给10 sliceLength:0, boxOne:false, //窗帘关闭方式 true: 从左到右, false:从两边到中间 } @@ -100,7 +100,7 @@ console.log("opts:", opts); this.mac = opts.mac; this.updateList() - this.setSliceLength(this.voiceLevel) + this.setSliceLength(this.sliderLevel) // try { // util.showLoad(); // let _brandInfo = await this.$store.dispatch('getBrandInfo'); @@ -145,9 +145,18 @@ isTip: true }) }, + handleClose(){ + let val = this.sliderLevel>95 ? 100 : this.sliderLevel+5 + this.setSliceLength(val) + }, + handleOpen(){ + + let val = this.sliderLevel<5 ? 0 : this.sliderLevel-5 + this.setSliceLength(val) + }, setSliceLength(value){ // this.level = value - this.voiceLevel = value + this.sliderLevel = value this.sliceLength = Math.floor(value/(this.boxOne?5:10)) }, clickGoMonitorAccount() { diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 1640a17..3f691e4 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -7,7 +7,7 @@ - + {{e.hardware_name || '-'}} @@ -25,7 +25,7 @@ - + {{pageInfo.openName || '-'}} @@ -225,7 +225,9 @@ export default { }) .catch(util.hideLoad) }, - + controlDevice(e){ + util.routeTo(`/subpackage/device/pages/index/lot_manage?mac=${switchInfo.hardware_standard}`, 'nT'); + }, // 按钮操作, status 0 -> 关(左), 1 -> 开(右) ,2 -> 长开 ,3 -> 定时, 4 ->详情(自定义) operateBtn: util.debounce(function({ switchInfo, status }){ console.log("icon tap status: ",status,switchInfo) @@ -234,7 +236,7 @@ export default { //针对门禁没有关按钮发两条命令->开&关 20201224 后端: 直接发两条 关的那条这里填5 然后你那边不用管返回 //新增定时/长按拦截判断 - if(status == 2) return util.showNone("未对接,前端等待接口中...") + if(status == 2) return util.showNone("该功能暂未开放") if(status == 4){