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

common/http.interceptor.js

@@ -11,7 +11,8 @@ const install = (Vue, vm) => {
 		},
 		// 配置请求头信息
 		config.header = {
-			"Content-Type": "application/json"
+			"Content-Type": "application/json",
+			"Type": "wx"
 		}
 		return config
 	})

components/BarMixMap/BarMixMap.vue

@@ -27,6 +27,9 @@
 		components: {
 		  uniEcCanvas
 		},
+		onHide() {
+			clearInterval(this.changeTimer)
+		},
 		methods: {
 			initChart() {
 				this.$nextTick(() => {

components/BasicText/BasicText.vue

@@ -10,7 +10,7 @@
 				'animation-duration':`${elementInfo.marquee.speed ? elementInfo.marquee.speed : defaultSpeed}s`
 			}"
 		>
-			{{ text }}
+			{{ elementData.dataList.text || elementInfo.option.title.text }}
 		</p>
 	</view>
 </template>
@@ -27,9 +27,7 @@ export default {
 		};
 	},
 	methods: {
-		initChart() {
-			this.text = this.elementData.dataList.text || this.elementInfo.option.title.text
-		}
+		initChart() {}
 	}
 }
 </script>

mixins/echartElementData.js

@@ -85,6 +85,7 @@ export default {
   watch: {
 		'elementInfo.data': {
 			handler(newVal) {
+				if(this.elementInfo.hide) return false
 				if (newVal.dataType === 'static') {
 					this.handleStaticData(newVal)
 				}

pages/index/index.vue

@@ -3,7 +3,7 @@
 		<template v-for="(element, index) in reportData">
 			<view
 				class="view-element"
-				v-if="!element.hide"
+				v-show="!element.hide"
 				:key="element.id"
 				:style="{
 					width: `${element.width * scale}px`,
@@ -94,7 +94,7 @@
 			 * 组件交互 - 组件
 			 */
 			uni.$on('handleLinkComp', ({ showData, hideData }) => {
-				this.reportData.map(item => {
+				this.reportData = this.reportData.map(item => {
 					if(showData.includes(item.id)) item.hide = false
 					if(hideData.includes(item.id)) item.hide = true
 					return item
@@ -174,7 +174,7 @@
 			 */
 			handleValueChange(index, paramName, value) {
 				if(index.length && paramName && value) {
-					this.reportData.map(item => {
+					this.reportData = this.reportData.map(item => {
 						const flag = index.includes(item.id)
 						if(flag && item.type === 'BasicText' && item.data.dataType === 'static') {
 							this.$set(item.data.dataList, 'text', value)
@@ -206,7 +206,7 @@
 	position: relative;
 	height: 100%;
 	user-select: none;
-	overflow: auto;
+	// overflow: auto;
 	background-repeat: no-repeat;
 	background-size: cover;
 	background-position: center;