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

components/Table/Table.vue

@@ -60,7 +60,7 @@
 				const { backgroundColor } = this.elementInfo.table.tableCell
 				return {
 					'width': `${110 * this.elementInfo.table.column.length}rpx`,
-					'border-left': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none',
+					'border-left': 'none',
 					'border-top': 'none',
 					'background-color': backgroundColor
 				}

pages/index/index.vue

@@ -210,7 +210,7 @@
 			async getReportCharts() {
 				clearInterval(this.timename)
 				const that = this 
-				let res = await that.$u.api.getReportCharts({id: '6274f095460633568801a709'})
+				let res = await that.$u.api.getReportCharts({id: '627a16644606332538b4633c'})
 				uni.stopPullDownRefresh()
 				uni.$emit('handlePullDownRefresh')
 				const { Status, Result: { info, list } } = res.data