From 992a313c129059b4b65473d3299c6ec417009f10 Mon Sep 17 00:00:00 2001 From: lucky Date: Sun, 25 Jul 2021 17:45:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BB=B6=E8=BF=9F=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../p-task-start-time-delay.vue | 6 ++---- src/utils/time.js | 12 ------------ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c38b37..f234e04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ ### 🐛 Bug 修复 范围|描述|commitId --|--|-- + - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/41257eb) - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/92b3254) - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/aa4981c) - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e9fdd71) diff --git a/src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue b/src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue index 176a4e8..d6205e2 100644 --- a/src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue +++ b/src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue @@ -1,10 +1,8 @@ diff --git a/src/utils/time.js b/src/utils/time.js index e4bddc5..eb7e9c4 100644 --- a/src/utils/time.js +++ b/src/utils/time.js @@ -241,17 +241,6 @@ const formatObjectTimeToMs = (days = 0, hours = 0, minutes = 0, seconds = 0) => return days * 24 * 60 * 60 * 1000 + hours * 60 * 60 * 1000 + minutes * 60 * 1000 + seconds * 1000; }; -const setDuringTime = time => { - // 小时 - const hour = time / (60 * 60); - // 分钟 - const min = time / 60 - hour * 60; - // 秒 - const sec = time - hour * 60 * 60 - min * 60; - const result = hour + '时' + min + '分' + sec + '秒'; - return result; -}; - /** * 计算过滤 周期 * @param {string} time 周期字符串 @@ -318,5 +307,4 @@ export default { formatObjectTimeToMs, computeCycle, formatStartTimeToCycleTime, - setDuringTime, }; From 249f9e4e00fb535d269196aeb7e6425b3269e5a6 Mon Sep 17 00:00:00 2001 From: aBin Date: Mon, 26 Jul 2021 00:31:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=9D=A2=E6=9D=BF=E9=AB=98=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/components/Globals/Globals.vue | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f234e04..7a9eeff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e9fdd71) - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6) - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da1eece) + - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/992a313) - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/cd26285) - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/880ce5c) - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01) diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue index a4f0ab4..15b2634 100644 --- a/src/components/Globals/Globals.vue +++ b/src/components/Globals/Globals.vue @@ -1,9 +1,9 @@