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

components/CountTo/CountTo.vue

@@ -2,7 +2,7 @@
 	<view class="count-to" :style="{height: `${height}px`,}">
 		<BasicText :elementInfo="elementInfo"></BasicText>
 		<!-- warning:count-to的font-size单位为rpx -->
-		<u-count-to :start-val="startVal" :end-val="endVal" :color="elementInfo.option.countTo.color" :font-size="elementInfo.option.countTo.fontSize"></u-count-to>	
+		<u-count-to :start-val="startVal" :end-val="endVal" separator="," :color="elementInfo.option.countTo.color" :font-size="elementInfo.option.countTo.fontSize"></u-count-to>	
 	</view>
 </template>
 

components/DashboardProgress/DashboardProgress.vue

@@ -98,7 +98,7 @@
 								top: '45%',
 								textStyle: {
 									fontSize: 30,
-									color: '#ffffff',
+									color: this.elementInfo.option.progress.titleColor,
 								},
 							}],
 							series: [{

components/NormalTable/NormalTable.vue

 <template>
 	<view >
+		<BasicText :elementInfo="elementInfo"></BasicText>
 		<scroll-view scroll-x="true" >
 			<view class="scroll-view_H">
 				<u-table >
 					<u-tr>
-						<u-th style="width: 150px;" v-for="(item, index) in elementInfo.table.column" :key="index">{{item.title}}</u-th>
+						<u-th style="width: 150px;" v-for="(item, index) in columns" :key="index">{{item.title}}</u-th>
 					</u-tr>
-					<u-tr v-for="(cell, cellIndex) in elementData.dataList.chartTables" :key="cellIndex" >
-						<u-td style="width: 150px;"  v-for="(item, index) in elementInfo.table.column" :key="index">
+					<u-tr v-for="(cell, cellIndex) in chartTables" :key="cellIndex" >
+						<u-td style="width: 150px;"  v-for="(item, index) in columns" :key="index">
 							{{cell[item.dataIndex]}}
 						</u-td>
 					</u-tr> 
@@ -27,25 +28,27 @@
 		mixins: [echartElementData],
 		data() {
 			return {
-				
+				columns: [],
+				chartTables: []
 			};
 		},
 		methods: {
 			initChart() {
 				this.$nextTick(() => {
-				
-					this.endVal = this.elementData.dataList.endVal
+					this.columns = this.elementInfo.table.column
+					this.chartTables = this.elementData.dataList.chartTables
 				})
 			},
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+
+ .scroll-view_H {
+	width: 100%;
+	display: flex;
+	flex-wrap: nowrap;
+}
 
- .scroll-view_H{
-		width: 100%;
-		display: flex;
-		flex-wrap: nowrap;
-	}
 </style>