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

pages/index/index.vue

@@ -211,6 +211,11 @@
 							}, parseInt(info.dataPollingInterval) * 1000)
 						}
 					}
+					res.data.Result.list.forEach(item => {
+						if(item.type === 'DateTimePicker' && item.option.dateTime.showTime) {
+							item.option.dateTime.date = this.dateTimeFormat(item.option.dateTime.date)
+						}
+					})
 					that.reportInfo = res.data.Result
 				}
 			},