From 0c0cb8607ec387d936b1af89851a8ff2c480edcb Mon Sep 17 00:00:00 2001 From: Jimgo Date: Mon, 24 Mar 2025 01:33:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84index.0.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/index.0.html | 131 ------------------------- 1 file changed, 131 deletions(-) delete mode 100644 src/main/resources/static/index.0.html diff --git a/src/main/resources/static/index.0.html b/src/main/resources/static/index.0.html deleted file mode 100644 index 9372e45..0000000 --- a/src/main/resources/static/index.0.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - 打卡 - - - - -
-
- - -
- - -
-
-
-
-
打卡记录
-
-
-
-
-
- - - -
- - \ No newline at end of file -- 2.49.1 From fdc23e432600c4a07f449489389b73bcdf17e445 Mon Sep 17 00:00:00 2001 From: Jimgo Date: Wed, 26 Mar 2025 10:56:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?:ok:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hoperun/sign/scheduler/AutoDakaScheduler.kt | 12 ++++++------ src/main/resources/logback-spring.xml | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt index ad370a0..632152e 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt @@ -35,7 +35,7 @@ class AutoDakaScheduler { val logger: Logger = LoggerFactory.getLogger("DAKA-SHCEDULER") } - fun addAutoDakaScheduled(dakaDate: String = getNowDateyyyy_MM_dd()) { + private fun addAutoDakaScheduled(dakaDate: String = getNowDateyyyy_MM_dd()) { // 调休的工作日 if (isNeedDaka(dakaDate)) { HoperunUserConfig.userConfigMap.forEach { (_, v) -> @@ -45,8 +45,8 @@ class AutoDakaScheduler { if (daka == null) { daka = generateDakaInfo(v, dakaDate) dakaQueue.add(daka) + logger.info("${v.username},${daka.toCsv()}") } - logger.info("${v.username},${daka.toCsv()}") } } } @@ -89,9 +89,9 @@ class AutoDakaScheduler { try { logger.info("[EXECUTE]BEGIN:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.beginTime}") // 模拟重新登录打卡 - logger.info("${daka.employeeNo}OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}") + logger.info("${daka.employeeNo}-OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}") resetJSessionId(employeeNo = daka.employeeNo) - logger.info("${daka.employeeNo}NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}") + logger.info("${daka.employeeNo}-NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}") val resp: DakaResponse = beginTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.beginTime) if (resp.result != "success") { @@ -110,9 +110,9 @@ class AutoDakaScheduler { try { logger.info("[EXECUTE]END:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.endTime}") // 模拟重新登录打卡 - logger.info("${daka.employeeNo}OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}") + logger.info("${daka.employeeNo}-OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}") resetJSessionId(employeeNo = daka.employeeNo) - logger.info("${daka.employeeNo}NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}") + logger.info("${daka.employeeNo}-NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}") val resp: DakaResponse = endTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.endTime) if (resp.result != "success") { logger.error("打下班卡失败") diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index d46ac36..3e438ee 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -89,12 +89,14 @@ + + -- 2.49.1 From 615eec3b7a9339b9f8d2d48c6647059549f50308 Mon Sep 17 00:00:00 2001 From: Jimgo Date: Mon, 31 Mar 2025 10:19:13 +0800 Subject: [PATCH 3/8] =?UTF-8?q?:ok:=20=E7=A7=BB=E9=99=A4=E9=A4=90=E8=A1=A5?= =?UTF-8?q?=E6=A0=87=E5=BF=97,=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/script.js | 2 +- src/main/resources/static/style.css | 33 +++++++++++++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/resources/static/script.js b/src/main/resources/static/script.js index 695f366..9e11f8f 100644 --- a/src/main/resources/static/script.js +++ b/src/main/resources/static/script.js @@ -115,7 +115,7 @@ function loadDakaList() { '' + (signlog.autoDakaBeginTime == null ? "" : '
') + (signlog.autoDakaEndTime == null ? "" : '') + - (signlog.end_time != null && signlog.end_time.substr(11, 5) > "21:00" ? '' : '') + + // (signlog.end_time != null && signlog.end_time.substr(11, 5) > "21:00" ? '' : '') + '' + (index <= 3 ? '
' + '' + '' + '
' : '') + + (index > 3 ? + '
' + + signlog.actual_area_begin + + '
' + + (signlog.actual_area_begin !== signlog.actual_area_end ? '
' + + signlog.actual_area_end + + '
' : '') + : '') + '' ); } -- 2.49.1 From 49e4b473c672d6e8cb97b77fa0d61699ffe23f44 Mon Sep 17 00:00:00 2001 From: Jimgo Date: Mon, 31 Mar 2025 17:05:06 +0800 Subject: [PATCH 5/8] =?UTF-8?q?:ok:=20=E7=BB=99=E6=89=93=E5=8D=A1=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=BC=82=E5=B8=B8=E5=92=8C=E8=A1=A5=E7=AD=BE=E5=8D=A1?= =?UTF-8?q?=E5=8A=A0=E8=BE=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/index.html | 2 +- src/main/resources/static/script.js | 14 +++++++++--- src/main/resources/static/style.css | 34 +++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 45e2aec..f385e16 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -1 +1 @@ -打卡
打卡记录
\ No newline at end of file +打卡
打卡记录
diff --git a/src/main/resources/static/script.js b/src/main/resources/static/script.js index 3b26f79..4000dcd 100644 --- a/src/main/resources/static/script.js +++ b/src/main/resources/static/script.js @@ -105,7 +105,15 @@ function loadDakaList() { dateBeginTimeMap[signlog.yearmonth] = (signlog.begin_time == null ? "未打卡" : signlog.begin_time.substr(11, 5)); dateEndTimeMap[signlog.yearmonth] = (signlog.end_time == null ? "未打卡" : signlog.end_time.substr(11, 5)); index++; - $('.job-cards').append('
' + + let beginWarn = (signlog.begin_time != null && signlog.begin_time.substr(11, 5) > '09:30') + let endWarn = (signlog.end_time != null && signlog.end_time.substr(11, 5) < '18:30') + let buqianWarn = (signlog.actual_area_begin === '补签卡' || signlog.actual_area_end === '补签卡') + let weidakaWarn = (signlog.begin_time == null || signlog.end_time == null) + + $('.job-cards').append('
' + '
' + (nowDate === signlog.yearmonth ? "今天" : signlog.yearmonth) + '
' + '
' + signlog.area_id + @@ -113,8 +121,8 @@ function loadDakaList() { '
' + '' + '' + - (signlog.autoDakaBeginTime == null ? "" : '
') + - (signlog.autoDakaEndTime == null ? "" : '') + + (signlog.autoDakaBeginTime == null ? "" : '') + + (signlog.autoDakaEndTime == null ? "" : '') + // (signlog.end_time != null && signlog.end_time.substr(11, 5) > "21:00" ? '' : '') + '
' + (index <= 3 ? '
' + diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index 53d6509..94fb33b 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -638,6 +638,35 @@ body > div > div.userinfo_dialog > div > div > div input { } } +@property --border-angle { + syntax: ""; + initial-value: 0deg; + inherits: false; +} + + +@keyframes border-angle-rotate { + from { --border-angle: 0deg; } + to { --border-angle: 360deg; } +} + +.rainbow { + background: linear-gradient(var(--header-bg-color), var(--header-bg-color)) padding-box, + conic-gradient( + from var(--border-angle), + oklch(100% 100% 0deg), + oklch(100% 100% 45deg), + oklch(100% 100% 90deg), + oklch(100% 100% 135deg), + oklch(100% 100% 180deg), + oklch(100% 100% 225deg), + oklch(100% 100% 270deg), + oklch(100% 100% 315deg), + oklch(100% 100% 360deg) + ) + border-box; +} + .job-card { padding: 20px 16px; background-color: var(--header-bg-color); @@ -645,6 +674,9 @@ body > div > div.userinfo_dialog > div > div > div input { cursor: pointer; -webkit-transition: .2s; transition: .2s; + box-shadow: 0px 2px 4px hsl(0 0% 0% / 25%); + animation: border-angle-rotate 2s infinite linear; + border: 0.5rem solid transparent; } .job-card:hover { -webkit-transform: scale(1.02); @@ -722,7 +754,7 @@ body > div > div.userinfo_dialog > div > div > div input { display: grid; grid-template-columns: repeat(2, 1fr); grid-column-gap: 10px; - grid-row-gap: 25px; + grid-row-gap: 4px; } .job-card-buttons { -- 2.49.1 From 9cf8e0a47fe69d46489c3e5b7029499cd315e434 Mon Sep 17 00:00:00 2001 From: Jimgo Date: Mon, 31 Mar 2025 17:15:02 +0800 Subject: [PATCH 6/8] =?UTF-8?q?:ok:=20=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=BE=B9=E6=A1=86=E7=9A=84=E5=9C=86=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index 94fb33b..62fc788 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -670,7 +670,7 @@ body > div > div.userinfo_dialog > div > div > div input { .job-card { padding: 20px 16px; background-color: var(--header-bg-color); - border-radius: 8px; + border-radius: 16px; cursor: pointer; -webkit-transition: .2s; transition: .2s; @@ -682,6 +682,7 @@ body > div > div.userinfo_dialog > div > div > div input { -webkit-transform: scale(1.02); transform: scale(1.02); } + .job-card svg { width: 46px; padding: 10px; -- 2.49.1 From 45cd64b2844ab1937e2c3259cb1cfd33439df27c Mon Sep 17 00:00:00 2001 From: Jimgo Date: Mon, 31 Mar 2025 18:20:16 +0800 Subject: [PATCH 7/8] =?UTF-8?q?:ok:=20=E9=9A=90=E8=97=8F=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/style.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index 62fc788..a22964d 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -189,6 +189,7 @@ body { } .user-profile { + display: none; width: 32px; height: 32px; border-radius: 50%; @@ -390,12 +391,13 @@ body { } body > div > div.userinfo_dialog > div > div > div { - display: inline-flex; + display: inline-grid; + grid-template-columns: 20% 80%; width: 100%; } #username { - padding: 11px; + padding: 13px; } @@ -438,8 +440,12 @@ body > div > div.userinfo_dialog > div > div > div { color: var(--body-color) } +#username { + /*width: 64px;*/ +} + body > div > div.userinfo_dialog > div > div > div input { - width: 85%; + width: 100%; padding: 10px; display: block; border-radius: 8px 8px 8px 8px; -- 2.49.1 From e0a34dbb9c16de592cd03beb19c1867437f70baa Mon Sep 17 00:00:00 2001 From: Jimgo Date: Mon, 31 Mar 2025 18:24:25 +0800 Subject: [PATCH 8/8] =?UTF-8?q?:ok:=20=E7=BB=99dialog=E5=8A=A0=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/index.html | 2 +- src/main/resources/static/style.css | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index f385e16..9ea9ef4 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -1 +1 @@ -打卡
打卡记录
+打卡
打卡记录
diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index a22964d..4a18752 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -364,6 +364,10 @@ body { margin-left: -100px; margin-top: -100px; position: absolute; + box-shadow: 0px 2px 4px hsl(0 0% 0% / 25%); + animation: border-angle-rotate 2s infinite linear; + border: 0.5rem solid transparent; + border-radius: 16px; } .userinfo_dialog { @@ -376,6 +380,10 @@ body { position: absolute; margin: auto 0; transform: translate(-50%, -50%); + box-shadow: 0px 2px 4px hsl(0 0% 0% / 25%); + animation: border-angle-rotate 2s infinite linear; + border: 0.5rem solid transparent; + border-radius: 16px; } .userinfo_dialog > div > .alert-inline { -- 2.49.1