Commit f94bf186 authored by Jenny's avatar Jenny

feat: echarts 引入方式修改

parent d4a776a0
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import * as chinaJson from '@/components/uni-ec-canvas/china.json'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
import { geoCoordMapList } from '@/components/uni-ec-canvas/geoCoordMap.js' import { geoCoordMapList } from '@/components/uni-ec-canvas/geoCoordMap.js'
let chart = null let chart = null
...@@ -37,7 +35,7 @@ ...@@ -37,7 +35,7 @@
this.$nextTick(() => { this.$nextTick(() => {
clearInterval(this.changeTimer) clearInterval(this.changeTimer)
this.$refs['barMixMapCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['barMixMapCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import * as chinaJson from '@/components/uni-ec-canvas/china.json'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
import { geoCoordMapList } from '@/components/uni-ec-canvas/geoCoordMap.js' import { geoCoordMapList } from '@/components/uni-ec-canvas/geoCoordMap.js'
let chart = null let chart = null
...@@ -35,13 +33,11 @@ ...@@ -35,13 +33,11 @@
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['chinaMapCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['chinaMapCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
}) })
echarts.registerMap('china', chinaJson)
canvas.setChart(chart) canvas.setChart(chart)
const { dataList } = this.elementData const { dataList } = this.elementData
const seriesData = dataList.chinaMapAreas || [] const seriesData = dataList.chinaMapAreas || []
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -41,7 +40,7 @@ ...@@ -41,7 +40,7 @@
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dashboardProgressCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['dashboardProgressCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -37,7 +36,7 @@ export default { ...@@ -37,7 +36,7 @@ export default {
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['horizontalBarCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['horizontalBarCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -37,7 +36,7 @@ ...@@ -37,7 +36,7 @@
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['lineMixBarCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['lineMixBarCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -37,7 +36,7 @@ export default { ...@@ -37,7 +36,7 @@ export default {
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['normalbarCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['normalbarCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -41,7 +40,7 @@ export default { ...@@ -41,7 +40,7 @@ export default {
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['normalGaugeCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['normalGaugeCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -36,7 +35,7 @@ export default { ...@@ -36,7 +35,7 @@ export default {
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['normalLineCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['normalLineCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -41,7 +40,7 @@ export default { ...@@ -41,7 +40,7 @@ export default {
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['normalPieCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['normalPieCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<script> <script>
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import echartElementData from '@/mixins/echartElementData.js' import echartElementData from '@/mixins/echartElementData.js'
let chart = null let chart = null
...@@ -37,7 +36,7 @@ ...@@ -37,7 +36,7 @@
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['normalRadarCanvas'].init((canvas, width, height, canvasDpr) => { this.$refs['normalRadarCanvas'].init((canvas, width, height, canvasDpr) => {
chart = echarts.init(canvas, null, { chart = this.$echarts.init(canvas, null, {
width: width, width: width,
height: height, height: height,
devicePixelRatio: canvasDpr devicePixelRatio: canvasDpr
......
...@@ -14,6 +14,11 @@ Vue.mixin(vuexStore) ...@@ -14,6 +14,11 @@ Vue.mixin(vuexStore)
import store from '@/store/index.js' import store from '@/store/index.js'
import * as echarts from '@/components/uni-ec-canvas/echarts'
import * as chinaJson from '@/components/uni-ec-canvas/china.json'
echarts.registerMap('china', chinaJson)
Vue.prototype.$echarts = echarts
const app = new Vue({ const app = new Vue({
store, store,
...App ...App
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment