From 67caaf00358bb881675658ede6f0d13061156e09 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Wed, 15 Jan 2025 10:34:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=AA=E5=9D=90=E6=A0=87=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/BI/BI005LoginRecord.js | 24 +++++++- .../CustomPages/BI/BI009RiskAnalysis.js | 14 +++-- .../CustomPages/BI/BI011FormRunAnalysis.js | 15 ++++- .../CustomPages/BI/BI051BSCompanyYearOne.js | 7 ++- src/utils/common.js | 59 +++++++++++++++++++ 5 files changed, 106 insertions(+), 13 deletions(-) diff --git a/src/components/CustomPages/BI/BI005LoginRecord.js b/src/components/CustomPages/BI/BI005LoginRecord.js index 4d65515..eca115a 100644 --- a/src/components/CustomPages/BI/BI005LoginRecord.js +++ b/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 { - 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{ + }); this.ksRun(ret.groupDataLine); + // } else { // this.setState({ // retData: [], diff --git a/src/components/CustomPages/BI/BI051BSCompanyYearOne.js b/src/components/CustomPages/BI/BI051BSCompanyYearOne.js index 6953759..6102fbf 100644 --- a/src/components/CustomPages/BI/BI051BSCompanyYearOne.js +++ b/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); diff --git a/src/utils/common.js b/src/utils/common.js index a658aff..94c02ed 100644 --- a/src/utils/common.js +++ b/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转换