Merge branch 'master' into 'master'

Importing required components for echarts

See merge request !8

src/components/echarts/index.js

+import * as echarts from 'echarts/core';
+import { ScatterChart, LinesChart, EffectScatterChart } from 'echarts/charts';
+import {
+  TooltipComponent,
+  GridComponent,
+  GeoComponent,
+} from 'echarts/components';
+import { LabelLayout, UniversalTransition } from 'echarts/features';
+import { CanvasRenderer } from 'echarts/renderers';
+
+echarts.use([
+  TooltipComponent,
+  GridComponent,
+  GeoComponent,
+  ScatterChart,
+  LinesChart,
+  EffectScatterChart,
+  LabelLayout,
+  UniversalTransition,
+  CanvasRenderer
+]);
+
+
+export default echarts;

src/view/pc/mapFans.vue

@@ -5,7 +5,7 @@
 </template>
 <script>
 // 引入echarts
-import * as echarts from "echarts";
+import echarts from "@/components/echarts";
 // 引入中国，城市地图
 import { chinaJson,cityArr } from "../../../public/echarts/city.js"
 export default {

src/view/pc/mapForce.vue

@@ -5,7 +5,7 @@
 </template>
 <script>
 // 引入echarts
-import * as echarts from "echarts";
+import echarts from "@/components/echarts";
 // 引入中国，城市地图
 import { chinaJson } from "../../../public/echarts/city.js"
 import Bus from "@/common/bus"