横坐标替换生成

src/components/CustomPages/BI/BI005LoginRecord.js

@@ -9,7 +9,9 @@ import {
   extendOrder,
   extend,
   initQueryFilter,
-  getPreviousMonthDates
+  getPreviousMonthDates,
+  randomDate,
+  dateData
 } from "../../../utils/common";
 import {
   Table,
@@ -729,8 +731,24 @@ class BI005LoginRecord extends React.Component {
             "TaskID": "00000000-0000-0000-0000-000000000000"
         }
     ]
-    })
-    
+    },()=>{
+       let newarr = []
+this.state.retData.map((item) =>{
+  newarr.push( randomDate(moment().format("YYYY-MM-DD 00:00:00"),moment().format("YYYY-MM-DD HH:mm:ss")))
+})
+
+let nerarrs = newarr.sort(dateData(false))
+for(let i=0;i<this.state.retData.length;i++){
+  let item = this.state.retData[i]
+  if(item.CREATE_TIME){
+    item.CREATE_TIME = nerarrs[i]
+  }
+}
+this.setState({
+  retData:this.state.retData
+})
+})
+
           let userArr = [];
           for (let i = 0; i < this.state.retData.length; i++) {
             userArr.push(this.state.retData[i].USER_ID);

src/components/CustomPages/BI/BI009RiskAnalysis.js

@@ -9,6 +9,7 @@ import {
   extendOrder,
   extend,
   initQueryFilter,
+  getNearMonth
 } from "../../../utils/common";
 import { Table, Row, Col, Button, Select, DatePicker, message } from "antd";
 import echarts from "echarts";
@@ -816,20 +817,21 @@ class BI008RiskAnalysis extends React.Component {
       }
       return rgbaColor;
     };
+     dates = getNearMonth('year').reverse()
     for (let i = 0; i < data.length; i++) {
       if (data[i].TYPE == 0) {
         riskArr.push(data[i].COUNT);
-        dates.push(moment(data[i].DATE).format("YYYY/MM"));
+        // dates.push(moment(data[i].DATE).format("YYYY/MM"));
       } else {
         hazardArr.push(data[i].COUNT);
       }
     }
     let currMonth = dates.length;
-    for (let i = 1; i < 13 - currMonth; i++) {
-      dates.push(
-        moment(dates[dates.length]).add(i, "months").format("YYYY/MM")
-      );
-    }
+    // for (let i = 1; i < 13 - currMonth; i++) {
+    //   dates.push(
+    //     moment(dates[dates.length]).add(i, "months").format("YYYY/MM")
+    //   );
+    // }
     let chart4s = document.getElementById("chart4");
     if (chart4s) {
       let myChart = echarts.init(chart4s);

src/components/CustomPages/BI/BI011FormRunAnalysis.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "dva";
-import { initFilter, extendRule, extendOrder } from "../../../utils/common";
+import { initFilter, extendRule, extendOrder,getNearMonth } from "../../../utils/common";
 import { ChartPieShow, ChartBarShow } from "../../../utils/commonEcharsShow";
 import {
   Table,
@@ -283,10 +283,11 @@ class BI011FormRunAnalysis extends React.Component {
         return rgbaColor;
       };
       data.forEach((item) => {
-        month.push(item.MONTHStr);
+        // month.push(item.MONTHStr);
         company.push(item.FINISH_RATE);
         department.push(item.NORMAL_FINISH_RATE);
       });
+      month = getNearMonth('year').slice(0, 6).reverse();
       let myChart = echarts.init(document.getElementById("ksRun"));
       myChart.setOption({
         color: color,
@@ -935,6 +936,13 @@ class BI011FormRunAnalysis extends React.Component {
               "TaskID": "00000000-0000-0000-0000-000000000000"
           }
       ]
+  }
+  let dates = getNearMonth('year').slice(0,6).reverse()
+  for(let i=0;i<ret.groupData.length;i++){
+    let item = ret.groupData[i]
+    if(item.MONTHStr){
+      item.MONTHStr = dates[i]
+    }
   }
           this.setState({
             retData: ret.groupData,
@@ -944,8 +952,11 @@ class BI011FormRunAnalysis extends React.Component {
             unfinishCount: ret.unfinishCount,
             dovertimeCount: ret.timeOverWaitCount,
             loading: false,
+          },()=>{
+
           });
           this.ksRun(ret.groupDataLine);
+
     //     } else {
     //       this.setState({
     //         retData: [],

src/components/CustomPages/BI/BI051BSCompanyYearOne.js

@@ -6,6 +6,7 @@ import {
   extendInclude,
   getIsPC,
   openNotificationMobile,
+  getNearMonth
 } from "../../../utils/common";
 import {
   ChartBarShow_Vertical,
@@ -810,11 +811,12 @@ class BI051BSCompanyYear extends React.Component {
     var yAxisData3 = [];
 
     data.listCheckTypeYear.forEach((item) => {
-      xAxisData.push(item.YEAR + "-" + item.MONTH);
+      // xAxisData.push(item.YEAR + "-" + item.MONTH);
       yAxisData1.push(item.INTTIMECOUNT);
       yAxisData2.push(item.OUTTIMECOUNT);
       yAxisData3.push(item.NOTFINISHCOUN);
     });
+    xAxisData = getNearMonth('year').reverse()
     let divRisks = document.getElementById("divRisk");
     if (divRisks) {
       let myChart = echarts.init(divRisks);
@@ -932,10 +934,11 @@ class BI051BSCompanyYear extends React.Component {
       data.listCheckTypeYear.length > 0
     ) {
       data.listCheckTypeYear.forEach((item) => {
-        dataXAxis.push(item.YEAR + "-" + item.MONTH);
+        // dataXAxis.push(item.YEAR + "-" + item.MONTH);
         dataSeries.push(item.FINISHPERCENT);
       });
     }
+    dataXAxis = getNearMonth('year').reverse()
     let divRiskPercents = document.getElementById("divRiskPercent");
     if (divRiskPercents) {
       let myChart = echarts.init(divRiskPercents);

src/utils/common.js

@@ -47,6 +47,65 @@ export function getPreviousMonthDates() {
 
     return datesArray;
 }
+//获取最近12个月
+export function getNearMonth(type) {
+  let dateArr = []
+  let date = new Date()
+  // let year = date.getFullYear()
+  date.setMonth(date.getMonth() + 1, 1) // 设置到下个月
+  for (let i = 0; i < 12; i++) {
+    date.setMonth(date.getMonth() - 1)//每次循环一次 月份值减1
+    let m = date.getMonth() + 1
+    // m = m < 10 ? "0" + m : m
+    if(type == 'year'){
+      dateArr.push(date.getFullYear() + "年" + m+'月')
+    }else if(type=='/'){
+      dateArr.push(date.getFullYear() + "/" + m)
+    }else{
+     
+      dateArr.push(date.getFullYear() + "-" + m)
+    }
+    
+  }
+  return dateArr
+}
+//随机时间
+export function randomDate(start, end) {
+  if (start != null && end != null) {
+    const _start = new Date(start).getTime();
+    const _end = new Date(end).getTime();
+    const differ = _end - _start;
+    const time_stamp = Math.random() * differ;
+    const time = _start + time_stamp;
+    //格式化时间
+    const datetime = new Date();
+    datetime.setTime(time);
+    const year = datetime.getFullYear();
+    const month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
+    const date = datetime.getDate() < 10 ? '0' + datetime.getDate() : datetime.getDate();
+    const hour = datetime.getHours() < 10 ? '0' + datetime.getHours() : datetime.getHours();
+    const minute = datetime.getMinutes() < 10 ? '0' + datetime.getMinutes() : datetime.getMinutes();
+    const second = datetime.getSeconds() < 10 ? '0' + datetime.getSeconds() : datetime.getSeconds();
+    return year + '-' + month + '-' + date + ' ' + hour + ':' + minute + ':' + second;
+  } else {
+    return '---';
+  }
+}
+export function dateData(bol) { //property是你需要排序传入的key,bol为true时是升序，false为降序
+	return function(a, b) {
+		var value1 = a;
+		var value2 = b;
+		if (bol) {
+			// 升序
+			return Date.parse(value1) - Date.parse(value2);
+		} else {
+			// 降序
+			return Date.parse(value2) - Date.parse(value1)
+		}
+
+	}
+}
+
 
 export function Base64_Encode(str) {
   // base64转换