提交

src/pages/IndividualActivities/Home.jsx

@@ -73,9 +73,9 @@ function IndividualActivities() {
                     ]
                 },
                 {
-                    title: "传统媒体-日活跃用户",
+                    title: "传统媒体-总发稿量",
                     color: "rgb(0,255,0)",
-                    value: d.top.playCount,
+                    value: d.top.publishCount,
                     path: [
                         {
                             d: "M512.000512 64.909335c-246.926856 0-447.090665 200.158692-447.090665 447.088618 0 246.935042 200.163809 447.090665 447.090665 447.090665 246.935042 0 447.087595-200.158692 447.087595-447.090665C959.088106 265.068028 758.933507 64.909335 512.000512 64.909335zM512.000512 899.476939c-213.646891 0-387.478985-173.828001-387.478985-387.476939 0-213.646891 173.832094-387.475915 387.478985-387.475915 213.647915 0 387.474892 173.830047 387.474892 387.475915C899.476427 725.646891 725.648426 899.476939 512.000512 899.476939z",
@@ -117,11 +117,11 @@ function IndividualActivities() {
             let c = ['rgb(153, 204, 255)', 'rgb(0, 255, 0)', 'rgb(0, 153, 255)', 'rgb(255, 153, 0)']
             setoriData_right({
                 media_read_trend: {
-                    name: '开学第一课活跃用户趋势',
+                    name: '开学第一课日累计活跃数',
                     data: d.dayTrend || []
                 },
                 media_spread_trend: {
-                    name: '开学第一课新增用户趋势',
+                    name: '开学第一课用户趋势',
                     data: d.trend || []
                 },
                 media_total: {
@@ -140,7 +140,7 @@ function IndividualActivities() {
                     title: '开学第一课-' + d.topList[0].name,
                     color: "rgb(0,153,255)",
                     value: d.topList[0].activeUser,
-                    key: '小时',
+                    key: '',
                     path: [
                         {
                             d: 'M920.900621 803.267543 112.32753 803.267543c-49.059901 0-88.982874-39.921757-88.982874-88.982874L23.344655 172.240573c0-49.07328 39.922973-88.996254 88.982874-88.996254l808.573091 0c49.061117 0 88.981658 39.922973 88.981658 88.996254l0 542.044096C1009.882279 763.345786 969.961738 803.267543 920.900621 803.267543zM112.32753 104.039587c-37.593738 0-68.188823 30.595085-68.188823 68.202202l0 542.044096c0 37.594954 30.595085 68.190039 68.188823 68.190039l808.573091 0c37.592522 0 68.190039-30.593869 68.190039-68.190039L989.09066 172.240573c0-37.605901-30.596301-68.202202-68.190039-68.202202L112.32753 104.038371z',
@@ -199,7 +199,8 @@ function IndividualActivities() {
                 {
                     title: '开学第一课-' + d.topList[1].name,
                     color: "rgb(255,153,0)",
-                    value: d.topList[1].activeUser,
+                    key: "小时",
+                    value: d.topList[1].activeUser/3600,
                     path: [
                         {
                             d: "M294.4 684.032c-95.232 0-174.592-79.36-174.592-174.592s79.36-174.592 174.592-174.592 174.592 79.36 174.592 174.592-78.848 174.592-174.592 174.592z m0-293.376c-65.024 0-118.784 53.76-118.784 118.784s53.76 118.784 118.784 118.784 118.784-53.76 118.784-118.784-53.248-118.784-118.784-118.784zM732.672 1013.248c-86.016 0-156.16-69.632-156.16-156.16s69.632-156.16 156.16-156.16 156.16 69.632 156.16 156.16-70.144 156.16-156.16 156.16z m0-256c-55.808 0-99.84 44.032-99.84 99.84s44.032 99.84 99.84 99.84 99.84-44.032 99.84-99.84-44.032-99.84-99.84-99.84zM667.136 291.84c-79.36 0-141.824-62.976-141.824-141.824s62.976-141.824 141.824-141.824S808.96 71.168 808.96 150.016 745.984 291.84 667.136 291.84z m0-227.84c-46.592 0-86.016 39.424-86.016 86.016s39.424 86.016 86.016 86.016 86.016-39.424 86.016-86.016-39.424-86.016-86.016-86.016z",

src/pages/IndividualActivities/components/NewMediaTrend.jsx

@@ -12,7 +12,7 @@ function Usertrend(prop) {
             let dt = v.dt.split("-")
             return {
                 Data: dt[1] + '-' + dt[2],
-                sales: v.newUser
+                sales: v.totalUser
             }
         }).reverse();
         const chart = new Chart({

src/pages/IndividualActivities/components/SelfPlatform.jsx

@@ -17,7 +17,7 @@ function Usertrend(prop) {
         const data = (prop.list || []).map(v => {
             return {
                 Data: DataFormmat(v.dt),
-                sales: v.activeUser
+                sales: v.totalActiveUser || 0
             }
         }).reverse();
         const chart = new Chart({

src/pages/IndividualActivities/components/Usertrend.jsx

@@ -7,10 +7,10 @@ import utils from "../../../utils/index"
 
 function DataFormmat(timeString) {
     if (!timeString || typeof timeString !== 'string') return "";
-    const y = timeString[0] + timeString[1] + timeString[2] + timeString[3];
+    // const y = timeString[0] + timeString[1] + timeString[2] + timeString[3];
     const m = timeString[4] + timeString[5];
     const d = timeString[6] + timeString[7];
-    return [y, m, d].join("-");
+    return [m, d].join("-");
 }
 
 function Usertrend(prop) {
@@ -29,8 +29,8 @@ function Usertrend(prop) {
             width,
             padding: [
                 20,
-                60,
                 30,
+                20,
                 70,
             ]
         });
@@ -44,12 +44,7 @@ function Usertrend(prop) {
             }
         })
         chart.data(data);
-        chart.scale('Data', {
-            range: [0, 1],
-            tickCount: 10,
-            type: 'timeCat',
-            mask: "MM-DD"
-        });
+        chart.scale('Data');
         chart.scale('sales', {
             nice: true,
         });
@@ -81,7 +76,7 @@ function Usertrend(prop) {
         chart.axis('Data', {
             label: {
                 style: {
-                    fill: "#ffffff00"
+                    fill: "#ffffff"
                 },
             },
             grid: null