回路界面开启条件

api/device.js

@@ -9,11 +9,11 @@ module.exports = {
   //删除设备
   delDevice: (Device) => request('/devices?id=' + Device,'DELETE'),
   //获取回路参数
-  getloop:(Device) => request('/devices/relays?id=' + Device,'GET'),
+  getloop:(Device) => request('/devices/relays?deviceId=' + Device,'GET'),
   //配置回路参数
   postloop:(params) => request('/devices/relays','POST',params),
   //控制回路开关
   loopSwitch:(params) => request('/devices/operation','POST',params),
   //获取回路的开关状态
-  loopSwitchstate:(Device,relayid) => request('/devices/relays/status?id='+ Device + '&relay_ids=' + relayid,'GET')
+  loopSwitchstate:(Device) => request('/devices/relays/status?deviceId='+ Device,'GET')
 }

pages/control/control.js

@@ -62,12 +62,14 @@ Page({
     moudule: 0,
     id: 0,
     play: 0,
+    ID:0,//新设备的ID
   },
   //回路开
   Open(e) {
     var that = this
     var moudule = that.data.moudule
-    var id = that.data.id
+    var ID = that.data.ID
+    ID = parseInt(ID)
     var opens = e.target.dataset.open
     var loops = that.data.loops
     var status = that.data.status
@@ -83,7 +85,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 1,
             operation: 1
           })
@@ -96,7 +98,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 2,
             operation: 1
           })
@@ -109,7 +111,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 3,
             operation: 1
           })
@@ -122,7 +124,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 4,
             operation: 1
           })
@@ -135,7 +137,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 5,
             operation: 1
           })
@@ -148,7 +150,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 6,
             operation: 1
           })
@@ -161,7 +163,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 7,
             operation: 1
           })
@@ -174,7 +176,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 8,
             operation: 1
           })
@@ -187,7 +189,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 9,
             operation: 1
           })
@@ -200,7 +202,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 10,
             operation: 1
           })
@@ -213,7 +215,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 11,
             operation: 1
           })
@@ -226,7 +228,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 12,
             operation: 1
           })
@@ -276,7 +278,7 @@ Page({
         //新设备
         else {
           var Switchstate = wx.getStorageSync('lamp')
-          loopSwitchstate(id, opens).then(res => {
+          loopSwitchstate(ID).then(res => {
             if (res.data.code == 0) {
               var relay = res.data.data
               if (relay[opens - 1].status == 1) {
@@ -312,7 +314,8 @@ Page({
   Shut(e) {
     var that = this
     var play = that.data.play
-    var id = that.data.id
+    var ID = that.data.ID
+    ID = parseInt(ID)
     var lamp = wx.getStorageSync('lamp')
     var shuts = e.target.dataset.shut
     var loops = that.data.loops
@@ -329,7 +332,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 1,
             operation: 0
           })
@@ -342,7 +345,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 2,
             operation: 0
           })
@@ -355,7 +358,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 3,
             operation: 0
           })
@@ -368,7 +371,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 4,
             operation: 0
           })
@@ -381,7 +384,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 5,
             operation: 0
           })
@@ -394,7 +397,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 6,
             operation: 0
           })
@@ -407,7 +410,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 7,
             operation: 0
           })
@@ -420,7 +423,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 8,
             operation: 0
           })
@@ -433,7 +436,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 9,
             operation: 0
           })
@@ -446,7 +449,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 10,
             operation: 0
           })
@@ -459,7 +462,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 11,
             operation: 0
           })
@@ -472,7 +475,7 @@ Page({
           })
         } else {
           control.newSwitch({
-            deviceId: id,
+            deviceId: ID,
             relayId: 12,
             operation: 0
           })
@@ -518,7 +521,7 @@ Page({
           })
         } else {
           var Switchstate = wx.getStorageSync('lamp')
-          loopSwitchstate(id, shuts).then(res => {
+          loopSwitchstate(ID).then(res => {
             if (res.data.code == 0) {
               var relay = res.data.data
               if (relay[shuts - 1].status == 1) {
@@ -1441,8 +1444,10 @@ Page({
                     var circuits = group[d].devices[g].circuits
                     var moudule = group[d].devices[g].module
                     var id = group[d].devices[g].id
+                    var ID = group[d].devices[g].deviceId
                     that.setData({
-                      play: 1
+                      play: 1,
+                      ID:ID
                     })
                   }
                 }
@@ -1642,7 +1647,7 @@ Page({
             that.setData({
               loop: loop
             })
-            getloop(id).then(res => {
+            getloop(ID).then(res => {
               if (res.data.code == 0) {
                 let loopState = res.data.data
                 //loopState.length可以视为回路数量
@@ -1670,7 +1675,7 @@ Page({
                 })
               }
             })
-            loopSwitchstate(id, '1,2,3,4,5,6,7,8').then(res => {
+            loopSwitchstate(ID).then(res => {
               if (res.data.code == 0) {
                 var relay = res.data.data
                 for (let e = 0; e < relay.length; e++) {
@@ -1746,8 +1751,10 @@ Page({
               var circuits = group[index].devices[t].circuits
               var moudule = group[index].devices[t].module
               var id = group[index].devices[t].id
+              var ID = group[index].devices[t].deviceId
               that.setData({
-                play: 1
+                play: 1,
+                ID:ID
               })
             }
           }
@@ -1947,7 +1954,7 @@ Page({
       that.setData({
         loop: loop
       })
-      getloop(id).then(res => {
+      getloop(ID).then(res => {
         if (res.data.code == 0) {
           let loopState = res.data.data
           //loopState.length可以视为回路数量
@@ -1975,7 +1982,7 @@ Page({
           })
         }
       })
-      loopSwitchstate(id, '1,2,3,4,5,6,7,8').then(res => {
+      loopSwitchstate(ID).then(res => {
         if (res.data.code == 0) {
           var relay = res.data.data
           for (let e = 0; e < relay.length; e++) {
@@ -2125,6 +2132,7 @@ Page({
                 var Groupno = group[d].id //分组id
                 for (let g = 0; g < group[d].devices.length; g++) {
                   if (deviceNames == group[d].devices[g].deviceName) {
+                    console.log(group[d].devices[g])
                     //旧设备信息
                     if (group[d].devices[g].module == 0) {
                       var id = group[d].devices[g].id //设备的序号
@@ -2143,8 +2151,10 @@ Page({
                       var circuits = group[d].devices[g].circuits
                       var moudule = group[d].devices[g].module
                       var id = group[d].devices[g].id //设备的序号
+                      var deviceID = group[d].devices[g].deviceId//设备ID
                       that.setData({
-                        play: 1
+                        play: 1,
+                        ID:deviceID
                       })
                     }
                   }
@@ -2336,7 +2346,7 @@ Page({
               that.setData({
                 loop: loop
               })
-              getloop(id).then(res => {
+              getloop(deviceID).then(res => {
                 if (res.data.code == 0) {
                   let loopState = res.data.data
                   //loopState.length可以视为回路数量
@@ -2364,7 +2374,7 @@ Page({
                   })
                 }
               })
-              loopSwitchstate(id, '1,2,3,4,5,6,7,8').then(ret => {
+              loopSwitchstate(deviceID).then(ret => {
                 if (ret.data.code == 0) {
                   var relay = ret.data.data
                   for (let e = 0; e < relay.length; e++) {

pages/loop/loop.js

@@ -79,14 +79,16 @@ Page({
     play: 0, //新老设备的页面切换
     //新设备数据
     timeValue: ['00:00', '00:00', '00:00', '00:00', '00:00', '00:00'],
-    weather: ['晴天', '多云', '阴天', '大阴天'],
-    wIndex: 0,
     newcolor: ["#888888", "#888888", "#888888"],
     newfont: ["#cccccc", "#cccccc", "#cccccc"],
     newSwitch: [false, false, false],
-    newSwitchstate: ["", "", "",""],
-    equipment: 0, //记录当前设备的id
+    newSwitchstate: ["", "", ""],
+    equipment: 0, //记录当前设备的序号（服务器传的id）
     subset:0,//记录当前分组的id
+    ID:0,//记录设备的ID
+    // 启动条件（多选框）
+    disabled:false,
+    choice:[false,false,false,false]
   },
   //分组下拉
   changegroup: function (e) {
@@ -120,7 +122,8 @@ Page({
           var Message = enloop.deviceMessage(groupNames, deviceNames)
           that.setData({
             equipment: Message.Device,
-            subset:Message.id
+            subset:Message.id,
+            ID:Message.ID
           }) //记录当前的设备id和分组id
           if (Message.modules == 0) {
             that.setData({
@@ -284,7 +287,7 @@ Page({
                     status: '离线'
                   })
                 }
-                getloop(Message.Device).then(suc => {
+                getloop(Message.ID).then(suc => {
                   if (suc.data.code == 0) {
                     var suc = suc.data.data
                     var index = that.data.indexes
@@ -294,15 +297,26 @@ Page({
                         var newSwitch = that.data.newSwitch
                         var timeValue = that.data.timeValue
                         var newSwitchstate = that.data.newSwitchstate
-                        var weather = that.data.weather
-                        //光控开启条件（天气）
-                        for (let q = 0; q < weather.length; q++) {
-                          if (Suc.lightControlCondition == weather[q]) {
-                            that.setData({
-                              wIndex: q
-                            })
-                          }
+                        var choice = that.data.choice
+                      //光控启动条件
+                      var light = Suc.lightControlCondition.split(',')
+                      for(let i = 0;i < light.length; i++){
+                        switch(light[i]){
+                          case '晴天':
+                            choice[0] = true
+                          break;
+                          case '多云':
+                            choice[1] = true
+                          break;
+                          case '阴天':
+                            choice[2] = true
+                          break;
+                          case '大阴天':
+                            choice[3] = true
+                          break;
                         }
+                      } 
+                      that.setData({choice:choice})
                         //时控1
                         if (Suc.timeCondition1Switch == 1) {
                           newSwitch[0] = true
@@ -594,7 +608,7 @@ Page({
               status: '离线'
             })
           }
-          getloop(Message.Device).then(suc => {
+          getloop(Message.ID).then(suc => {
             if (suc.data.code == 0) {
               var suc = suc.data.data
               var index = that.data.indexes
@@ -604,15 +618,26 @@ Page({
                   var newSwitch = that.data.newSwitch
                   var timeValue = that.data.timeValue
                   var newSwitchstate = that.data.newSwitchstate
-                  var weather = that.data.weather
-                  //光控开启条件（天气）
-                  for (let q = 0; q < weather.length; q++) {
-                    if (Suc.lightControlCondition == weather[q]) {
-                      that.setData({
-                        wIndex: q
-                      })
-                    }
-                  }
+                  var choice = that.data.choice
+                      //光控启动条件
+                      var light = Suc.lightControlCondition.split(',')
+                      for(let i = 0;i < light.length; i++){
+                        switch(light[i]){
+                          case '晴天':
+                            choice[0] = true
+                          break;
+                          case '多云':
+                            choice[1] = true
+                          break;
+                          case '阴天':
+                            choice[2] = true
+                          break;
+                          case '大阴天':
+                            choice[3] = true
+                          break;
+                        }
+                      } 
+                      that.setData({choice:choice})
                   //时控1
                   if (Suc.timeCondition1Switch == 1) {
                     newSwitch[0] = true
@@ -1214,7 +1239,7 @@ Page({
     }
     //新设备
     else{
-      var Equip = that.data.equipment//设备id
+      var Equip = that.data.ID//设备id
       getloop(Equip).then(suc => {
         if (suc.data.code == 0) {
           var suc = suc.data.data
@@ -1225,15 +1250,26 @@ Page({
               var newSwitch = that.data.newSwitch
               var timeValue = that.data.timeValue
               var newSwitchstate = that.data.newSwitchstate
-              var weather = that.data.weather
-              //光控开启条件（天气）
-              for (let q = 0; q < weather.length; q++) {
-                if (Suc.lightControlCondition == weather[q]) {
-                  that.setData({
-                    wIndex: q
-                  })
-                }
-              }
+              var choice = that.data.choice
+                      //光控启动条件
+                      var light = Suc.lightControlCondition.split(',')
+                      for(let i = 0;i < light.length; i++){
+                        switch(light[i]){
+                          case '晴天':
+                            choice[0] = true
+                          break;
+                          case '多云':
+                            choice[1] = true
+                          break;
+                          case '阴天':
+                            choice[2] = true
+                          break;
+                          case '大阴天':
+                            choice[3] = true
+                          break;
+                        }
+                      } 
+                      that.setData({choice:choice})
               //时控1
               if (Suc.timeCondition1Switch == 1) {
                 newSwitch[0] = true
@@ -1445,8 +1481,7 @@ Page({
     this.setData({
       newSwitch: newSwitch,
       newcolor: newcolor,
-      newfont,
-      newfont,
+      newfont:newfont,
       newSwitchstate: newSwitchstate
     })
   },
@@ -1455,24 +1490,27 @@ Page({
     let newcolor = this.data.newcolor
     let newfont = this.data.newfont
     let newSwitchstate = this.data.newSwitchstate
+    let disabled = this.data.disabled
     newSwitch[2] = !newSwitch[2]
     if (newSwitch[2] == true) {
       newcolor[2] = "blue"
       newfont[2] = "white"
       newSwitchstate[2] = "time"
       newSwitchstate[3] = "selector"
+      disabled = false
     } else {
       newcolor[2] = "#888888"
       newfont[2] = "#cccccc"
       newSwitchstate[2] = ""
       newSwitchstate[3] = ""
+      disabled = true
     }
     this.setData({
       newSwitch: newSwitch,
       newcolor: newcolor,
-      newfont,
-      newfont,
-      newSwitchstate: newSwitchstate
+      newfont:newfont,
+      newSwitchstate: newSwitchstate,
+      disabled:disabled
     })
   },
   //固定与经纬的切换
@@ -1595,11 +1633,6 @@ Page({
       timeValue: time
     })
   },
-  bindweatherChange11:function(e){
-    this.setData({
-      wIndex: e.detail.value
-    })
-  },
   //日期调控(图片切换)
   setbuty0: function () {
     var that = this
@@ -2024,7 +2057,7 @@ Page({
                   status: '离线'
                 })
               }
-              getloop(message.Device).then(suc => {
+              getloop(message.ID).then(suc => {
                 if (suc.data.code == 0) {
                   var suc = suc.data.data
                   var index = that.data.indexes
@@ -2034,15 +2067,26 @@ Page({
                       var newSwitch = that.data.newSwitch
                       var timeValue = that.data.timeValue
                       var newSwitchstate = that.data.newSwitchstate
-                      var weather = that.data.weather
-                      //光控开启条件（天气）
-                      for (let q = 0; q < weather.length; q++) {
-                        if (Suc.lightControlCondition == weather[q]) {
-                          that.setData({
-                            wIndex: q
-                          })
+                      var choice = that.data.choice
+                      //光控启动条件
+                      var light = Suc.lightControlCondition.split(',')
+                      for(let i = 0;i < light.length; i++){
+                        switch(light[i]){
+                          case '晴天':
+                            choice[0] = true
+                          break;
+                          case '多云':
+                            choice[1] = true
+                          break;
+                          case '阴天':
+                            choice[2] = true
+                          break;
+                          case '大阴天':
+                            choice[3] = true
+                          break;
                         }
-                      }
+                      } 
+                      that.setData({choice:choice})
                       //时控1
                       if (Suc.timeCondition1Switch == 1) {
                         newSwitch[0] = true
@@ -2149,6 +2193,47 @@ Page({
       that.setData({deviceName:[],groupName:[]})
     }
   },
+  //新设备多选框
+  point1:function(){
+    var choice = this.data.choice
+    if(choice[0] == true){
+      choice[0] = false
+    }
+    else{
+      choice[0] = true
+    }
+    this.setData({choice:choice})
+  },
+  point2:function(){
+    var choice = this.data.choice
+    if(choice[1] == true){
+      choice[1] = false
+    }
+    else{
+      choice[1] = true
+    }
+    this.setData({choice:choice})
+  },
+  point3:function(){
+    var choice = this.data.choice
+    if(choice[2] == true){
+      choice[2] = false
+    }
+    else{
+      choice[2] = true
+    }
+    this.setData({choice:choice})
+  },
+  point4:function(){
+    var choice = this.data.choice
+    if(choice[3] == true){
+      choice[3] = false
+    }
+    else{
+      choice[3] = true
+    }
+    this.setData({choice:choice})
+  },
   //存储数据
   Storedata: function () {
     wx.showToast({
@@ -2559,7 +2644,8 @@ Page({
         var crrs = that.data.crr //回路名称集合
         var Crrindex = that.data.indexes //回路下标
         Crrindex = Crrindex + 1
-        var equipment = that.data.equipment //设备id
+        var ID = that.data.ID
+        ID = parseInt(ID)
         var newSwitch = that.data.newSwitch //设备开关
         for(let x = 0;x < newSwitch.length; x++){
           if(newSwitch[x] == true){
@@ -2570,10 +2656,25 @@ Page({
           }
         }
         //开启条件（天气）
-        var weather = that.data.weather
-        var wIndex = that.data.wIndex
+        var choice = that.data.choice
+        var Choice = ''
+        if(choice[0] == true){
+          Choice += '晴天,'
+        }
+        if(choice[1] == true){
+          Choice += '多云,'
+        }
+        if(choice[2] == true){
+          Choice += '阴天,'
+        }
+        if(choice[3] == true){
+          Choice += '大阴天,'
+        }
+        if(Choice.length > 0){
+          Choice = Choice.slice(0,Choice.length-1)
+        }
         var postobject = {
-          "deviceId": equipment,
+          "deviceId": ID,
           "relays": [{
             "relayId": Crrindex,  
             "name": crrs[Crrindex - 1],
@@ -2586,7 +2687,7 @@ Page({
             "lightControlSwitch": newSwitch[2],
             "lightControlStart": timeValues[4],
             "lightControlEnd": timeValues[5],
-            "lightControlCondition": weather[wIndex],
+            "lightControlCondition": Choice,
             "status": null
           }]
         }
@@ -2695,7 +2796,8 @@ Page({
         var message = enloop.deviceMessage(currentGroup, currentDevice)
         that.setData({
           equipment: message.Device,
-          subset:message.id
+          subset:message.id,
+          ID:message.ID
         }) //记录当前的设备id和分组id
         //旧设备
         if (message.modules == 0) {
@@ -2850,7 +2952,6 @@ Page({
           })
           //新设备在线状态
           getDevice(message.Device, message.id).then(nrg => {
-            console.log([message.Device,message.id])
             if (nrg.data.code == 0) {
               var nrg = nrg.data.data
               if (nrg[0].status == 1) {
@@ -2862,7 +2963,7 @@ Page({
                   status: '离线'
                 })
               }
-              getloop(message.Device).then(suc => {
+              getloop(message.ID).then(suc => {
                 if (suc.data.code == 0) {
                   var suc = suc.data.data
                   var index = that.data.indexes
@@ -2872,15 +2973,26 @@ Page({
                       var newSwitch = that.data.newSwitch
                       var timeValue = that.data.timeValue
                       var newSwitchstate = that.data.newSwitchstate
-                      var weather = that.data.weather
-                      //光控开启条件（天气）
-                      for (let q = 0; q < weather.length; q++) {
-                        if (Suc.lightControlCondition == weather[q]) {
-                          that.setData({
-                            wIndex: q
-                          })
+                      var choice = that.data.choice
+                      //光控启动条件
+                      var light = Suc.lightControlCondition.split(',')
+                      for(let i = 0;i < light.length; i++){
+                        switch(light[i]){
+                          case '晴天':
+                            choice[0] = true
+                          break;
+                          case '多云':
+                            choice[1] = true
+                          break;
+                          case '阴天':
+                            choice[2] = true
+                          break;
+                          case '大阴天':
+                            choice[3] = true
+                          break;
                         }
-                      }
+                      } 
+                      that.setData({choice:choice})
                       //时控1
                       if (Suc.timeCondition1Switch == 1) {
                         newSwitch[0] = true
@@ -2928,6 +3040,7 @@ Page({
                       var newfonts = that.data.newfont
                       var newcolors = that.data.newcolor
                       var newSwitchstates = that.data.newSwitchstate
+                      var disableds = that.data.disabled
                       if (newSwitchs[0] == true) {
                         newfonts[0] = "white"
                         newcolors[0] = "blue"
@@ -2950,16 +3063,19 @@ Page({
                         newfonts[2] = "white"
                         newcolors[2] = "blue"
                         newSwitchstates[2] = "time"
+                        disableds = false
                       } else {
                         newfonts[2] = "#cccccc"
                         newcolors[2] = "#888888"
                         newSwitchstates[2] = ""
+                        disableds = true
                       }
                       that.setData({
                         newcolor: newcolors,
                         newfont: newfonts,
                         newSwitch: newSwitchs,
-                        newSwitchstate: newSwitchstates
+                        newSwitchstate: newSwitchstates,
+                        disabled:disableds
                       })
                     }
                   }

pages/loop/loop.wxml

@@ -160,21 +160,23 @@
   </view>
   <!-- 光控 -->
   <view class="newlight">
-    <text style="top:2%;letter-spacing:20px">光控</text>
+    <text style="left: 2%;top: 30%;">光</text>
+    <text style="left: 2%;bottom: 30%;">控</text>
     <switch bindchange="Controltime7" checked="{{newSwitch[2]}}"></switch>
     <picker start="00:00" end="23:59" value="{{timeValue[4]}}" bindchange="bindTimeChange9" mode="{{newSwitchstate[2]}}">
         <view class="lightstartTime" style="background-color: {{newcolor[2]}};color:{{newfont[2]}}">
         {{timeValue[4]}}</view>
     </picker>
-    <text style="left: 44%;">至</text>
+    <text style="left: 67%;top: 28%;">至</text>
     <picker start="00:00" end="23:59" value="{{timeValue[5]}}" bindchange="bindTimeChange10" mode="{{newSwitchstate[2]}}">
         <view class="lightendTime" style="background-color: {{newcolor[2]}};color:{{newfont[2]}}">
         {{timeValue[5]}}</view>
     </picker>
-    <picker mode="{{newSwitchstate[3]}}" range="{{weather}}" value="{{wIndex}}" bindchange="bindweatherChange11">
-      <view class="weather" style="background-color: {{newcolor[2]}};color:{{newfont[2]}}">{{weather[wIndex]}}</view>
-    </picker>
-    <text style="bottom:7%;letter-spacing:10px">(生效时间)</text>
+    <checkbox class="check1" disabled="{{disabled}}" checked="{{choice[0]}}" bindtap="point1">晴天</checkbox>
+    <checkbox class="check2" disabled="{{disabled}}" checked="{{choice[1]}}" bindtap="point2">多云</checkbox>
+    <checkbox class="check3" disabled="{{disabled}}" checked="{{choice[2]}}" bindtap="point3">阴天</checkbox>
+    <checkbox class="check4" disabled="{{disabled}}" checked="{{choice[3]}}" bindtap="point4">大阴天</checkbox>
+    <text style="top:5%;letter-spacing:10px">(生效时间)</text>
   </view>
 </view>
 <!-- 新设备刷新存储数据 -->

pages/loop/loop.wxss

@@ -304,7 +304,7 @@ page{
 .newlight{
   background-color: cornflowerblue;
   width: 100%;
-  height: 30%;
+  height: 42%;
   margin-top: 1%;
   display: flex;
   align-items: center;
@@ -314,22 +314,23 @@ page{
 
 .newlight switch{
   position: absolute;
-  left: 2%;
+  left: 15%;
 }
 
 .newlight text{
   font-size: calc(100vw * 18/375);
   font-weight: 550;
   position: absolute;
+  left: 48%;
 }
 
 .lightstartTime{
   position: absolute;
-  left: 22%;
-  top:35%;
+  left: 42%;
+  top:25%;
   background-color: rgb(33, 111, 156);
   width: 20%;
-  height: 30%;
+  height: 20%;
   border-radius: 10px;
   display: flex;
   align-items: center;
@@ -339,11 +340,11 @@ page{
 
 .lightendTime{
   position: absolute;
-  left: 52%;
-  top:35%;
+  left: 77%;
+  top:25%;
   background-color: rgb(33, 111, 156);
   width: 20%;
-  height: 30%;
+  height: 20%;
   border-radius: 10px;
   display: flex;
   align-items: center;
@@ -363,4 +364,36 @@ page{
   align-items: center;
   justify-content: center;
   font-size: calc(100vw * 16/375);
+}
+/* 条件多选框 */
+.check1{
+  position: absolute;
+  top: 55%;
+  left: 45%;
+  font-size: calc(100vw * 16/375);
+  font-weight: 550;
+}
+
+.check2{
+  position: absolute;
+  top: 55%;
+  left: 70%;
+  font-size: calc(100vw * 16/375);
+  font-weight: 550;
+}
+
+.check3{
+  position: absolute;
+  top: 80%;
+  left: 45%;
+  font-size: calc(100vw * 16/375);
+  font-weight: 550;
+}
+
+.check4{
+  position: absolute;
+  top: 80%;
+  left: 70%;
+  font-size: calc(100vw * 16/375);
+  font-weight: 550;
 }

pages/scene/scene.js

@@ -36,7 +36,6 @@ Page({
     getGroup().then(res => {
       if(res.data.code == 0){
         var data = res.data.data
-        console.log(data)
         if(data != null){
           for(let i = 0;i <data.length;i++){
             if(data[i].devices != null){

project.config.json

@@ -47,7 +47,7 @@
     "checkSiteMap": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.19.4",
+  "libVersion": "2.19.6",
   "appid": "wxed5ed92d709605cf",
   "projectname": "miniprogram-92",
   "condition": {},

utils/control.js

@@ -97,8 +97,8 @@ function newSwitch(swit){
 }
 
 //回路开/关读取(新设备)
-function newswitchReal(Device,relayid){
-  loopSwitchstate(Device,relayid).then(res=>{
+function newswitchReal(Device){
+  loopSwitchstate(Device).then(res=>{
     if(res.data.code == 0){
       var relay = res.data.data
       if(relay[0].status == 1){

utils/loop.js

@@ -67,7 +67,8 @@ function deviceMessage(groupNames, deviceNames) {
             var loopNum = group[d].devices[g].circuits
             var loopnum = loopNum.split(',')
             var modules = group[d].devices[g].module
-            return {id,Device,loopnum,modules}
+            var ID = group[d].devices[g].deviceId
+            return {id,Device,loopnum,modules,ID}
           }
         }
       }