Merge branch 'ZHNY_DCF' into ZHNY_LHR

src/views/miaoqing/components/hczb.vue

@@ -84,9 +84,9 @@
 			var seriesOption = [{
 				name: '',
 				type: 'pie',
-				clockWise: false,
+				clockWise: true,
 				radius: [85, 89],
-				hoverAnimation: false,
+				hoverAnimation: true,
 				itemStyle: {
 					normal: {
 						label: {
@@ -110,7 +110,7 @@
 						labelLine: {
 							length: 10,
 							length2: 10,
-							show: true,
+							show: false,
 							color: '#00ffff'
 						}
 					}
@@ -153,12 +153,12 @@
 					}]
 				},
 				tooltip: {
-					show: false
+					show: true
 				},
 				legend: {
 					icon: "circle",
 					orient: 'horizontal',
-					x: 'left',
+					x: 'center',
 					y: 'top',
 					data: ['天牛', '布甲', '黑翅蛾', '隐翅虫'],
 					right: 20,

src/views/miaoqing/components/hczrqs.vue

@@ -76,7 +76,7 @@
 			let option = {
 				// backgroundColor: '#043065',
 				grid: {
-					left: '10%',
+					left: '15%',
 					top: '10%',
 					bottom: '20%',
 					right: '0%',
@@ -129,7 +129,7 @@
 							}
 						},
 						axisTick: {
-							show: false
+							show: true
 						},
 						axisLabel: {
 							formatter: '{value}',
@@ -141,7 +141,7 @@
 				xAxis: [{
 						type: 'category',
 						axisTick: {
-							show: false
+							show: true
 						},
 						axisLine: {
 							show: true,
@@ -192,7 +192,7 @@
 
 <style scoped>
 	#main5 {
-		width: 300rem;
+		width: 340rem;
 		height: 230rem;
 		margin-top: 15rem;
 	}

src/views/miaoqing/miaoqing.vue

@@ -7,8 +7,8 @@
 
 <template>
 	
-	<jt-popup2 title="害虫占比" ref="hczb">
-		<hczb></hczb>
+	<jt-popup2 title="害虫逐日趋势" ref="hczrqs">
+		<hczrqs></hczrqs>
 	</jt-popup2>
 
 	<jt-popup2 title="" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="RoadProject">
@@ -19,8 +19,8 @@
 		
 	</jt-popup2>
 	
-	<jt-popup3  title="害虫逐日趋势" ref="hczrqs">
-		<hczrqs></hczrqs>
+	<jt-popup3  title="害虫占比" ref="hczb">
+		<hczb></hczb>
 	</jt-popup3>
 	
 	<jt-popup3  title="" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="zksb">

src/views/test/components/cqjcyj.vue

@@ -134,6 +134,7 @@
 	}
 
 	.main {
+		position: relative;
 		margin: 0 15rem;
 		color: rgb(200, 250, 255);
 		font-weight: 500;
@@ -144,10 +145,9 @@
 	.dwbutton {
 		width: 50rem;
 		height: 25rem;
-		display: inline-block;
-		position:fixed;
-		left: 300rem;
-		top:530rem;
+		position:absolute;
+		right: 5rem;
+		top:0rem;
 		font-size: 14rem;
 		cursor: pointer;
 		text-align: center;