Merge branch 'develop' of http://106.15.103.105/lihuizhen/ec-report-refactor into develop

components/BarMixMap/BarMixMap.vue

+<template>
+	<view>
+		柱状图混合地图
+		<uni-ec-canvas
+			class="uni-ec-canvas"
+			id="bar-mix-map"
+			ref="barMixMapCanvas"
+			canvas-id="bar-mix-map-chart"
+			:ec="ec"
+		></uni-ec-canvas>
+	</view>
+</template>
+
+<script>
+	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 { geoCoordMapList } from '@/components/uni-ec-canvas/geoCoordMap.js'
+	let chart = null
+	export default {
+		name:"BarMixMap",
+		mixins: [echartElementData],
+		data () {
+		  return {
+		    ec: {
+		      lazyLoad:true
+		    }
+		  }
+		},
+		components: {
+		  uniEcCanvas
+		},
+		methods: {
+			initChart() {
+				this.$nextTick(() => {
+
+				})
+			},
+			/**
+			 * 柱状图数据处理
+			 */
+			dealSeriesData(data) {
+				const categories = [], series = []
+				data.sort((a, b) => {
+					return a.value - b.value
+				})
+				data.forEach(item => {
+					categories.push(item.name)
+					series.push(item.value)
+				})
+				return {
+					categories,
+					series
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>

components/BasicText/BasicText.vue

+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"BasicText",
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style>
+
+</style>

components/ChinaMap/ChinaMap.vue

@@ -15,7 +15,7 @@
 	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 { geoCoordMapList } from './geoCoordMap'
+	import { geoCoordMapList } from '@/components/uni-ec-canvas/geoCoordMap.js'
 	let chart = null
 	export default {
 		name:"ChinaMap",
@@ -61,7 +61,7 @@
 							series.push({
 								name: item[0],
 								type: 'lines',
-								zlevel: 1,
+								// zlevel: 1,
 								effect: {
 									show: true,
 									period: 4,
@@ -82,7 +82,7 @@
 								name: item[0],
 								type: 'effectScatter',
 								coordinateSystem: 'geo',
-								zlevel: 2,
+								// zlevel: 2,
 								rippleEffect: {
 									brushType: 'stroke'
 								},

components/RealTime/RealTime.vue

+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"RealTime",
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/index.vue

@@ -18,8 +18,14 @@
 			<NormalPie v-if="element.type == 'NormalPie'" :elementInfo="element"></NormalPie>
 			<!-- 中国地图 -->
 			<ChinaMap v-if="element.type == 'ChinaMap'" :elementInfo="element"></ChinaMap>
+			<!-- 柱状图混合地图 -->
+			<BarMixMap v-if="element.type == 'BarMixMap'" :elementInfo="element"></BarMixMap>
 			<!-- 雷达图 -->
 			<NormalRadar v-if="element.type == 'NormalRadar'" :elementInfo="element"></NormalRadar>
+			<!-- 文本框 -->
+			<BasicText v-if="element.type == 'BasicText'" :elementInfo="element"></BasicText>
+			<!-- 真实时间 -->
+			<RealTime v-if="element.type == 'RealTime'" :elementInfo="element"></RealTime>
 		</view>
   </view>
 </template>