提交

src/pages/CommonBigScreen/components/NewMediaTrend.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) {
@@ -43,6 +43,7 @@ function Usertrend(prop) {
                 70,
             ]
         });
+        data.reverse();
         chart.data(data);
         chart.legend({
             position: "top",
@@ -58,7 +59,10 @@ function Usertrend(prop) {
         chart.scale('Data', {
             range: [0, 1],
             tickCount: 10,
-            type: 'timeCat'
+            type: 'timeCat',
+            formatter(value, index){
+                return data[index].Data
+            }
         });
         chart.axis('Data', {
             label: {

src/pages/CommonBigScreen/components/SelfPlatform.jsx

@@ -7,10 +7,11 @@ 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("-");
+    // return [y, m, d].join("-");
 }
 
 function Usertrend(prop) {
@@ -43,11 +44,15 @@ function Usertrend(prop) {
                 min = v.sales;
             }
         })
+        data.reverse();
         chart.data(data);
         chart.scale('Data', {
             range: [0, 1],
             tickCount: 10,
-            type: 'timeCat'
+            type: 'timeCat',
+            formatter(value, index){
+                return data[index].Data
+            }
         });
         chart.scale('sales', {
             nice: true,

src/pages/bigScreen/components/NewMediaTrend.jsx

@@ -7,10 +7,11 @@ 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("-");
+    // return [y, m, d].join("-");
 }
 
 function Usertrend(prop) {
@@ -43,6 +44,7 @@ function Usertrend(prop) {
                 70,
             ]
         });
+        data.reverse();
         chart.data(data);
         chart.legend({
             position: "top",
@@ -58,7 +60,10 @@ function Usertrend(prop) {
         chart.scale('Data', {
             range: [0, 1],
             tickCount: 10,
-            type: 'timeCat'
+            type: 'timeCat',
+            formatter(value, index){
+                return data[index].Data
+            }
         });
         chart.axis('Data', {
             label: {

src/pages/bigScreen/components/SelfPlatform.jsx

@@ -7,10 +7,11 @@ 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("-");
+    // return [y, m, d].join("-");
 }
 
 function Usertrend(prop) {
@@ -43,11 +44,15 @@ function Usertrend(prop) {
                 min = v.sales;
             }
         })
+        data.reverse();
         chart.data(data);
         chart.scale('Data', {
             range: [0, 1],
             tickCount: 10,
-            type: 'timeCat'
+            type: 'timeCat',
+            formatter(value, index){
+                return data[index].Data
+            }
         });
         chart.scale('sales', {
             nice: true,