fix: 联调

src/hooks/useDeviceControl.js

@@ -8,7 +8,7 @@ const COMMAND_MAPPINGS = {
   lamp: {
     // isOpen: () => ({ code: 'EquipSwitchSet', value: val => (val ? 1 : 0) }),
     isOpen: () => ({ code: 'brightSet', value: val => (val ? 80 : 0) }),
-    brightValue: () => ({ code: 'brightSet', value: val => val }),
+    bright: () => ({ code: 'brightSet', value: val => val }),
     colorTempValue: () => ({ code: 'colorTempSet', value: val => val })
   },
   curtain: {

src/store/modules/taiguv1/index.js

@@ -26,6 +26,7 @@ const mutations = {
 
 const actions = {
   setAirStatus({ commit, state }, air) {
+    console.log('setAirStatus')
     commit("SET_AIES_TATUS", air);
     (function (airData) {
       setTimeout(() => {
@@ -33,6 +34,7 @@ const actions = {
           state.airSwtichStatus[airData.id] &&
           state.airSwtichStatus[airData.id].loading == true
         ) {
+            debugger
           airData.status.loading = false;
           airData.status.lastSwitchStatus = null;
           commit("SET_AIES_TATUS", airData);

src/views/envmonitor/taiguv1/components/Air/index.vue

@@ -20,7 +20,7 @@
       <div class="air-info">
         <div class="left">
           <div class="text">空调</div>
-          <div class="status">{{ airData.isOpen ? '已开启' : '已关闭' }}</div>
+          <div class="status">{{ airSwitchStatus.statusText  }}</div>
         </div>
         <div class="temp" v-if="airData.isOpen">
           {{ airData.tempSet || 16}}<sup>℃</sup>
@@ -132,13 +132,14 @@ watch(
 )
 const compareStatus = data => {
   let { minTempSet, maxTempSet } = airData.value
+//   console.log('debugger')
   if (allAirStatus.value.all) {
     if (allAirStatus.value.all.lastSwitchStatus == data.runStatus) {
       store.dispatch('taiguv1/setAirStatus', {
         id: 'all',
         status: {
           loading: false,
-          lastSwitchStatus: data.runStatus == 1
+          lastSwitchStatus: null
         }
       })
       airData.value = {
@@ -166,6 +167,22 @@ const compareStatus = data => {
   emit('getStatus', airData.value.isOpen)
 }
 
+const airSwitchStatus = computed(() => {
+  let statusText = ''
+  let switchStatus = false
+  let arr = props.equipList.filter(item => item.runStatus == 1)
+  if (arr.length == 0) {
+    statusText = '全部关闭'
+    switchStatus = false
+  } else {
+    statusText = arr.length > 0 && arr.length < props.equipList.length ? '部分开启' : '全部开启'
+    switchStatus = true
+  }
+  return {
+    statusText,
+    switchStatus
+  }
+})
 const allAirStatus = computed(() => store.state.taiguv1.airSwtichStatus)
 
 const emit = defineEmits(['getStatus'])

src/views/envmonitor/taiguv1/components/Curtain/CurtainMore.vue

@@ -39,7 +39,7 @@
                     </div>
                     <div
                         class="control"
-                        @click="handle('child',2,'暂停中','EquipStopSet',item.id)"
+                        @click="handle('child',2,'暂停中','StopSet',item.id)"
                     >
                         <img :src="item.isActive && item.activeButton === 2 ? StopActiveIcon : StopUnActiveIcon" alt="">
                     </div>

src/views/envmonitor/taiguv1/components/Curtain/index.vue

@@ -62,7 +62,7 @@ import { onBeforeUnmount, onMounted, ref, watch } from "vue";
 const controlStatus = ref('')
 const controlName = ref([
     { isActive: false, name: '上', value: 1, status: '开启中', code: 'EquipOnSet', iconActive: UpActiveIcon, iconUnActive: UpUnActiveIcon },
-    { isActive: false, name: '停', value: 2, status: '暂停中', code: 'EquipStop', iconActive: StopActiveIcon, iconUnActive: StopUnActiveIcon },
+    { isActive: false, name: '停', value: 2, status: '暂停中', code: 'StopSet', iconActive: StopActiveIcon, iconUnActive: StopUnActiveIcon },
     { isActive: false, name: '下', value: 0, status: '关闭中', code: 'EquipOffSet', iconActive: DownActiveIcon, iconUnActive: DownUnActiveIcon },
 ])
 const isOpen = ref(true)

src/views/envmonitor/taiguv1/components/Lamp/LightMore.vue

@@ -27,9 +27,9 @@
           suffix="%"
           @onEnd="setLampStatus('brightValue')" />
       </div>
-      <div class="temp-slider">
+      <!-- <div class="temp-slider">
         <LampSlider v-model="lampData.colorTempValue" @onEnd="setLampStatus('colorTempValue')" />
-      </div>
+      </div> -->
     </div>
 
     <div class="divider" v-if="lampData.isOpen">
@@ -51,7 +51,6 @@
 <script setup>
 import lampCloseIcon from '@/assets/taiguv1/svg/lamp_close_p_icon.svg'
 import lampOpenIcon from '@/assets/taiguv1/svg/lamp_open_p_icon.svg'
-import LampSlider from '@/components/lamp-slider/LampSlider.vue'
 import Slider from '@/components/slider/Slider.vue'
 import SwitchButton from '@/components/switch-button/SwitchButton.vue'
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'

src/views/envmonitor/taiguv1/components/Screen/index.vue

@@ -87,7 +87,7 @@ const setScreenStatus = (type, value) => {
     screenData.value.runStatus = value
     const equipListFirst = props.equipList[0]
     equipListFirst.inCloudSet = value
-     console.log(equipListFirst,'equipListFirst');
+    //  console.log(equipListFirst,'equipListFirst');
      
     const params = deviceControl.assemblyScreenCommand(screenData.value[type], type, equipListFirst)
     deviceControl.sendCommands(params)

src/views/envmonitor/taiguv1/index.vue

@@ -36,7 +36,6 @@
                 >
                     {{ item.text }}
                 </div>
-                {{$t('login.title')}}
             </div>
             <!-- 场景类型 -->
             <div class="mode-box">
@@ -179,17 +178,17 @@
         >
             <div>
                 <LightMore
-                    v-if="popupType == 'lamp'"
+                    v-if="isPopup&&popupType == 'lamp'"
                     :equipList="lampEquipList"
                     :lampStatus="lampStatus"
                 ></LightMore>
                 <CurtainMore
-                    v-if="popupType == 'curtain'"
+                    v-if="isPopup&&popupType == 'curtain'"
                     :currentCurtains="spaceDevice.curtains"
                 ></CurtainMore>
                 <AirMore
                     @getStatus="getAirStatus"
-                    v-if="popupType == 'air'"
+                    v-if="isPopup&&popupType == 'air'"
                     :airList="airEquipList"
                     :status="airStatus"
                 ></AirMore>
@@ -216,6 +215,7 @@ const boxLine = require('@/assets/taiguv1/svg/box_line.png')
 // import "vue3-video-play/dist/style.css";
 import { httpGetByMeetingId, HttpGetSpaceInfo, queryAirStatus, queryAudioStatus, queryLampStatus, queryScreenCastingStatus } from '@/apis/taiguv1'
 import useDeviceControl from '@/hooks/useDeviceControl'
+import { useStore } from '@/store'
 const type = ref(localStorage.getItem('lang') || 'zh-CN')
 const route = useRoute()
 const router = useRouter()
@@ -277,7 +277,7 @@ const airIsOpen = ref(false)
 // 添加场景执行标志
 const hasExecutedDefault = ref(false)
 const hasExecutedModeScene = ref(false)
-// const store = useStore()
+const store = useStore()
 
 onMounted(() => {
   type.value = localStorage.getItem('lang') || 'zh-CN'
@@ -501,21 +501,25 @@ const updateAirStatus = data => {
         lastSwitchStatus: airStatus.value.lastSwitchStatus,
         switchLoading: airStatus.value.switchLoading
     }
+    //   store.dispatch('taiguv1/setAirStatus', {
+    //     id: 'all',
+    //     status: {
+    //       lastSwitchStatus: runStatus == 1
+    //     }
+    //   })
     // console.log(airStatus.value, '  airStatus.value ')
     // airIsOpen.value = isOpen
     airEquipList.value = equipList
 }
 
 const updateLampStatus = data => {
-    let brightLamp = data?.find(item => item.brightValue !=0)
+    let brightLamp = data?.find(item =>item.brightValue!=undefined && item.brightValue !=0)
     let arr = data?.filter(item => item.brightValue == 0)
     lampStatus.value = {
         brightValue: brightLamp ?.brightValue,
         colorTempValue: brightLamp ?.colorTempValue,
         lampStatusText: arr?.length == 0 ? '已关闭' : arr?.length < data?.length ? '已部分开启' : '已开启'
     }
-    // TODO:灯暂时都打开
-    // lampStatus.value.isOpen = false
     if (brightLamp) {
         lampStatus.value.isOpen = true
     } else {