提交

src/views/Activity/Activity.vue

@@ -83,6 +83,7 @@ export default {
     getTab(topic) {
       let activitys = [];
       (topic || []).map(v => {
+        if (v.isBigdata === 0) return;
         activitys.push({
           isCollectPlatform: v.isCollectPlatform,
           component: "defaultComponent",

src/views/Activity/views/defaultComponent.vue

@@ -272,12 +272,12 @@ export default {
   },
   computed: {},
   methods: {
-    numform(text) {
-      let num = text;
-      if (isNaN(text)) num = "0";
-      if (text >= 100000000) num = (text / 100000000).toFixed(2) - 0 + "亿";
-      else if (text >= 10000) num = (text / 10000).toFixed(2) - 0 + "万";
-      else num = num + "";
+    numform(n) {
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
       return num;
     },
     rangClick(type) {

src/views/Activity/views/derunsanqin.vue

@@ -104,7 +104,6 @@
 <script>
 // @ is an alias to /src
 import { defaultAjax } from "@/api/index";
-
 import * as echarts from "echarts/core";
 import { PieChart, MapChart } from "echarts/charts";
 import {
@@ -168,7 +167,12 @@ export default {
   computed: {},
   methods: {
     formateNum(n) {
-      return (n + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      return num;
     },
     pieChartFun() {
       const li = this.data.platform.map(v => {
@@ -301,19 +305,19 @@ export default {
       var option = {
         tooltip: {
           trigger: "item",
-          formatter:  "{b}: {c} ({d}%)",
-              rich: {
-                b: {
-                  color: "#4C5058",
-                  fontSize: 14,
-                  fontWeight: "bold",
-                  lineHeight: 33,
-                },
-                per: {
-                  color: "#000",
-                  fontSize: 14,
-                },
-              },
+          formatter: "{b}: {c} ({d}%)",
+          rich: {
+            b: {
+              color: "#4C5058",
+              fontSize: 14,
+              fontWeight: "bold",
+              lineHeight: 33,
+            },
+            per: {
+              color: "#000",
+              fontSize: 14,
+            },
+          },
         },
         legend: {
           show: false,
@@ -340,7 +344,7 @@ export default {
             },
             labelLine: {
               length: 1,
-              length2: 0
+              length2: 0,
             },
             data: feelingList,
           },

src/views/Activity/views/huashanyunhai.vue

@@ -150,7 +150,12 @@ export default {
   computed: {},
   methods: {
     formateNum(n) {
-      return (n + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      return num;
     },
     pieChartFun() {
       const li = this.platform.map(v => {

src/views/Activity/views/mianmianjiedao.vue

@@ -161,7 +161,12 @@ export default {
   computed: {},
   methods: {
     formateNum(n) {
-      return (n + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      return num;
     },
     pieChartFun() {
       this.chart0 = echarts.init(this.$refs.pieChart);

src/views/Activity/views/shanxijiaoao1.vue

@@ -234,7 +234,12 @@ export default {
   methods: {
     formateNum(n) {
       if (n === -1) return 0;
-      return (n + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      return num;
     },
     pieChartFun() {
       this.chart0 = echarts.init(this.$refs.pieChart);

src/views/Activity/views/shanxijiaoao2.vue

@@ -242,7 +242,12 @@ export default {
   methods: {
     formateNum(n) {
       if (n === -1) return 0;
-      return (n + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      return num;
     },
     pieChartFun() {
       this.chart0 = echarts.init(this.$refs.pieChart);

src/views/Activity/views/zhongqiuzhiye.vue

@@ -159,7 +159,12 @@ export default {
   computed: {},
   methods: {
     formateNum(n) {
-      return (n + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      let num = n;
+      if (isNaN(n)) num = "0";
+      else if (n >= 100000000) num = ((n / 100000000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "亿";
+      else if (n >= 10000) num = ((n / 10000).toFixed(2) - 0 + "").replace(/\B(?=(?:\d{3})+\b)/g, ",") + "万";
+      else num = (num + "").replace(/\B(?=(?:\d{3})+\b)/g, ",");
+      return num;
     },
     pieChartFun() {
       this.chart0 = echarts.init(this.$refs.pieChart);