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

# Conflicts:
#	src/views/unified/tapSwitch/marriage.vue

src/views/unified/tapSwitch/marriage.vue

 <template>
   <div>
+    <br />
+    <br />
+
     <el-row :gutter="18">
       <!--左 -->
       <el-col :span="6">
@@ -69,6 +72,11 @@
               <div class="marriageStatistics">
                 <div class="flexBox">
                   <!-- <div class="imgBox"></div> -->
+                  <img
+                    src="./../../../assets/images/01-结婚总数.png"
+                    alt=""
+                    class="marriageImg"
+                  />
                   <div>
                     <div class="marriedNum">结婚总数(对)</div>
                     <div class="yellowNum">{{ marriageStats.marryNum }}</div>
@@ -76,6 +84,11 @@
                 </div>
                 <div class="flexBox">
                   <!-- <div class="imgBox"></div> -->
+                  <img
+                    src="./../../../assets/images/02-离婚总数.png"
+                    alt=""
+                    class="marriageImg"
+                  />
                   <div>
                     <div class="marriedNum">申请离婚(对)</div>
                     <div class="yellowNum">
@@ -85,6 +98,11 @@
                 </div>
                 <div class="flexBox">
                   <!-- <div class="imgBox"></div> -->
+                  <img
+                    src="./../../../assets/images/03-申请离婚-确定离婚.png"
+                    alt=""
+                    class="marriageImg"
+                  />
                   <div>
                     <div class="marriedNum">成功离婚(对)</div>
                     <div class="yellowNum">{{ marriageStats.divorceNum }}</div>
@@ -92,6 +110,11 @@
                 </div>
                 <div class="flexBox">
                   <!-- <div class="imgBox"></div> -->
+                  <img
+                    src="./../../../assets/images/04-跨地区结婚-离婚.png"
+                    alt=""
+                    class="marriageImg"
+                  />
                   <div>
                     <div class="marriedNum">跨地区结婚/离婚</div>
                     <div class="yellowNum">
@@ -131,7 +154,23 @@
                 alt=""
                 class="lowerRight"
               />
-              <div class="title">当前选择：广西全区</div>
+              <div class="title">
+                当前选择：广西全区
+                <el-select
+                  v-model="value"
+                  size="mini"
+                  placeholder="选择年份"
+                  style="width: 100px"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
               <div class="marriageMap" id="marriageMap"></div>
               <a class="returnInfos" @click="returnInfo">返回上一级</a>
             </div>
@@ -263,6 +302,28 @@ export default {
       marriageStats: {},
       areaUnderMarriageStatsList: {},
       value: "",
+      options: [
+        {
+          value: "选项1",
+          label: "黄金糕",
+        },
+        {
+          value: "选项2",
+          label: "双皮奶",
+        },
+        {
+          value: "选项3",
+          label: "蚵仔煎",
+        },
+        {
+          value: "选项4",
+          label: "龙须面",
+        },
+        {
+          value: "选项5",
+          label: "北京烤鸭",
+        },
+      ],
     };
   },
   created() {
@@ -771,6 +832,29 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.qqq {
+  width: 20px;
+}
+::v-deep {
+  .el-input__inner {
+    background-color: #051d3f;
+    color: #fff;
+    border: none;
+  }
+  .el-select-dropdown {
+    background-color: #051d3f;
+    border: none;
+  }
+
+  input::-webkit-input-placeholder {
+    color: #fff;
+  }
+}
+
+.marriageImg {
+  width: 60px;
+  height: 60px;
+}
 .lowerLeft {
   position: absolute;
   width: 10px;
@@ -820,6 +904,8 @@ export default {
 
 .flexBox {
   display: flex;
+  margin: 20px auto;
+  width: 80%;
 }
 
 .imgBox {
@@ -833,7 +919,7 @@ export default {
 .marriedNum {
   font-size: 16px;
   color: #fff;
-  margin-top: 40px;
+  margin-top: 15px;
   margin-left: 20px;
 }
 

src/views/unified/tapSwitch/population.vue

@@ -31,11 +31,11 @@
               <div class="title">婚姻登记分析</div>
               <el-row :gutter="20" justify="center">
                 <el-col :span="12">
-                  <el-row>
-                    <el-col :span="6" :offset="2">
+                  <el-row justify="center">
+                    <el-col :span="6" >
                       <!-- <div class="marriageImg"></div> -->
                     </el-col>
-                    <el-col :span="16">
+                    <el-col :span="24">
                       <div class="marriageNum">
                         <div class="size16">结婚总数(对)</div>
                         <div class="size16">{{ marriageStats.marryNum }}</div>
@@ -48,7 +48,7 @@
                     <el-col :span="6">
                       <!-- <div class="marriageImg"></div> -->
                     </el-col>
-                    <el-col :span="18">
+                    <el-col :span="24">
                       <div class="marriageNum">
                         <div class="size16">离婚总数(对)</div>
                         <div class="size16">
@@ -1185,7 +1185,7 @@ export default {
   background-color: blanchedalmond;
 }
 .marriageNum {
-  text-align: left;
+  text-align: center;
   color: #fff;
   margin-top: 20px;
   margin-left: 10px;