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

mixins/echartElementData.js

@@ -53,6 +53,7 @@ export default {
 				} else {
 					this.elementData.dataList = res.data.Result
 				}
+				this.initChart()
 			} else {
 				this.$u.toast(Msg)
 			}

pages/index/index.vue

 <template>
 	<view
 		class="canvas"
-		:style="{
-      backgroundColor: reportInfo.backgroundColor,
-      backgroundImage: `url(${reportInfo.backgroundImage})`
-    }"
+		:style="[styleObject]"
 	>
 		<view v-for="element in reportData" :key="item.id">
 			<!-- 普通柱状图 -->
@@ -31,6 +28,17 @@
 				reportData: []
 			}
 		},
+		computed: {
+			styleObject() {
+				let params = {}
+				const { backgroundColor, backgroundImage } = this.reportInfo
+				if(backgroundImage) params = { 'background-image': `url(${backgroundImage})` }
+				return {
+					'background-color': backgroundColor,
+					...params
+				}
+			}
+		},
 		async onLoad() {
 			this.getReportList()
 		},

utils/common.js

+import { Function, evaluate } from '../static/plugin/eval5/eval5.js'
 /**
  * 数据转换
  */
 export const converFunction = (func, data) => {
   if(!func) return
-  return Function('"use strict";return (' + func + ')')()(data);
+  return new Function('"use strict";return (' + func + ')')()(data);
 }
\ No newline at end of file