From 5e059c9c17a6d63b6c017d2d2beb25ae227071d1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 11 四月 2025 17:33:59 +0800
Subject: [PATCH] 走航融合优化中

---
 src/views/underwaymix/UnderwayMixMode.vue |   56 +++++++++-----------------------------------------------
 1 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/src/views/underwaymix/UnderwayMixMode.vue b/src/views/underwaymix/UnderwayMixMode.vue
index 8c82db3..fed5590 100644
--- a/src/views/underwaymix/UnderwayMixMode.vue
+++ b/src/views/underwaymix/UnderwayMixMode.vue
@@ -57,7 +57,7 @@
                   v-model="selectedPollutionDegree"
                   multiple
                   clearable
-                  placeholder="閫夋嫨鑳屾櫙"
+                  placeholder="閫夋嫨姹℃煋鑳屾櫙"
                   size="small"
                   style="width: 300px"
                 >
@@ -154,6 +154,7 @@
                 class="el-button-custom"
                 size="small"
                 @click="handleMixClick"
+                :disabled="selectedfusionData.length < 2"
               >
                 {{ '铻嶅悎鍒嗘瀽' }}
               </el-button>
@@ -484,59 +485,17 @@
 
 let mixTag;
 function handleMixClick() {
-  // mixActive.value = !mixActive.value;
   const tags = selectedfusionData.value.map((v) => v.id);
   satelliteGrid.changeVisibility({
     showGridViews: false,
     showDataTxt: false,
     showRankTxt: false
   });
-  // if (mixActive.value) {
   gridApi.mixUnderwayGridData(props.groupId, tags).then((res) => {
     mixTag = satelliteGrid.mixGrid2({ tags, gridDataDetailList: res.data });
     satelliteGrid.setDefaultGridClickEvent([mixTag]);
     gridCtrls.value = [satelliteGrid];
   });
-
-  // satelliteGrid.setGridEvent([mixTag], 'click', (gridCell, gridDataDetail) => {
-  //   gridStore.selectedGridCellAndDataDetail = {
-  //     gridCell,
-  //     gridDataDetail
-  //   };
-  // });
-  // gridCtrls.value = [satelliteGrid];
-  // } else {
-  // satelliteGrid.changeVisibility({
-  //   tags,
-  //   showGridViews: true
-  // });
-  // }
-}
-
-let heatTag;
-const heatMapSearchLength = 4;
-function handleHeatMapClick() {
-  heatActive.value = !heatActive.value;
-  satelliteGrid.changeVisibility({
-    showGridViews: false,
-    showDataTxt: false,
-    showRankTxt: false
-  });
-  if (heatActive.value) {
-    const data = satelliteGrid.gridDataDetailMap.get(mixTag);
-    gridApi
-      .buildUnderwayHeatmap(props.groupId, data, heatMapSearchLength)
-      .then((res) => {
-        heatTag = satelliteGrid.drawHeatGrid2(mixTag, res.data);
-        satelliteGrid.setDefaultGridClickEvent([heatTag]);
-        gridCtrls.value = [satelliteGrid];
-      });
-  } else {
-    satelliteGrid.changeVisibility({
-      tags: [mixTag],
-      showGridViews: true
-    });
-  }
 }
 
 function handleHeatMapSearchClick() {
@@ -573,14 +532,17 @@
 function handleFusionDelete(index, tag) {
   const f = selectedfusionData.value.find((v) => v.id == tag);
   if (f) {
-    // const i = selectedfusionData.value.indexOf(f);
-    // selectedfusionData.value.splice(i, 1);
+    const i = selectedfusionData.value.indexOf(f);
+    selectedfusionData.value.splice(i, 1);
+    lastSelectedfusionData.value = useCloned(
+      selectedfusionData.value
+    ).cloned.value;
     tableRef.value.toggleRowSelection(f, false);
   }
 }
 
 function handleSelectionChange(val) {
-  console.log(val);
+  // console.log(val);
 
   const deleted = lastSelectedfusionData.value.filter((v) => {
     return !val.find((t) => t.id == v.id);
@@ -660,7 +622,7 @@
     }
   });
 
-  lastSelectedfusionData.value = useCloned(val).cloned.value
+  lastSelectedfusionData.value = useCloned(val).cloned.value;
   selectedfusionData.value = val;
 }
 

--
Gitblit v1.9.3