提交

src/views/Content/index.vue

@@ -730,6 +730,8 @@ export default {
       const appV = {
         length: 0,
       };
+      //   如果应用选择西部网则渠道默认全部
+      this.form.app === '西部网' && (this.form.client = -1);
       getRule({
         db: 'authplat',
         exportMark: '0',

src/views/History/index.vue

@@ -259,7 +259,7 @@ export default {
       value: 'mname',
       label: 'mname',
     };
-    console.log(clentli)
+    console.log(clentli);
     const clentliList = clentli.find(r => r.mdefault) || false;
     let client = clentliList ? clentliList.mcode.toString() : -1;
     this.cycle = this.verifyList(appli, source, keys, false);
@@ -379,7 +379,7 @@ export default {
     changeData(type, title) {
       const ret = {
         downloads: true,
-        ip: true
+        ip: true,
       };
       if (this.type === type) return;
       if (ret[type]) return;
@@ -600,6 +600,8 @@ export default {
       const appV = {
         length: 0,
       };
+      //   如果应用选择西部网则渠道默认全部
+      this.form.app === '西部网' && (this.form.client = -1);
       getRule({
         db: 'authplat',
         exportMark: '0',

src/views/NMedia/ActivityUser.vue

@@ -359,7 +359,6 @@ export default {
       });
     },
     createImage(keyList, valueList, title) {
-      console.log(keyList,valueList,title)
       if (!chart) {
         chart = echarts.init(this.$refs.regionChart);
         window.onresize = chart.resize;
@@ -456,7 +455,7 @@ export default {
         appCLi = [],
         clentV = { length: 0 },
         clentli = [];
-      let prvList = r.output.data.prvRolectrl || [];
+      let prvList = r.output.data?  r.output.data.prvRolectrl || [] : [];
       for (let i = 0; i < prvList.length; i++) {
         const v = prvList[i];
         if (v.controlid == "RMT_SOURCE")
@@ -555,13 +554,15 @@ export default {
       const appV = {
         length: 0,
       };
+      //   如果应用选择西部网则渠道默认全部
+      this.form.app === '西部网' && (this.form.client = -1);
       getRule({
         db: "authplat",
         exportMark: "0",
         menuid: 399,
         roleid,
       }).then(rule => {
-        let prvList = rule.output.data.prvRolectrl || [];
+        let prvList = rule.output.data?  rule.output.data.prvRolectrl || [] : [];
         for (let i = 0; i < prvList.length; i++) {
           const v = prvList[i];
           if (v.controlid == "APP_VERSION")

src/views/NMedia/Overview.vue

@@ -469,11 +469,11 @@ export default {
         visualMap: {
           type: "piecewise",
           pieces: [
-            {gte: 0, lt: 1000, label: "活跃用户数< 1000", color: '#02a7f0'},
-            {gte: 1000, lt: 2500, label: "1000<=活跃用户数< 2500", color: '#95f204'},
-            {gte: 2500, lt: 5000, label: "2500<=活跃用户数< 5000", color: '#ffff00'},
-            {gte: 5000, lt: 10000, label: "5000<= 活跃用户数< 10000", color: '#f59a23'},
-            {gte: 10000, label: "活跃用户数>= 10000", color: '#d9001b'},
+            {gte: 0, lt: 100000, label: "活跃用户数< 100000", color: '#02a7f0'},
+            {gte: 100000, lt: 250000, label: "100000<=活跃用户数< 250000", color: '#95f204'},
+            {gte: 250000, lt: 500000, label: "250000<=活跃用户数< 500000", color: '#ffff00'},
+            {gte: 500000, lt: 1000000, label: "500000<= 活跃用户数< 1000000", color: '#f59a23'},
+            {gte: 1000000, label: "活跃用户数>= 1000000", color: '#d9001b'},
           ],
         },
         series: [
@@ -545,10 +545,11 @@ export default {
           axisLabel: {
             formatter(v) {
               let val = v;
+              const w = valueKey !== 'totalUser' ? 2 : 0
               if (val >= 100000000) {
-                val = (val / 100000000).toFixed(2) + "亿";
+                val = (val / 100000000).toFixed(w) + "亿";
               } else if (val >= 10000) {
-                val = (val / 10000).toFixed(2) + "万";
+                val = (val / 10000).toFixed(w) + "万";
               }
               return val;
             },