anxiaoxia 1 ماه پیش
والد
کامیت
4650e9c182

+ 2 - 2
src/hooks/useDeviceControl.js

@@ -9,14 +9,14 @@ const COMMAND_MAPPINGS = {
   lamp: {
     // isOpen: () => ({ code: 'EquipSwitchSet', value: val => (val ? 1 : 0) }),
     isOpen: () => ({ code: 'brightSet', value: val => (val ? 80 : 0) }),
-    bright: () => ({ code: 'brightSet', value: val => val }),
+    brightValue: () => ({ code: 'brightSet', value: val => val }),
     colorTempValue: () => ({ code: 'colorTempSet', value: val => val })
   },
   curtain: {
     isOpen: () => ({ code: 'EquipOffSet', value: val => (val ? 1 : 0) })
   },
   audio: {
-    isOpen: item => ({ code: item.inCloudSetCode, value: val => (val ? 1 : 0) }),
+    isOpen: item => ({ code: item.inCloudSetCode, value: val => (val ? 0 : 1) }),
     volumnSet: item => ({ code: item.manualAutoSetCode, value: val => val })
   },
   screen: {

+ 3 - 1
src/views/envmonitor/taiguv1/components/Lamp/index.vue

@@ -29,7 +29,7 @@
       </div>
 
       <div class="lamp-slider" v-if="lampData.isOpen">
-        <Slider v-model="lampData.brightValue" :min="min" :max="max" @onEnd="setLampStatus('bright')"></Slider>
+        <Slider v-model="lampData.brightValue" :min="min" :max="max" @onEnd="setLampStatus('brightValue')"></Slider>
       </div>
     </div>
   </div>
@@ -134,7 +134,9 @@ const setLampStatus = type => {
       }
     })
   }
+  
   const params = deviceControl.assemblyLampCommand(lampData.value[type], type, props.equipList)
+
   deviceControl.sendCommands(params)
 
   emit('getStatus', lampData.value.isOpen)

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

@@ -15,7 +15,7 @@
             {{ 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.runStatus || 0 }}</div>
+        <div class="temp" v-if="audioData.isOpen">{{ audioData.volumnSet || 0 }}</div>
       </div>
 
       <div class="volumn-slider" v-if="audioData.isOpen">

+ 9 - 10
src/views/envmonitor/taiguv1/index.vue

@@ -215,13 +215,13 @@ import { ENV_CONFIG, lanageArr, roomSourceData } from './const'
 const boxLine = require('@/assets/taiguv1/svg/box_line.png')
 // import "vue3-video-play/dist/style.css";
 import {
-    findForServe,
-    httpGetByMeetingId,
-    HttpGetSpaceInfo,
-    queryAirStatus,
-    queryAudioStatus,
-    queryLampStatus,
-    queryScreenCastingStatus
+findForServe,
+httpGetByMeetingId,
+HttpGetSpaceInfo,
+queryAirStatus,
+queryAudioStatus,
+queryLampStatus,
+queryScreenCastingStatus
 } from '@/apis/taiguv1'
 import useDeviceControl from '@/hooks/useDeviceControl'
 import { useStore } from '@/store'
@@ -339,7 +339,6 @@ const getSpaceInfo = () => {
                 Object.keys(envParams.value).forEach(key => {
                     envParams.value[key] = handleEnvData(key, envParams.value[key])
                 })
-                console.log(envParams.value,'**********=====')
             }
         })
     }, 1000 * 60 * 5)
@@ -557,7 +556,7 @@ const updateAudioStatus = data => {
     audioStatus.value = {
         isOpen: obj.FaultStatus == 1,
         onlineStatus: obj.OnlineStatus,
-        runStatus: obj.RunStatus,
+        volumnSet: obj.RunStatus,
         lastSwitchStatus: audioStatus.value.lastSwitchStatus,
         switchLoading: audioStatus.value.switchLoading
     }
@@ -926,7 +925,7 @@ onUnmounted(() => {
     height: 100%;
     border-radius: 24px 0px 0px 24px;
     backdrop-filter: blur(30px);
-    background: rgba(255, 255, 255, 0.8);
+    background: rgba(255, 255, 255, 0.85);
     padding: 40px 90px;
 }
 </style>