From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/view/timer.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/view/timer.vue b/src/view/timer.vue
index 12a66ce..89650b5 100644
--- a/src/view/timer.vue
+++ b/src/view/timer.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Author: licp lichunping@guanfang.com.cn
+ * @Date: 2024-08-20 09:31:20
+ * @LastEditors: licp lichunping@guanfang.com.cn
+ * @LastEditTime: 2024-12-19 09:57:53
+ * @FilePath: \tx-lims-before\src\view\timer.vue
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
<template>
<div>
<el-dialog
@@ -35,7 +43,7 @@
const hours = now.getHours();
const minutes = now.getMinutes();
- if (hours === 20 && minutes === 0) {
+ if (hours === 22 && minutes === 0) {
this.performTask();
// 璁剧疆20鍒嗛挓鍚庢彁绀哄叧闂�
this.closeTimeout = setTimeout(() => {
--
Gitblit v1.9.3