Browse Source

fix:音响

anxiaoxia 1 month ago
parent
commit
c8486d69a0

+ 2 - 1
src/hooks/useDeviceControl.js

@@ -16,7 +16,7 @@ const COMMAND_MAPPINGS = {
     isOpen: () => ({ code: 'EquipOffSet', value: val => (val ? 1 : 0) })
   },
   audio: {
-    isOpen: item => ({ code: item.inCloudSetCode, value: val => (val ? 0 : 1) }),
+    isOpen: item => ({ code: item.inCloudSetCode, value: val => (val ? 1 : 0) }),
     volumnSet: item => ({ code: item.manualAutoSetCode, value: val => val })
   },
   screen: {
@@ -35,6 +35,7 @@ const assemblyCommand = type => (commandVal, command, data) => {
 
   return dataArray.map(item => {
     const commandConfig = COMMAND_MAPPINGS[type][command](item)
+    
     return {
       id: item.id,
       code: commandConfig.code,

+ 6 - 2
src/utils/index.ts

@@ -1,8 +1,8 @@
 // Parse the time to string
-import { store } from '@/store'
 import Keys from '@/constant/key'
-import any = jasmine.any
+import { store } from '@/store'
 import Cookies from 'js-cookie'
+import any = jasmine.any
 
 export const parseTime = (
   time?: object | string | number | null,
@@ -713,6 +713,10 @@ export const fix: any = function (d: any) {
 
 // 自定义四舍五入
 export const customRound = (number: number) => {
+ // 如果传入的是布尔值,直接返回
+  if (typeof number === 'boolean') {
+    return number;
+  }
   // 确保输入在0-100范围内
   if (number < 0) return 0;
   if (number > 100) return 100;

+ 2 - 1
src/views/envmonitor/taiguv1/components/Volumn/index.vue

@@ -88,8 +88,9 @@ const setAudioStatus = type => {
       }
     })
   }
+console.log(audioData.value[type],'11111111');
 
-  const params = deviceControl.assemblyAudioCommand(customRound(audioData.value.volumnSet), type, props.equipList)
+  const params = deviceControl.assemblyAudioCommand(customRound(audioData.value[type]), type, props.equipList)
   deviceControl.sendCommands(params)
 }
 const compareStatus = data => {

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

@@ -554,9 +554,9 @@ const updateAudioStatus = data => {
     let { equipList = [] } = data || {}
     let obj = equipList[0] || {}
     audioStatus.value = {
-        isOpen: obj.FaultStatus == 1,
-        onlineStatus: obj.OnlineStatus,
-        volumnSet: obj.RunStatus,
+        isOpen: obj.faultStatus == 1,
+        onlineStatus: obj.onlineStatus,
+        volumnSet: obj.runStatus,
         lastSwitchStatus: audioStatus.value.lastSwitchStatus,
         switchLoading: audioStatus.value.switchLoading
     }