更新

ad0fa6e8 · 苏咏卓 · 87aaceb0 · ad0fa6e8 · ad0fa6e8 · ad0fa6e8
Commit ad0fa6e8 authored Aug 05, 2021 by 苏咏卓
8 changed files
--- a/src/views/unified/tapSwitch/childWelfare.vue
+++ b/src/views/unified/tapSwitch/childWelfare.vue
@@ -547,6 +547,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {

--- a/src/views/unified/tapSwitch/marriage.vue
+++ b/src/views/unified/tapSwitch/marriage.vue
@@ -575,6 +575,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {

--- a/src/views/unified/tapSwitch/mechanism.vue
+++ b/src/views/unified/tapSwitch/mechanism.vue
@@ -493,6 +493,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {

--- a/src/views/unified/tapSwitch/population.vue
+++ b/src/views/unified/tapSwitch/population.vue
@@ -148,9 +148,18 @@
              <!-- <div class="titleHead">
                当前选择：{{ address ? address : "广西全区" }}
              </div> -->
-              <img class="returnInfos" src="./../../../assets/images/returns.png" @click="returnInfo" v-if="num != 0"/>
+              <img
+                class="returnInfos"
+                src="./../../../assets/images/returns.png"
+                @click="returnInfo"
+                v-if="num != 0"
+              />
              <div class="populationMap" id="populationMap"></div>
-              <img class="guideIcon" src="./../../../assets/images/guide.png" alt="">
+              <img
+                class="guideIcon"
+                src="./../../../assets/images/guide.png"
+                alt=""
+              />
            </div>
          </el-col>
        </el-row>
@@ -254,8 +263,7 @@
                      <div class="gradientTitle">城市低保对象</div>
                      <div class="vertical"></div>
                      <div class="gradientOneNum">
-                        <!-- {{ threeYeartTotalData.cityToatlNum }} -->
+                        {{ getEnjoyNum.cityNum }}
-                        343634
                      </div>
                    </div>
                  </el-col>
@@ -264,8 +272,7 @@
                      <div class="gradientTitle">农村低保对象</div>
                      <div class="vertical"></div>
                      <div class="gradientTwoNum">
-                        <!-- {{ threeYeartTotalData.villageToatlNum }} -->
+                        {{ getEnjoyNum.villageNum }}
-                        2488258
                      </div>
                    </div>
                  </el-col>
@@ -319,10 +326,11 @@ import {
  getFivesYearMarriageLine,
  getMarriageStats,
  getAgencyChildStatsList,
-  getThreeYearShjzAchieveStats,
+  getFivesYearEnjoyStats,
  getAreaDisabledIssueStats,
  getCremationRateStats,
  getMapData,
+  getEnjoyNum,
 } from "@/api/unified/unified";
 export default {
  data() {
@@ -340,6 +348,7 @@ export default {
      threeYearShjzAchieveStats: {},
      threeYeartTotalData: {},
      areaDisabledIssueStats: {},
+      getEnjoyNum: {},
      cremationRateStats: [
        { name: "南宁市", value: 321 },
        { name: "柳州市", value: 431 },
@@ -417,10 +426,11 @@ export default {
    this.getFivesYearMarriageLineFun();
    this.getMarriageStatsFun();
    this.getAgencyChildStatsListFun();
-    this.getThreeYearShjzAchieveStatsFun();
+    this.getFivesYearEnjoyStatsFun();
    this.getAreaDisabledIssueStatsFun();
    this.getCremationRateStatsFun();
    this.getMapData("g450000"); //默认展示广西 g450000
+    this.getEnjoyNumFun();
  },
  methods: {
    getFivesYearMarriageLineFun(data) {
@@ -477,22 +487,36 @@ export default {
      });
    },
-    getThreeYearShjzAchieveStatsFun(data) {
+    getFivesYearEnjoyStatsFun(data) {
-      getThreeYearShjzAchieveStats({
+      getFivesYearEnjoyStats({
        areaCode: data,
      }).then((res) => {
-        console.log(res, "获取近三年城市农村低保发放人数统计");
+        console.log(res, "获取近五年城市农村低保发放人数统计");
        if (res.data.admin.length == 0) {
          this.d = true;
          return;
        }
        this.d = false;
-        this.threeYearShjzAchieveStats = res.data.admin;
+        this.threeYearShjzAchieveStats = res.data;
        this.threeYeartTotalData = res.data.totalData;
        this.rescueTargetFun(res.data.admin);
      });
    },
+    getEnjoyNumFun(data) {
+      getEnjoyNum({
+        areaCode: data,
+      }).then((res) => {
+        console.log(res, "获取享受低保人数");
+        this.getEnjoyNum = res.data;
+        if (res.data.length == 0) {
+          this.a = true;
+          return;
+        }
+        this.a = false;
+      });
+    },
    getAreaDisabledIssueStatsFun(data) {
      getAreaDisabledIssueStats({
        year: 2021,
@@ -545,9 +569,10 @@ export default {
      this.getFivesYearMarriageLineFun("450000");
      this.getMarriageStatsFun("450000");
      this.getAgencyChildStatsListFun("450000");
-      this.getThreeYearShjzAchieveStatsFun("450000");
+      this.getFivesYearEnjoyStatsFun("450000");
      this.getAreaDisabledIssueStatsFun("450000");
      this.getCremationRateStatsFun("450000");
+      this.getEnjoyNumFun("450000");
    },
    /**
@@ -622,6 +647,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {
@@ -654,7 +680,7 @@ export default {
          this.getAgencyChildStatsListFun(
            mapList.features[res.dataIndex].properties.adcode
          );
-          this.getThreeYearShjzAchieveStatsFun(
+          this.getFivesYearEnjoyStatsFun(
            mapList.features[res.dataIndex].properties.adcode
          );
          this.getAreaDisabledIssueStatsFun(
@@ -663,6 +689,9 @@ export default {
          this.getCremationRateStatsFun(
            mapList.features[res.dataIndex].properties.adcode
          );
+          this.getEnjoyNumFun(
+            mapList.features[res.dataIndex].properties.adcode
+          );
        } else {
          console.log("点击取值", res);
          console.log("地图数组", mapList.features);
@@ -685,7 +714,7 @@ export default {
          this.getAgencyChildStatsListFun(
            mapList.features[res.dataIndex].properties.adcode
          );
-          this.getThreeYearShjzAchieveStatsFun(
+          this.getFivesYearEnjoyStatsFun(
            mapList.features[res.dataIndex].properties.adcode
          );
          this.getAreaDisabledIssueStatsFun(
@@ -694,6 +723,9 @@ export default {
          this.getCremationRateStatsFun(
            mapList.features[res.dataIndex].properties.adcode
          );
+          this.getEnjoyNumFun(
+            mapList.features[res.dataIndex].properties.adcode
+          );
        }
      });
    },
@@ -944,7 +976,7 @@ export default {
        toolbox: {},
        xAxis: {
          type: "category",
-          data: data.dateData,
+          data: data.dateList,
          axisLabel: {
            textStyle: {
              color: "#FFFFFF",
@@ -990,7 +1022,7 @@ export default {
            name: "城市",
            type: "line",
            stack: "总量",
-            data: data.cityData,
+            data: data.cityNumList,
            itemStyle: {
              normal: {
                color: "#3167ff",
@@ -1004,7 +1036,7 @@ export default {
            name: "农村",
            type: "line",
            stack: "总量",
-            data: data.villageData,
+            data: data.villageNumList,
            itemStyle: {
              normal: {
                color: "#807F3E",
@@ -1363,6 +1395,7 @@ export default {
 }
 .gradientBox {
  display: flex;
+  justify-content: space-around;
  align-items: center;
  width: 100%;
  height: 60px;
@@ -1373,6 +1406,7 @@ export default {
 }
 .gradientBoxs {
  display: flex;
+  justify-content: space-around;
  align-items: center;
  width: 240px;
  height: 60px;
@@ -1406,7 +1440,7 @@ export default {
  -webkit-background-clip: text;
  color: transparent;
 }
-.gradientFourNum{
+.gradientFourNum {
  font-size: 24px;
  font-weight: bold;
  background: linear-gradient(to top, #fa60e4, #a725cb);
@@ -1494,7 +1528,7 @@ export default {
  width: 25px;
  height: 25px;
  z-index: 9999;
-  cursor:pointer
+  cursor: pointer;
 }
 .returnInfos img {

--- a/src/views/unified/tapSwitch/provide.vue
+++ b/src/views/unified/tapSwitch/provide.vue
@@ -477,6 +477,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {

--- a/src/views/unified/tapSwitch/socialAssistance.vue
+++ b/src/views/unified/tapSwitch/socialAssistance.vue
@@ -612,6 +612,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {

--- a/src/views/unified/tapSwitch/socialOrganization.vue
+++ b/src/views/unified/tapSwitch/socialOrganization.vue
@@ -540,6 +540,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {

--- a/src/views/unified/tapSwitch/subsidies.vue
+++ b/src/views/unified/tapSwitch/subsidies.vue
@@ -465,6 +465,7 @@ export default {
              emphasis: {
                show: true,
                areaColor: "#3066ba", //鼠标滑过区域颜色
+                opacity: 0.8,
                label: {
                  show: true,
                  textStyle: {