Browse Source

fix: bugfix

anxiaoxia 1 month ago
parent
commit
b8b0b759c5

+ 3 - 3
src/components/slider/Slider.vue

@@ -17,13 +17,13 @@
         >{{ showValue ? internalValue : max }}{{ suffix }} 
         </span
       >
-      <span
+      <!-- <span
         v-if="isFollow && showValue && !suffixNormal"
         class="slider-internal-text"
         :style="{ left: isFollow && progressWidth < 86 ? `calc(${progressWidth}% + 10px)` : 'auto', color: followColor }"
         >{{ showValue ? internalValue : max }}<sup class="slider-internal-text-suffix">{{ suffix }}</sup> 
         </span
-      >
+      > -->
       <span
         v-else
         class="slider-max-text"
@@ -35,7 +35,7 @@
 </template>
 
 <script setup>
-import { computed, defineModel, defineProps, onMounted, ref, useTemplateRef, watch } from 'vue'
+import { computed, defineModel, defineProps, onMounted, ref, useTemplateRef, watch } from 'vue';
 
 const emit = defineEmits(['onEnd', 'onStart'])
 const props = defineProps({

+ 6 - 5
src/views/envmonitor/taiguv1/components/Lamp/LightMore.vue

@@ -158,20 +158,21 @@ watch(
 // 对比和store中开关状态
 const compareStatus = data => {
     lampList.value = data.map(item => {
-        const currentStatus = allLampStatus.value[item.id]
-  
+    const currentStatus = allLampStatus.value[item.id]
+  let isOpen = item.brightValue!==0
     // 基础状态对象
     const baseStatus = {
       ...item,
-      isOpen: item.runStatus == 1
+      isOpen: isOpen
     }
 
     if (!currentStatus) {
       return baseStatus
     }
 
+
     // 如果最后切换状态与当前运行状态相同,重置状态
-    if (currentStatus.lastSwitchStatus == item.runStatus) {
+    if (currentStatus.lastSwitchStatus == isOpen) {
       store.dispatch('taiguv1/setLampStatus', {
         id: item.id,
         status: {
@@ -185,7 +186,7 @@ const compareStatus = data => {
     // 如果有待处理的切换状态,使用该状态
     return {
       ...item,
-      isOpen: currentStatus.lastSwitchStatus ?? (item.runStatus == 1)
+      isOpen: currentStatus.lastSwitchStatus ?? isOpen
     }
 
     })

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

@@ -93,9 +93,6 @@ const setAudioStatus = type => {
   deviceControl.sendCommands(params)
 }
 const compareStatus = data => {
-    console.log(
-        data,'audio`````````'
-    );
     
   if (allAudioStatus.value.all) {
     if (allAudioStatus.value.all.lastSwitchStatus == data.isOpen) {

File diff suppressed because it is too large
+ 740 - 641
src/views/envmonitor/taiguv1/index.vue