Merge branch 'fix/DEFECT-1886' into 'main_dev'

fix: 修复折线图鼠标移入没显示具体的值

See merge request yunteng/thingskit-scada!214

+import type { EChartsOption } from 'echarts'
 import { isLightboxMode } from '@/utils/env'
 import { isLightboxMode } from '@/utils/env'
-
-export const defaultOption = {
-  tooltip: {
-  },
-  calculable: true,
-  xAxis: [
-    {
-      type: 'category',
-      // prettier-ignore
-      data: isLightboxMode() ? [] : ['Jan', 'Feb', 'Mar', 'Apr', 'May'],
+export const defaultOption = (): EChartsOption => {
+  return {
+    tooltip: {
     },
     },
-  ],
-  legend: {
-    top: '8%',
-    left: 'center',
-    data: [''],
-  },
+    calculable: true,
+    xAxis:
+      {
+        type: 'category',
+        // prettier-ignore
+        data: isLightboxMode() ? [] : ['Jan', 'Feb', 'Mar', 'Apr', 'May'],
+      },
 
 
-  grid: {
-    top: '25%',
-    left: '6%',
-    right: '10%',
-    bottom: '8%',
-    containLabel: true,
-  },
-  yAxis: [
-    {
-      type: 'value',
-    },
-  ],
-  series: [
-    {
-      name: 'Rainfall',
-      type: 'bar',
-      data: [
-        25.6, 76.7, 42.0, 27.0, 23.2,
-      ],
+    legend: {
+      top: '8%',
+      left: 'center',
+      data: [''],
     },
     },
-    {
-      name: 'Evaporation',
-      type: 'bar',
-      data: isLightboxMode()
-        ? []
-        : [
-            28.7, 32.6, 70.7, 29.0, 26.4,
-          ],
+
+    grid: {
+      top: '25%',
+      left: '6%',
+      right: '10%',
+      bottom: '8%',
+      containLabel: true,
     },
     },
-  ],
+    yAxis:
+      {
+        type: 'value',
+      },
+    series: [
+      {
+        name: 'Rainfall',
+        type: isLightboxMode() ? 'line' : 'bar',
+        data: isLightboxMode()
+          ? []
+          : [
+              25.6, 76.7, 42.0, 27.0, 23.2,
+            ],
+      },
+      {
+        name: 'Evaporation',
+        type: 'bar',
+        data: isLightboxMode()
+          ? []
+          : [
+              28.7, 32.6, 70.7, 29.0, 26.4,
+            ],
+      },
+    ],
+  }
 }
 }

@@ -28,7 +28,7 @@ const titleATTR = ref<string[] | any>([])
 
 
 function initChartInstance() {
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
   chartInstance.value = init(unref(chartElRef))
-  chartInstance.value.setOption(defaultOption)
+  chartInstance.value.setOption(defaultOption())
 }
 }
 
 
 const productsStore = useProductsStore()
 const productsStore = useProductsStore()

@@ -3,6 +3,9 @@ import { isLightboxMode } from '@/utils/env'
 
 
 export const getDefaultOption = (): EChartsOption => {
 export const getDefaultOption = (): EChartsOption => {
   return {
   return {
+
+    tooltip: {
+    },
     legend: {
     legend: {
       top: '10%',
       top: '10%',
       left: 'center',
       left: 'center',

@@ -53,6 +53,7 @@ const handleHistoryData = (commandSource: CommandSource, message: SubscriptionDa
   seriesData.value.forEach((item: any) => {
   seriesData.value.forEach((item: any) => {
     item.data = unref(timeList).map((time: any) => ({ name: time, value: null }))
     item.data = unref(timeList).map((time: any) => ({ name: time, value: null }))
   })
   })
+
   seriesData.value.forEach((item: any) => {
   seriesData.value.forEach((item: any) => {
     item.data.forEach((item1: any) => {
     item.data.forEach((item1: any) => {
       message[item.attribute].forEach((messageItem) => {
       message[item.attribute].forEach((messageItem) => {
@@ -71,6 +72,9 @@ const handleHistoryData = (commandSource: CommandSource, message: SubscriptionDa
     xAxis: {
     xAxis: {
       data: toRaw(unref(timeList.value.map((item: string | number) => formatToDateTime(item)))),
       data: toRaw(unref(timeList.value.map((item: string | number) => formatToDateTime(item)))),
     },
     },
+    legend: {
+      data: unref(titleATTR),
+    } as any,
     series: toRaw(
     series: toRaw(
       unref(seriesData).map((item: { type: string; name: string; data: any }) => {
       unref(seriesData).map((item: { type: string; name: string; data: any }) => {
         const { type, name, data } = item
         const { type, name, data } = item
@@ -138,6 +142,7 @@ const { onMessage } = useOnMessage({
     if (!seriesData.value.length) {
     if (!seriesData.value.length) {
       (attr as string[]).forEach((item: string) => {
       (attr as string[]).forEach((item: string) => {
         titleATTR.value.push(productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName)
         titleATTR.value.push(productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName)
+
         seriesData.value.push({ attribute: item, data: [], type: 'line', name: productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName })
         seriesData.value.push({ attribute: item, data: [], type: 'line', name: productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName })
       })
       })
     }
     }