Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/test/components/cqzrqs.vue

@@ -39,8 +39,8 @@
 						top: "5",
 						x: "center",
 						textStyle: {
-							fontSize: 16,
-							color: "rgba(101, 213, 255, 1)"
+							fontSize: 12,
+							color: "rgba(255,225,255,1)"
 						},
 						icon: "path://M512 881.777778 512 881.777778C716.222629 881.777778 881.777778 716.222629 881.777778 512 881.777778 307.777371 716.222629 142.222222 512 142.222222 307.777373 142.222222 142.222222 307.777371 142.222222 512 142.222222 716.222629 307.777373 881.777778 512 881.777778L512 881.777778ZM512 1024 512 1024C229.230208 1024 0 794.769789 0 512 0 229.230211 229.230208 0 512 0 794.769789 0 1024 229.230211 1024 512 1024 794.769789 794.769789 1024 512 1024L512 1024Z",
 						itemWidth: 8, // 设置宽度
@@ -76,14 +76,14 @@
 							interval: 0, //设置为 1，表示『隔一个标签显示一个标签』
 							//	margin:15,
 							textStyle: {
-								color: "#65D5FF",
+								color: "rgba(255,225,255,1)",
 								fontStyle: "normal",
 								fontSize: 12
 							}
 						},
 						axisTick: {
 							//坐标轴刻度相关设置。
-							show: false
+							show: true
 						},
 						axisLine: {
 							//坐标轴轴线相关设置
@@ -104,16 +104,16 @@
 						splitNumber: 3,
 						axisLabel: {
 							textStyle: {
-								color: "#65D5FF",
+								color: "rgba(255,225,255,1)",
 								fontStyle: "normal",
-								fontSize: 16
+								fontSize: 12
 							}
 						},
 						axisLine: {
 							show: true
 						},
 						axisTick: {
-							show: false
+							show: true
 						},
 						splitLine: {
 							show: false,

src/views/test/test.vue

@@ -16,7 +16,7 @@
 		
 	</jt-popup2>
 	
-	<jt-popup2 title="虫情检测预警" top="calc(calc(100% - 115rem) / 3 + 90rem)" >
+	<jt-popup2 title="虫情监测预警" top="calc(calc(100% - 115rem) / 3 + 90rem)" >
 		<cqjcyj></cqjcyj>
 	</jt-popup2>
 	
@@ -28,7 +28,7 @@
 		<disaster></disaster>
 	</jt-popup3>
 	
-	<jt-popup3  title="虫情逐日趋势" top="calc(calc(100% - 115rem) / 3 + 90rem)">
+	<jt-popup3  title="虫情统计" top="calc(calc(100% - 115rem) / 3 + 90rem)">
 		<cqzrqs></cqzrqs>
 	</jt-popup3>