anxiaoxia 1 mês atrás
pai
commit
cb0241df8a

+ 23 - 17
src/views/envmonitor/taiguv1/components/Volumn/index.vue

@@ -12,7 +12,13 @@
         <div class="left">
           <div class="text">{{ $t(`audio.音响`) }}</div>
           <div class="status">
-            {{ audioData.isOpen ? `${audioData.onlineStatus ? $t(`audio.${audioData.onlineStatus}`) : $t(`audio.1`)} ${$t(`audio.播放中`)}` : $t(`audio.已静音`) }}
+            {{
+              audioData.isOpen
+                ? `${audioData.onlineStatus ? $t(`audio.${audioData.onlineStatus}`) : $t(`audio.1`)} ${$t(
+                    `audio.播放中`
+                  )}`
+                : $t(`audio.已静音`)
+            }}
           </div>
         </div>
         <div class="temp" v-if="audioData.isOpen">{{ audioData.volumnSet || 0 }}</div>
@@ -88,41 +94,41 @@ const setAudioStatus = type => {
       }
     })
   }
-console.log(audioData.value[type],'11111111');
+  console.log(audioData.value[type], '11111111')
 
   const params = deviceControl.assemblyAudioCommand(customRound(audioData.value[type]), type, props.equipList)
   deviceControl.sendCommands(params)
 }
 const compareStatus = data => {
-    
+  const updateAudioData = () => {
+    audioData.value = {
+      ...data,
+      isOpen: data.isOpen,
+      volumnSet: allAudioStatus.value?.lastStatus?.lastValue ?? data.volumnSet
+    }
+  }
   if (allAudioStatus.value.all) {
-    if (allAudioStatus.value.all.lastSwitchStatus == data.isOpen) {
+    const { lastSwitchStatus } = allAudioStatus.value.all
+    if (lastSwitchStatus == data.isOpen) {
       store.dispatch('taiguv1/setAudioStatus', {
         id: 'all',
         status: {
           loading: false,
-          lastSwitchStatus: data.isOpen
+          lastSwitchStatus: null
         }
       })
-
-      audioData.value = {
-        ...data,
-        isOpen: data.isOpen,
-        volumnSet: allAudioStatus.value?.lastStatus?.lastValue ?? data.volumnSet
-      }
+      updateAudioData()
+    } else if (lastSwitchStatus === null) {
+      updateAudioData()
     } else {
       audioData.value = {
         ...data,
-        isOpen: allAudioStatus.value.all.lastSwitchStatus,
+        isOpen: lastSwitchStatus,
         volumnSet: allAudioStatus.value?.lastStatus?.lastValue ?? data.volumnSet
       }
     }
   } else {
-    audioData.value = {
-      ...data,
-      isOpen: data.isOpen,
-      volumnSet: allAudioStatus.value?.lastStatus?.lastValue ?? data.volumnSet
-    }
+    updateAudioData()
   }
 }
 </script>

+ 1 - 1
src/views/envmonitor/taiguv1/index.vue

@@ -567,7 +567,7 @@ const updateScreenStatus = data => {
     let obj = equipList[0] || {}
     screenStatus.value = {
         isOpen: obj.inCloudSet == 1,
-        runStatus: obj.inCloudSet || 1,
+        runStatus: obj.runStatus || 2,
         lastSwitchStatus: screenStatus.value.lastSwitchStatus,
         screenStatus: screenStatus.value.switchLoading
     }