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

src/views/unified/tapSwitch/childWelfare.vue

@@ -270,7 +270,7 @@ export default {
         size: 10,
         total: 0,
       },
-      loading: false,
+      loading: true,
       agencyChildStats: {},
       agencyChildStatsList: {
         agencyNumList: [
@@ -609,6 +609,7 @@ export default {
         // },
         series: [
           {
+            name:"机构占比",
             type: "pie",
             radius: "65%",
             center: ["50%", "50%"],
@@ -984,23 +985,23 @@ export default {
 }
 
 .text {
-  font-size: 12px;
-  color: #0e62bf;
-  margin-top: 16px;
+  font-size: 16px;
+  color: #fff;
+  margin: 16px 1px 0 1px;
 }
 
 .textLeft {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size: 16px;
+  color: #fff;
   margin-top: 16px;
-  margin-left: 48px;
+  margin-left: 64px;
 }
 
 .textLefts {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size: 16px;
+  color: #fff;
   margin-top: 16px;
-  margin-left: 24px;
+  margin-left: 32px;
 }
 
 .textNum {

src/views/unified/tapSwitch/marriage.vue

@@ -239,7 +239,7 @@
           />
           <div class="wiansInfo">
             <div class="titleHead">
-              {{ address ? address : "广西全区" }}婚姻统计
+              {{ address ? address : "广西全区" }}婚姻信息查询
             </div>
             <el-input
               type="text"
@@ -1117,7 +1117,7 @@ export default {
 .text {
   font-size: 16px;
   color: #fff;
-  margin: 16px 1px 0 1px;
+  margin-top: 16px;
 }
 
 .yellowNums {

src/views/unified/tapSwitch/provide.vue

@@ -281,7 +281,7 @@ export default {
         size: 7,
         total: 0,
       },
-      loading: false,
+      loading: true,
     };
   },
   created() {
@@ -532,6 +532,7 @@ export default {
         // },
         series: [
           {
+            name: '火化率统计',
             type: "pie",
             radius: "65%",
             center: ["50%", "50%"],
@@ -821,14 +822,14 @@ export default {
 }
 
 .text {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size: 16px;
+  color: #fff;
   margin-top: 16px;
 }
 
 .texts {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size: 16px;
+  color: #fff;
   margin-top: 16px;
   margin-left: 14px;
 }

src/views/unified/tapSwitch/socialOrganization.vue

@@ -303,7 +303,7 @@ export default {
         size: 15,
         total: 0,
       },
-      loading: false,
+      loading: true,
       soorganStats: {},
       SoorganPercentageStats: [],
       placeNames: [],
@@ -561,6 +561,7 @@ export default {
         // },
         series: [
           {
+            name: '区域占比',
             type: "pie",
             radius: "50%",
             center: ["50%", "50%"],
@@ -866,23 +867,23 @@ export default {
 }
 
 .text {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size:16px;
+  color: #fff;
   margin-top: 16px;
 }
 
 .textLeft {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size:16px;
+  color: #fff;
   margin-top: 16px;
-  margin-left: 48px;
+  margin-left: 64px;
 }
 
 .textLefts {
-  font-size: 12px;
-  color: #0e62bf;
+  font-size:16px;
+  color: #fff;
   margin-top: 16px;
-  margin-left: 36px;
+  margin-left: 46px;
 }
 
 .textNum {

src/views/unified/tapSwitch/subsidies.vue

@@ -275,7 +275,7 @@ export default {
         size: 15,
         total: 0,
       },
-      loading: false,
+      loading: true,
       yearDisabledIssueStats: {},
       disabledLevelStats: {},
       areaDisabledIssueStats: {},