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

components/NormalImage/NormalImage.vue

 <template>
 	<view class="normal-image">
-		<BasicText :elementInfo="elementInfo.option.title"></BasicText>
+		<BasicText :elementInfo="elementInfo"></BasicText>
 		<u-empty 
 		 v-if="!elementInfo.option.images.list.length"></u-empty>
 		<u-image  class="uimage"

components/RealTime/RealTime.vue

 <template>
 	<view>
-		
+		<div class="timer">
+		    <div
+				:style="{
+					'font-size':`${elementInfo.option.title.textStyle.fontSize}px`,
+					'color': elementInfo.option.title.textStyle.color,
+					'font-weight': elementInfo.option.title.textStyle.fontWeight,
+					'text-align': elementInfo.option.title.left,
+		        }"
+		    >
+		    {{ realTime }}
+		    </div>
+		</div>
 	</view>
 </template>
 
 <script>
-	export default {
-		name:"RealTime",
-		data() {
-			return {
+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:"BasicText",
+	mixins: [echartElementData],
+	
+	data() {
+		return {
 				
-			};
-		}
+		};
+	},
+	
+	onReady () {
+	  
+	},
+	
+	components: {
+	  uniEcCanvas
+	},
+	
+	methods: {
+		initChart() {
+			const refreshTime = () => {
+			    timer.value = setInterval(() => {
+					realTime.value = dateFormat(new Date(), props.elementInfo.option.dateFormart)
+			    }, 1000)
+			}
+			
+			onMounted(() => {
+			    refreshTime()
+			})
+			
+			onUnmounted(() => {
+			    clearInterval(timer.value)
+			    timer.value = null
+			})
+			
+			return {
+			    realTime,
+			}
+		}	
 	}
+}
 </script>
 
-<style>
-
+<style lang="less" scoped>
+.timer {
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+  width: 100%;
+  color: #fff;
+}
 </style>

components/RemoteImage/RemoteImage.vue

 <template>
 	<view class="remoteView">
+	<BasicText :elementInfo="elementInfo"></BasicText>
 	  <u-image
 	  class="remoteImage"
 	  :src="imageUrl"
@@ -10,18 +11,27 @@
 </template>
 
 <script>
+	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:"RemoteImage",
 		mixins: [echartElementData],
 		data() {
 			return {
+				ec: {
+					lazyLoad: true
+				},
 				imageUrl:"",
 				windowWidth: 0, //屏幕宽度
 				imageHeight:0 //图片高度
 			};
 		},
+		components: {
+			uniEcCanvas
+		},
 		computed:{
 		},
 		methods:{