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" separator="," :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="getFontSize()"></u-count-to>	
 	</view>
 </template>
 
@@ -38,6 +38,9 @@
 					this.height = this.elementInfo.height / this.elementInfo.width * windowWidth
 				}
 			},
+			getFontSize() {
+				return this.$u.common.pxToRpx(this.elementInfo.option.countTo.fontSize)
+			}
 			
 		},
 		

pages/index/index.vue

@@ -39,6 +39,8 @@
 				<NormalImage v-if="element.type == 'NormalImage'" :elementInfo="element"></NormalImage>
 				<!-- 远程图片 -->
 				<RemoteImage v-if="element.type == 'RemoteImage'" :elementInfo="element"></RemoteImage>
+				<!-- 普通表格 -->
+				<NormalTable v-if="element.type == 'NormalTable'" :elementInfo="element"></NormalTable>
 			</template>
 		</view>
   </view>
@@ -126,7 +128,7 @@
 			 */
 			async getReportList() {
 				clearInterval(this.timer)
-				let res = await this.$u.api.getReportList({id: '61c424a4c06bff0ce05d9a53'})
+				let res = await this.$u.api.getReportList({id: '61cd2ba1c06bffbdae442c4f'})
 				const { Status, Result: { info, list } } = res.data
 				if (Status === 'true') {
 					if(info.dataUrl) {