Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Map3d/components/nhtbtj.vue

@@ -57,10 +57,10 @@
 						backgroundColor: 'rgba(0,0,0,0)',
 						borderColor: '#ccc',
 						borderWidth: 0,
-						padding: 5,
+						padding: 15,
 						itemGap: 10,
 						itemWidth: 20,
-						itemHeight: 14,
+						itemHeight: 14
 					},
 					grid: {
 						left: '3%',
@@ -94,6 +94,9 @@
 								color: "rgba(255,225,255,1)",
 							},
 						},
+						splitLine: {
+						   show: false,
+						  },
 					},
 					series: [{
 							name: '上年(kw/h)',
@@ -118,10 +121,5 @@
 	}
 </script>
 
-<style scoped>
-	#echarts {
-		width: 320rem;
-		height: 200rem;
-		margin: 10rem;
-	}
+<style>
 </style>