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

# Conflicts:
#	components/NormalGauge/NormalGauge.vue

components/NormalPie/NormalPie.vue

 <template>
 	<view>
-		
+		<uni-ec-canvas
+		    class="uni-ec-canvas"
+		    id="normal-pie"
+		    ref="canvas"
+		    canvas-id="lazy-load-chart"
+		    :ec="ec"
+		></uni-ec-canvas>
 	</view>
 </template>
 
 <script>
-	export default {
+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'
+let chart = null
+
+export default {
 	name:"NormalPie",
+	mixins: [echartElementData],
+	
 	data() {
 		return {
-				
+			ec: {
+			  lazyLoad:true
+			}
 		};
+	},
+	
+	onReady () {
+	  
+	},
+	
+	components: {
+	  uniEcCanvas
+	},
+	
+	methods: {
+		initChart() {
+			this.$nextTick(() => {
+				this.$refs['canvas'].init((canvas, width, height, canvasDpr) => {
+					chart = echarts.init(canvas, null, {
+						width: width,
+						height: height,
+						devicePixelRatio: canvasDpr
+					})
+					canvas.setChart(chart)
+					const { dataList: { categories, series } } = this.elementData
+					const options = {
+						...this.elementInfo.option,
+						color: ['#1089E7', '#F57474', '#56D0E3', '#F8B448', '#8B78F6'],
+						tooltip: {
+						    trigger: 'item',
+						    formatter: '{a}<br/>{b}:{c}({d}%)'
+						},
+						series: this.dealSeriesData(series)
+					}
+					chart.setOption(options)
+					return chart
+				})
+			})
+		},
+		
+		dealSeriesData (data) {
+			if(!data) return
+			const series = [{
+			    type: 'pie',
+			    center: ["50%", "50%"],
+			    ...props.elementInfo.option.pie,
+			    label: {
+			        ...props.elementInfo.option.dataset
+			    },
+			    labelLine: {
+			        show: true
+			    },
+			    data
+			}]
+			return series
 		}
 	}
+}
 </script>
 
 <style>