fix: data component history trend moadal on close not destory echarts instance

@@ -62,7 +62,6 @@ export function useECharts(
     }
     }
     nextTick(() => {
     nextTick(() => {
       useTimeoutFn(() => {
       useTimeoutFn(() => {
-        console.log(chartInstance);
         if (!chartInstance) {
         if (!chartInstance) {
           initCharts(getDarkMode.value as 'default');
           initCharts(getDarkMode.value as 'default');
 
 
@@ -71,7 +70,6 @@ export function useECharts(
         clear && chartInstance?.clear();
         clear && chartInstance?.clear();
 
 
         chartInstance?.setOption(unref(getOptions));
         chartInstance?.setOption(unref(getOptions));
-        chartInstance = null;
       }, 30);
       }, 30);
     });
     });
   }
   }
@@ -105,10 +103,17 @@ export function useECharts(
     return chartInstance;
     return chartInstance;
   }
   }
 
 
+  function destory() {
+    if (!chartInstance) return;
+    chartInstance.dispose();
+    chartInstance = null;
+  }
+
   return {
   return {
     setOptions,
     setOptions,
     resize,
     resize,
     echarts,
     echarts,
     getInstance,
     getInstance,
+    destory,
   };
   };
 }
 }

@@ -28,7 +28,7 @@
   const { deviceAttrs, getDeviceKeys, getSearchParams, setChartOptions, getDeviceAttribute } =
   const { deviceAttrs, getDeviceKeys, getSearchParams, setChartOptions, getDeviceAttribute } =
     useHistoryData();
     useHistoryData();
 
 
-  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+  const { setOptions, destory } = useECharts(chartRef as Ref<HTMLDivElement>);
 
 
   function hasDeviceAttr() {
   function hasDeviceAttr() {
     if (!unref(deviceAttrs).length) {
     if (!unref(deviceAttrs).length) {
@@ -133,7 +133,7 @@
     for (const item of dataSource) {
     for (const item of dataSource) {
       const { deviceName, gatewayDevice, slaveDeviceId, organizationId } = item;
       const { deviceName, gatewayDevice, slaveDeviceId, organizationId } = item;
       let { deviceId } = item;
       let { deviceId } = item;
-      if (gatewayDevice) {
+      if (gatewayDevice && slaveDeviceId) {
         deviceId = slaveDeviceId;
         deviceId = slaveDeviceId;
       }
       }
       if (record[deviceId]) continue;
       if (record[deviceId]) continue;
@@ -177,10 +177,22 @@
 
 
     await handleModalOpen();
     await handleModalOpen();
   });
   });
+
+  const handleCancel = () => {
+    destory();
+  };
 </script>
 </script>
 
 
 <template>
 <template>
-  <BasicModal @register="registerModal" :destroy-on-close="true" width="70%" title="历史趋势">
+  <BasicModal
+    @register="registerModal"
+    @cancel="handleCancel"
+    :destroy-on-close="true"
+    :show-ok-btn="false"
+    cancel-text="关闭"
+    width="70%"
+    title="历史趋势"
+  >
     <section
     <section
       class="flex flex-col p-4 h-full w-full min-w-7/10"
       class="flex flex-col p-4 h-full w-full min-w-7/10"
       style="color: #f0f2f5; background-color: #f0f2f5"
       style="color: #f0f2f5; background-color: #f0f2f5"