修复 时光胶囊显示错误 #101

src/components/TimeCapsule/index.vue

@@ -9,7 +9,7 @@
       <span>时光胶囊</span>
     </div>
     <span class="text"
-      >今日已经度过了&nbsp;{{ timeData.day.start }}&nbsp;小时</span
+      >今日已经度过了&nbsp;{{ timeData.day.elapsed }}&nbsp;小时</span
     >
     <el-progress
       :text-inside="true"
@@ -17,7 +17,7 @@
       :percentage="timeData.day.pass"
     />
     <span class="text"
-      >本周已经度过了&nbsp;{{ timeData.week.start }}&nbsp;天</span
+      >本周已经度过了&nbsp;{{ timeData.week.elapsed }}&nbsp;天</span
     >
     <el-progress
       :text-inside="true"
@@ -25,7 +25,7 @@
       :percentage="timeData.week.pass"
     />
     <span class="text"
-      >本月已经度过了&nbsp;{{ timeData.month.start }}&nbsp;天</span
+      >本月已经度过了&nbsp;{{ timeData.month.elapsed }}&nbsp;天</span
     >
     <el-progress
       :text-inside="true"
@@ -33,7 +33,7 @@
       :percentage="timeData.month.pass"
     />
     <span class="text"
-      >今年已经度过了&nbsp;{{ timeData.year.start }}&nbsp;个月</span
+      >今年已经度过了&nbsp;{{ timeData.year.elapsed }}&nbsp;个月</span
     >
     <el-progress
       :text-inside="true"

src/utils/getTime.js

@@ -1,20 +1,29 @@
-import {
+import { h } from "vue";
-    h
+import { SpaCandle } from "@icon-park/vue-next";
-} from "vue";
-import {
-    SpaCandle
-} from "@icon-park/vue-next";
 
 // 时钟
 export const getCurrentTime = () => {
   let time = new Date();
   let year = time.getFullYear();
-    let month = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
+  let month =
-    let day = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
+    time.getMonth() + 1 < 10
-    let hour = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+      ? "0" + (time.getMonth() + 1)
-    let minute = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+      : time.getMonth() + 1;
-    let second = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
+  let day = time.getDate() < 10 ? "0" + time.getDate() : time.getDate();
-    let weekday = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+  let hour = time.getHours() < 10 ? "0" + time.getHours() : time.getHours();
+  let minute =
+    time.getMinutes() < 10 ? "0" + time.getMinutes() : time.getMinutes();
+  let second =
+    time.getSeconds() < 10 ? "0" + time.getSeconds() : time.getSeconds();
+  let weekday = [
+    "星期日",
+    "星期一",
+    "星期二",
+    "星期三",
+    "星期四",
+    "星期五",
+    "星期六",
+  ];
   let currentTime = {
     year,
     month,
@@ -23,51 +32,59 @@ export const getCurrentTime = () => {
     minute,
     second,
     weekday: weekday[time.getDay()],
-    }
+  };
   return currentTime;
-}
+};
 
 // 时光胶囊
 export const getTimeCapsule = () => {
   // 日进度
-    let todayStartDate = new Date(new Date().toLocaleDateString()).getTime();
+  const todayStartDate = new Date(new Date().toLocaleDateString()).getTime();
-    let todayPassHours = (new Date() - todayStartDate) / 1000 / 60 / 60;
+  const todayPassHours = (new Date() - todayStartDate) / 1000 / 60 / 60;
-    let todayPassHoursPercent = (todayPassHours / 24) * 100;
+  const todayPassHoursPercent = (todayPassHours / 24) * 100;
+
   // 周进度
-    let weeks = [7, 1, 2, 3, 4, 5, 6];
+  const weeks = [7, 1, 2, 3, 4, 5, 6];
-    let weekDay = weeks[new Date().getDay()];
+  const weekDay = weeks[new Date().getDay()];
-    let weekDayPassPercent = (weekDay / 7) * 100;
+  const weekDayPassPercent = (weekDay / 7) * 100;
+
   // 月进度
-    let year = new Date().getFullYear();
+  const year = new Date().getFullYear();
-    let date = new Date().getDate();
+  const date = new Date().getDate();
-    let month = new Date().getMonth() + 1;
+  const month = new Date().getMonth() + 1;
-    let monthAll = new Date(year, month, 0).getDate();
+  const monthAll = new Date(year, month, 0).getDate();
-    let monthPassPercent = (date / monthAll) * 100;
+  const monthPassPercent = (date / monthAll) * 100;
+
   // 年进度
-    let yearPass = (month / 12) * 100;
+  const yearStartDate = new Date(year, 0, 1).getTime();
+  const yearEndDate = new Date(year + 1, 0, 1).getTime();
+  const yearPassHours = (new Date() - yearStartDate) / 1000 / 60 / 60;
+  const yearTotalHours = (yearEndDate - yearStartDate) / 1000 / 60 / 60;
+  const yearPassPercent = (yearPassHours / yearTotalHours) * 100;
+
   return {
     day: {
-            start: parseInt(todayPassHours),
+      elapsed: Math.floor(todayPassHours),
-            pass: parseInt(todayPassHoursPercent),
+      pass: Math.floor(todayPassHoursPercent),
     },
     week: {
-            start: weekDay,
+      elapsed: weekDay,
-            pass: parseInt(weekDayPassPercent),
+      pass: Math.floor(weekDayPassPercent),
     },
     month: {
-            start: date,
+      elapsed: date,
-            pass: parseInt(monthPassPercent),
+      pass: Math.floor(monthPassPercent),
     },
     year: {
-            start: month == 0 ? month : month - 1,
+      elapsed: month - 1,
-            pass: parseInt(yearPass),
+      pass: Math.floor(yearPassPercent),
-        }
+    },
-    }
+  };
-}
+};
 
 // 欢迎提示
 export const helloInit = () => {
-    let hour = new Date().getHours();
+  const hour = new Date().getHours();
   let hello = null;
   if (hour < 6) {
     hello = "凌晨好";
@@ -90,32 +107,33 @@ export const helloInit = () => {
     dangerouslyUseHTMLString: true,
     message: `<strong>${hello}</strong> 欢迎来到我的主页`,
   });
-}
+};
 
 // 默哀模式
+const anniversaries = {
+  4.4: "清明节",
+  5.12: "汶川大地震纪念日",
+  7.7: "中国人民抗日战争纪念日",
+  9.18: "九·一八事变纪念日",
+  12.13: "南京大屠杀死难者国家公祭日",
+};
 export const checkDays = () => {
-    let myDate = new Date;
+  const myDate = new Date();
-    let mon = myDate.getMonth() + 1;
+  const mon = myDate.getMonth() + 1;
-    let date = myDate.getDate();
+  const date = myDate.getDate();
-    let days = ['4.4', '5.12', '7.7', '9.9', '9.18', '12.13'];
+  const key = `${mon}.${date}`;
-    for (let day of days) {
+  if (anniversaries.hasOwnProperty(key)) {
-        let d = day.split('.');
+    console.log(`今天是${anniversaries[key]}`);
-        if (mon == d[0] && date == d[1]) {
+    const gray = document.createElement("style");
-            console.log("今天是纪念日");
+    gray.innerHTML = "html{filter: grayscale(100%)}";
-            let gray = document.createElement("style");
+    document.head.appendChild(gray);
-            document.body.appendChild(gray);
-            gray.innerHTML = "html{-webkit-filter:grayscale(100%);-moz-filter:grayscale(100%);-ms-filter:grayscale(100%);-o-filter:grayscale(100%);filter:progid:DXImageTransform.Microsoft.BasicImage(grayscale=1);_filter:none}";
     ElMessage({
-                message: "今天是中国国家纪念日",
+      message: `今天是${anniversaries[key]}`,
       duration: 14000,
-                icon: h(SpaCandle, {
+      icon: h(SpaCandle, { theme: "filled", fill: "#efefef" }),
-                    theme: "filled",
-                    fill: "#efefef",
-                }),
     });
   }
-    }
+};
-}
 
 // 建站日期统计
 export const siteDateStatistics = (startDate) => {
@@ -125,10 +143,14 @@ export const siteDateStatistics = (startDate) => {
   const differenceInMonths = differenceInDays / 30;
   const differenceInYears = differenceInMonths / 12;
   if (differenceInYears >= 1) {
-        return `本站已经苟活了 ${Math.floor(differenceInYears)} 年 ${Math.floor(differenceInMonths % 12)} 月 ${Math.round(differenceInDays % 30)} 天`;
+    return `本站已经苟活了 ${Math.floor(differenceInYears)} 年 ${Math.floor(
+      differenceInMonths % 12
+    )} 月 ${Math.round(differenceInDays % 30)} 天`;
   } else if (differenceInMonths >= 1) {
-        return `本站已经苟活了 ${Math.floor(differenceInMonths)} 月 ${Math.round(differenceInDays % 30)} 天`;
+    return `本站已经苟活了 ${Math.floor(differenceInMonths)} 月 ${Math.round(
+      differenceInDays % 30
+    )} 天`;
   } else {
     return `本站已经苟活了 ${Math.round(differenceInDays)} 天`;
   }
-}
+};