zx

src/views/BrandComparison/brandRearWingComparison/opt.js

@@ -83,11 +83,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/BrandComparison/comparisonOfForumPostingTrends/opt.js

@@ -76,11 +76,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/BrandComparison/informationTrend/opt.js

@@ -75,11 +75,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/EventComparison/tirEc/opt.js

@@ -85,11 +85,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/ModelComparison/brandRearWingComparison/opt.js

@@ -75,11 +75,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/ModelComparison/comparisonOfForumPostingTrends/opt.js

@@ -75,11 +75,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }

src/views/ModelComparison/informationTrend/opt.js

@@ -75,11 +75,19 @@ export default function createOpt(dx = [], ds = []) {
             axisLabel: {
                 formatter: (value) => {
                     let rex = "00:00:00";
-                    let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    let isCont = false;
+                    let str = value;
+                    for(let i = 0;i<dx.length-1;i++){
+                        //连续两条带小时
+                        if(dx[i].indexOf(rex) === -1 && dx[i+1].indexOf(rex) === -1){
+                            isCont = true;
+                            break;
+                        }
+                    }
+                    if(isCont == true) {
                         str = value.substring(10, 16)
                     } else {
-                        str = value.substring(0, 10)
+                        str = value.substring(5, 10)
                     }
                     return str;
                 }