From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/clock.js | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/clock.js b/src/main/webapp/static/js/clock.js
index a0a8d92..c28fc6a 100644
--- a/src/main/webapp/static/js/clock.js
+++ b/src/main/webapp/static/js/clock.js
@@ -1,14 +1,21 @@
- var t = null;
- t = setTimeout(time,0);
- function time() {
- clearTimeout(t);
- dt = new Date();
- var y = dt.getFullYear();
- var mt = dt.getMonth()+1;
- var day = dt.getDate();
- var h = dt.getHours();
- var m = dt.getMinutes();
- var s = dt.getSeconds();
- document.getElementById('showTime').innerHTML = y+'骞�'+mt+'鏈�'+day+'鏃�'+h+'鏃�'+m+'鍒�'+s+'绉�';
- t=setTimeout(time,1000);
- }
\ No newline at end of file
+
+
+setInterval(function(){
+ dt = new Date();
+ var y = dt.getFullYear();
+ var mt = dt.getMonth()+1;
+ var day = dt.getDate();
+ var h = dt.getHours();
+ var m = dt.getMinutes();
+ var s = dt.getSeconds();
+
+ // document.getElementById('showTime').innerHTML = y+'骞�'+mt+'鏈�'+day+'鏃�'+h+'鏃�'+m+'鍒�'+s+'绉�';
+ document.getElementById('showTime').innerHTML =y+'-'+padding1(mt,2)+'-'+padding1(day,2)+' '+padding1(h,2)+':'+padding1(m,2)+':'+padding1(s,2)+'';
+
+ function padding1(num, length) {
+ for(var len = (num + "").length; len < length; len = num.length) {
+ num = "0" + num;
+ }
+ return num;
+ }
+},1000)
\ No newline at end of file
--
Gitblit v1.9.1