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

src/views/unified/tapSwitch/childWelfare.vue

@@ -932,7 +932,7 @@ export default {
 
 .childWelfareMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -1048,6 +1048,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .input {

src/views/unified/tapSwitch/marriage.vue

@@ -858,7 +858,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: "#FFFFFF",
-                fontSize: 12,
+                fontSize: 10,
               },
             },
             axisLine: {
@@ -1045,7 +1045,7 @@ export default {
 
 .marriageMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -1094,6 +1094,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .input {

src/views/unified/tapSwitch/mechanism.vue

@@ -187,7 +187,7 @@
               <div class="warningInfo" v-if="b == true">暂无下级数据</div>
               <div class="titleHead">社会组织</div>
               <el-row :gutter="20">
-                <el-col :span="6">
+                <el-col :span="4">
                   <br />
                   <br /><br /><br />
                   <el-row :gutter="20">
@@ -217,7 +217,7 @@
                     </el-col>
                   </el-row>
                 </el-col>
-                <el-col :span="18">
+                <el-col :span="20">
                   <div id="sociology" class="sociology"></div>
                 </el-col>
               </el-row>
@@ -1018,7 +1018,7 @@ export default {
 
 .mechanismMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -1070,6 +1070,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .warningInfo {

src/views/unified/tapSwitch/population.vue

@@ -908,7 +908,6 @@ export default {
         toolbox: {},
         xAxis: {
           type: "category",
-
           data: data.dateData,
           axisLabel: {
             textStyle: {
@@ -1150,7 +1149,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: "#FFFFFF",
-                fontSize: 12,
+                fontSize: 10,
               },
             },
             axisLine: {
@@ -1353,7 +1352,7 @@ export default {
 
 .populationMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 

src/views/unified/tapSwitch/provide.vue

@@ -679,7 +679,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: "#FFFFFF",
-                fontSize: 12,
+                fontSize: 10,
               },
             },
             axisLine: {
@@ -890,7 +890,7 @@ export default {
 
 .provideMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -941,6 +941,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .input {

src/views/unified/tapSwitch/socialAssistance.vue

@@ -921,7 +921,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: "#FFFFFF",
-                fontSize: 12,
+                fontSize: 10,
               },
             },
             axisLine: {
@@ -1102,7 +1102,7 @@ export default {
 
 .socialAssistanceMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -1202,6 +1202,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .search {

src/views/unified/tapSwitch/socialOrganization.vue

@@ -165,7 +165,7 @@
               <div class="warningInfo" v-if="SoorganStatsList">暂无下级数据</div>
               <div class="titleHead">年度按月份统计</div>
               <el-row :gutter="20">
-                <el-col :span="6">
+                <el-col :span="4">
                   <br />
                   <br /><br /><br />
                   <el-row :gutter="20">
@@ -191,7 +191,7 @@
                     </el-col>
                   </el-row>
                 </el-col>
-                <el-col :span="18">
+                <el-col :span="20">
                   <div id="annualStatistics" class="annualStatistics"></div>
                 </el-col>
               </el-row>
@@ -707,7 +707,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: "#FFFFFF",
-                fontSize: 12,
+                fontSize: 8,
               },
             },
             axisLine: {
@@ -967,7 +967,7 @@ export default {
 
 .socialOrganizationMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -1017,6 +1017,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;
 }
 
 .input {

src/views/unified/tapSwitch/subsidies.vue

@@ -741,7 +741,7 @@ export default {
             axisLabel: {
               textStyle: {
                 color: "#FFFFFF",
-                fontSize: 12,
+                fontSize: 10,
               },
             },
             axisLine: {
@@ -922,7 +922,7 @@ export default {
 
 .subsidiesMap {
   width: 100%;
-  height: 430px;
+  height: 460px;
   background-color: #082c61;
 }
 
@@ -1039,6 +1039,10 @@ export default {
   margin: 10px 30px 0 0;
   display: flex;
   justify-content: flex-end;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 9999;;
 }
 
 .input {