From 72085226bc9f82a9129b8fbcd17fab1edf9ef270 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 05 一月 2024 15:08:19 +0800 Subject: [PATCH] 1. 修复飞行巡检模块中有效率异常详情弹出框无法正常显示的bug; 2.优化各异常类型的折线图配置项生成逻辑; --- src/utils/time.js | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/utils/time.js b/src/utils/time.js index 7a42a2b..738e1d9 100644 --- a/src/utils/time.js +++ b/src/utils/time.js @@ -145,13 +145,35 @@ }, /** - * 鏍规嵁瀵硅薄鏁扮粍涓璴st瀛楁鎸夊崌搴忔帓鍒� - * @param锛� + * 鎵惧埌鍦ㄧ粰瀹氱殑寮�濮嬫椂闂碽t鍜岀粨鏉熸椂闂磂t涔嬮棿缂哄け鐨勬椂闂村尯闂� + * @param锛氬紑濮嬫椂闂达紝缁撴潫鏃堕棿锛屽湪杩欎釜鏃堕棿鑼冨洿鍐呭凡鏈夌殑鏃堕棿锛堟椂闂村瓧绗︿覆鏁扮粍锛� * @returns锛� */ - compareByScore(a, b) { - const dateA = new Date(a.lst) - const dateB = new Date(b.lst) - return dateA - dateB + getMissingDays(bt, et, timeArr) { + // 瀛樺偍缂哄け鐨勬椂闂村尯闂� + const r = [] + const begin = dayjs(bt) + const end = dayjs(et) + // 寮�濮嬫椂闂� + let current = begin + + for (const time of timeArr) { + const currentTime = dayjs(time) + if (currentTime.isBefore(current)) { + continue + } + + if (currentTime.isAfter(current)) { + r.push([current.format('YYYY-MM-DD'), currentTime.format('YYYY-MM-DD')]) + } + + current = currentTime.add(1, 'day') + } + + if (end.isAfter(current)) { + r.push([current.format('YYYY-MM-DD'), end.format('YYYY-MM-DD')]) + } + + return r } } -- Gitblit v1.9.3