Преглед на файлове

[Fix 0000]代码逻辑简化及公共代码复原

wangkeyi преди 4 дни
родител
ревизия
baf61ce49b
променени са 2 файла, в които са добавени 5 реда и са изтрити 16 реда
  1. 3 8
      src/views/vent/home/configurable/components/ModuleMine.vue
  2. 2 8
      src/views/vent/home/configurable/hooks/useInit.ts

+ 3 - 8
src/views/vent/home/configurable/components/ModuleMine.vue

@@ -104,15 +104,10 @@ function redirectTo() {
 watch(
   () => props.data,
   (d) => {
-    const currentSelectedDeviceID = selectedDeviceID.value; // 保存当前选中的设备ID
     init(d);
-    // 检查当前选中的设备ID是否还在选项中,如果在则保持选中状态
-    const optionExists = options.value.some(option => option.value === currentSelectedDeviceID);
-    if (optionExists) {
-      selectedDeviceID.value = currentSelectedDeviceID;
-    } else {
-      selectedDeviceID.value = options.value[0]?.value;
-    }
+      if (!selectedDeviceID.value) {
+        selectedDeviceID.value = options.value[0]?.value;
+      }
   },
   {
     immediate: true,

+ 2 - 8
src/views/vent/home/configurable/hooks/useInit.ts

@@ -294,7 +294,6 @@ export function useInitPage(title: string) {
   const mainTitle = ref(title);
   const enhancedConfigs = ref<EnhancedConfig[]>([]);
   const data = ref<any>({});
-  const oldData = ref<any>({}); // 用于存储旧数据
 
   const hiddenList = computed(() => {
     return enhancedConfigs.value.filter((e) => e.visible === false);
@@ -309,13 +308,8 @@ export function useInitPage(title: string) {
     });
   }
 
-  function updateData(newData: any) {
-    const isDataChanged = JSON.stringify(newData) !== JSON.stringify(oldData.value);
-    // 有数据更改时才进行数据更新
-    if (isDataChanged) {
-      data.value = newData;
-      oldData.value = newData;
-    }
+  function updateData(d: any) {
+    data.value = d;
   }
 
   return {