隧道模型

web/src/view/admin/dataDashboard/dataDashboard.vue

@@ -156,6 +156,8 @@ const initThree = () => {
 let materialOne = reactive({})
 let materialTwo = reactive({})
 
+const relayList = reactive([])
+
 
 // 加载 GLB 模型
 const loadModel = () => {
@@ -209,18 +211,14 @@ const changeTransparency = (e) => {
       }
     })
   } else {
-    let relay = lampData.devices[0].deviceRelays
+    let relay = relayList[0].deviceRelays
     for (let i = 0; i < relay.length; i++) {
-      if (i < option[e][2]) {
-        relay[i].state = true
-      } else {
-        relay[i].state = false
-      }
+      relay[i].state = i < option[e][2];
     }
     for (let j = 0; j < relay.length; j++) {
       deviceSwitch({
         tunnelSn: lampData.tunnelSn,
-        radarId: lampData.devices[0].radarId,
+        radarId: relayList[0].radarId,
         relayId: relay[j].relayId,
         state: relay[j].state
       }).then(res => {
@@ -251,18 +249,14 @@ const changeTransparencyTwo = (e) => {
       }
     })
   } else {
-    let relay = lampData.devices[1].deviceRelays
+    let relay = relayList[1].deviceRelays
     for (let i = 0; i < relay.length; i++) {
-      if (i < option[e][2]) {
-        relay[i].state = true
-      } else {
-        relay[i].state = false
-      }
+      relay[i].state = i < option[e][2];
     }
     for (let j = 0; j < relay.length; j++) {
       deviceSwitch({
         tunnelSn: lampData.tunnelSn,
-        radarId: lampData.devices[1].radarId,
+        radarId: relayList[1].radarId,
         relayId: relay[j].relayId,
         state: relay[j].state
       }).then(res => {
@@ -278,6 +272,7 @@ const changeTransparencyTwo = (e) => {
 const lampData = reactive({})
 
 const judgeLamp = () => {
+  relayList.length = 0
   if (lampData.switchType === '单灯控制器') {
     let val1 = lampData.lampValue1
     let val2 = lampData.lampValue2
@@ -291,8 +286,13 @@ const judgeLamp = () => {
     transparencyTwo.value = judge[val1][1]
     materialTwo.opacity = judge[val2][0]
   } else if(lampData.switchType === '四路控制器') {
-      let deviceLamp1 = lampData.devices[0].deviceRelays
-      let deviceLamp2 = lampData.devices[1].deviceRelays
+    lampData.devices.forEach(item => {
+      if (item.genre === 6) {
+        relayList.push(item)
+      }
+    })
+    let deviceLamp1 = relayList[0].deviceRelays
+    let deviceLamp2 = relayList[1].deviceRelays
       let count1 = 0
       let count2 = 0
       deviceLamp1.forEach(item => {

web/src/view/screen/dataScreen.vue

@@ -184,7 +184,6 @@ const changeTransparency = (e) => {
     })
   } else {
     let relay = relayList[0].deviceRelays
-    console.log(relayList[0])
     for (let i = 0; i < relay.length; i++) {
       relay[i].state = i < option[e][2];
     }
@@ -224,11 +223,7 @@ const changeTransparencyTwo = (e) => {
   } else {
     let relay = relayList[1].deviceRelays
     for (let i = 0; i < relay.length; i++) {
-      if (i < option[e][2]) {
-        relay[i].state = true
-      } else {
-        relay[i].state = false
-      }
+      relay[i].state = i < option[e][2];
     }
     for (let j = 0; j < relay.length; j++) {
       deviceSwitch({