Merge branch 'master' of http://39.97.59.228:8013/hrx/mky-vent-base

src/hooks/web/useECharts.ts

@@ -12,7 +12,7 @@ import { useRootSetting } from '/@/hooks/setting/useRootSetting';
 export function useECharts(
   elRef: Ref<HTMLDivElement>,
   theme: 'light' | 'dark' | 'default' = 'default',
-  opt: echarts.EChartsInitOpts = { renderer: 'svg' }
+  opt: echarts.EChartsInitOpts = { renderer: 'canvas' }
 ) {
   const { getDarkMode: getSysDarkMode } = useRootSetting();
 

src/views/vent/home/configurable/components/detail/CustomChart.vue

@@ -517,6 +517,7 @@
         },
         legend: {
           textStyle,
+          top: '5',
           show: legend.show,
         },
         tooltip: {
@@ -529,6 +530,7 @@
             dataZoom: baseDataZoom,
             type: 'category',
             axisLabel: {
+              color: textStyle.color,
               interval: 0,
               width: baseDataZoom.length ? 100 : 800 / get(baseSeries, '[0].data.length', 1),
               overflow: 'break',
@@ -544,6 +546,9 @@
                 opacity: i === 0 ? 0.1 : 0,
               },
             },
+            axisLabel: {
+              color: textStyle.color,
+            },
           };
         }),
         series: baseSeries.reduce((curr: EChartsOption[], serie, index) => {
@@ -613,6 +618,7 @@
             ...e,
             type: 'category',
             axisLabel: {
+              color: textStyle.color,
               width: 100,
               overflow: 'break',
             },
@@ -625,6 +631,9 @@
               lineStyle: {
                 opacity: i === 0 ? 0.1 : 0,
               },
+              axisLabel: {
+                color: textStyle.color,
+              },
             },
           };
         }),