Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front

src/views/unified/tapSwitch/population.vue

@@ -359,6 +359,7 @@ export default {
     };
   },
   created() {
+
     this.getFivesYearMarriageLineFun();
     this.getMarriageStatsFun();
     this.getAgencyChildStatsListFun();
@@ -517,6 +518,13 @@ export default {
             //name: "项目任务完成情况",
             type: "map",
             mapType: "GX", // 自定义扩展图表类型
+            // top:'12%',
+            // zoom: 1.15,
+            layoutCenter: ["50%", "50%"],
+           // 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
+            layoutSize: 480,
+            
+
             itemStyle: {
               normal: {
                 label: { show: true, color: "#fff" },
@@ -1292,7 +1300,7 @@ export default {
 
 .populationMap {
   width: 100%;
-  height: 430px;
+  height: 100%;
   background-color: #082c61;
 }
 
@@ -1332,6 +1340,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .sizeFlex {