فهرست منبع

fix:会议室场景

anxiaoxia 4 هفته پیش
والد
کامیت
fc2ff3bfc6

+ 1 - 1
src/hooks/useDeviceControl.js

@@ -69,7 +69,7 @@ const initDeviceCommand = data => {
     commands.push({
       id: item.id,
       code: item.codeBright,
-      value: 80
+      value: item.valueBright
     })
 
     // 色温指令

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 3612 - 0
src/views/envmonitor/taiguv1/const copy.js


+ 56 - 56
src/views/envmonitor/taiguv1/const.js

@@ -107,8 +107,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500055bf3b356b48c4c1a91695b7ed77c8ff7",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -202,8 +202,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500055bf3b356b48c4c1a91695b7ed77c8ff7",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -293,8 +293,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500055bf3b356b48c4c1a91695b7ed77c8ff7",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -384,8 +384,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500055bf3b356b48c4c1a91695b7ed77c8ff7",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -1151,8 +1151,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500056d1d61316e004f638640d1a6d007d118",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -1625,8 +1625,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -1710,8 +1710,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -1791,8 +1791,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -1872,8 +1872,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -1958,8 +1958,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2039,8 +2039,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2124,8 +2124,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2205,8 +2205,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005755f682ff2f24973ac6a9aeb647b0c54",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2305,14 +2305,14 @@ export const roomSourceData = [
               {
                 id: "Eq330105000581073d3037b0446c9dd36647e70bb175",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
               {
                 id: "Eq330105000588242a479c334d68b2c2d11f3e994e28",
                 name: "窗纱",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2397,14 +2397,14 @@ export const roomSourceData = [
               {
                 id: "Eq330105000581073d3037b0446c9dd36647e70bb175",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
               {
                 id: "Eq330105000588242a479c334d68b2c2d11f3e994e28",
                 name: "窗纱",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2484,14 +2484,14 @@ export const roomSourceData = [
               {
                 id: "Eq330105000581073d3037b0446c9dd36647e70bb175",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
               {
                 id: "Eq330105000588242a479c334d68b2c2d11f3e994e28",
                 name: "窗纱",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -2576,14 +2576,14 @@ export const roomSourceData = [
               {
                 id: "Eq330105000581073d3037b0446c9dd36647e70bb175",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
               {
                 id: "Eq330105000588242a479c334d68b2c2d11f3e994e28",
                 name: "窗纱",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3084,8 +3084,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005fb272e6117d34e8e9b12cbcaf1215824",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3160,8 +3160,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005fb272e6117d34e8e9b12cbcaf1215824",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3231,8 +3231,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005fb272e6117d34e8e9b12cbcaf1215824",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3302,8 +3302,8 @@ export const roomSourceData = [
               {
                 id: "Eq3301050005fb272e6117d34e8e9b12cbcaf1215824",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3392,8 +3392,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500054570d1f28e984342b9b47381a0b0782e",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3471,8 +3471,8 @@ export const roomSourceData = [
               {
                 id: "Eq330105000520b4b76a7a824a8a90797663f00d7d11",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [
@@ -3550,8 +3550,8 @@ export const roomSourceData = [
               {
                 id: "Eq33010500050fd8fd7e8973407f919daffc34c47b2c",
                 name: "窗帘",
-                value: 0,
-                code: "EquipOffSet",
+                value: 2,
+                code: "EquipOnSet",
               },
             ],
             MIDS: [

+ 3 - 2
src/views/envmonitor/taiguv1/index.vue

@@ -393,9 +393,9 @@ const getSpaceScene = params => {
                         let endTimestamp = new Date(endTime).getTime()
 
                         if (nowTimestamp + 1000 * 30 >= startTimestamp && nowTimestamp <= endTimestamp + 1000 * 30) {
-                            // 会议场景
+                            // TODO 会议场景
                             if (!hasExecutedModeScene.value) {
-                                spaceScene.value = modeScene
+                                spaceScene.value = modeScene || 'Meeting' // Meeting SceneDefaul
                                 initSpace()
                                 sendCommand()
                                 hasExecutedModeScene.value = true
@@ -447,6 +447,7 @@ const sendCommand = () => {
     // 组装指令
     let devices = modeData.value.find(item => item.id == modeType.value)
     let commands = deviceControl.initDeviceCommand(devices)
+
     deviceControl.sendCommands(commands)
 }