Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

nezha-fronted/package.json

@@ -22,7 +22,7 @@
     "@topology/sequence-diagram": "^0.3.0",
     "axios": "^0.19.0",
     "cytoscape": "^3.15.2",
-    "echarts": "^4.7.0",
+    "echarts": "^5.0.1",
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.2",
     "leaflet": "^1.7.1",

nezha-fronted/src/components/charts/chartPreview.vue

@@ -177,7 +177,7 @@
 </template>
 <script>
   import axios from 'axios';
-  import echarts from 'echarts';
+  import * as echarts from 'echarts';
   import bus from '../../libs/bus';
   import loading from "../common/loading";
   import chartDataFormat from './chartDataFormat'
@@ -786,6 +786,10 @@
             textStyle:{
               color:'#000'
             },
+            axisPointer:{
+              snap:false,
+              animation:false,
+            },
             extraCssText:'z-index:1000;',
             /*enterable:true, 导致tooltip不消失，显示多个tooltip*/
             position:function(point,params,dom,rect,size){
@@ -989,6 +993,10 @@
                 }
               },
               tooltip: {
+                axisPointer:{
+                  snap:false,
+                  animation:false,
+                },
                 formatter:function(params){
                   let str = `<div>`;let sum = 0;
                   params.forEach((item, i) => {let tip=legend[item.seriesIndex];

nezha-fronted/src/components/charts/line-chart-block.vue

@@ -181,7 +181,7 @@
 
 <script>
   import axios from 'axios';
-  import echarts from 'echarts';
+  import * as echarts from 'echarts';
   import bus from '../../libs/bus';
   import loading from "../common/loading";
   import chartDataFormat from './chartDataFormat';
@@ -661,6 +661,10 @@
             textStyle:{
               color:'#000'
             },
+            axisPointer:{
+              snap:false,
+              animation:false,
+            },
             extraCssText:'z-index:1000;',
             /*enterable:true, 导致tooltip不消失，显示多个tooltip*/
             position:function(point,params,dom,rect,size){
@@ -962,6 +966,10 @@
                     }
                   },
                   tooltip: {
+                    axisPointer:{
+                      snap:false,
+                      animation:false,
+                    },
                     formatter:function(params){
                       let str = `<div>`;
                       let sum = 0;
@@ -1125,6 +1133,10 @@
 
                   },
                   tooltip: {
+                    axisPointer:{
+                      snap:false,
+                      animation:false,
+                    },
                     formatter:function(params){
                       let str = `<div>`;
                       let sum = 0;

nezha-fronted/src/components/page/dashboard/overview/chart.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-  import echarts from 'echarts';
+  import * as echarts from 'echarts';
   import chartDataFormat from "../../../charts/chartDataFormat";
   import loading from "../../../common/loading";
   import chartConfig from './chartConfig'
@@ -180,6 +180,7 @@
           if(this.option.series instanceof Array){
             this.option.series=this.option.series.filter((item,index)=>index<this.dataSize);
           }
+          console.log('option',this.option)
           this.chart.setOption(this.option);
         }else{
           this.noData=true;

nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue

@@ -76,7 +76,11 @@
         extraCssText:'z-index:1000;',
         backgroundColor:'rgba(221,228,237,1)',
         borderColor:'rgba(221,228,237,1)',
-        textStyle:{color: "#000"}
+        textStyle:{color: "#000"},
+        axisPointer:{
+          snap:false,
+          animation:false,
+        },
         // formatter:null,
         // position:null,
       },