Merge branch 'ZHNY_DCF' into ZHNY_LHR

src/components/jt-echarts/jt-echarts.vue

@@ -100,8 +100,7 @@ export default {
 		},
 	},
 	mounted() {
-		console.log(444777)
-		console.log('55556',this.chartData)
+
 	}
 };
 </script>

src/components/jt-popup/jt-popup2.vue

@@ -144,11 +144,9 @@
 	.popup-main {
 		position: absolute;
 		left: 10rem;
-		top: 105rem;
-		margin-top: 5rem;
-		// height: 490rem;
-
-		height: calc((100% - 145rem) / 3);
+		top: 95rem;
+		margin-top: 15rem;
+		height: calc((100% - 165rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		z-index: 11;

src/components/jt-popup/jt-popup3.vue

@@ -144,11 +144,9 @@
 	.popup-main {
 		position: absolute;
 		right: 10rem;
-		top: 105rem;
-		margin-top: 5rem;
-		// height: 490rem;
-
-		height: calc((100% - 145rem) / 3);
+		top: 95rem;
+		margin-top: 15rem;
+		height: calc((100% - 165rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		z-index: 11;

src/views/Map3d/components/nhtbtj.vue

@@ -84,13 +84,13 @@
 					series: [{
 							name: '上月(kw/h)',
 							type: 'line',
-							stack: 'Total',
+							// stack: 'Total',
 							data: [1000, 1500, 1300, 1700, 1600, 1200]
 						},
 						{
 							name: '本月(kw/h)',
 							type: 'line',
-							stack: 'Total',
+							// stack: 'Total',
 							data: [1200, 1800, 1400, 1350, 1100, 1500]
 						},
 					]