From e861494f28d797ce06509e9d845eacd9076eb6b4 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 21 七月 2020 20:27:17 +0800
Subject: [PATCH] fix: 修复桌面显示,添加 gb28181 页面
---
src/pages/desktop/index/components/Calendar.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/home/desktop/components/Calendar.js b/src/pages/desktop/index/components/Calendar.js
similarity index 96%
rename from src/pages/home/desktop/components/Calendar.js
rename to src/pages/desktop/index/components/Calendar.js
index 252b063..272a499 100644
--- a/src/pages/home/desktop/components/Calendar.js
+++ b/src/pages/desktop/index/components/Calendar.js
@@ -81,7 +81,7 @@
date = new Date();
}
return [this.dateOfYear(date), this.weekOfDate(date),
- this.timeWithoutSecond(date)].join(" ");
+ this.timeWithoutSecond(date)].join(" ");
},
lunarYear: date => {
@@ -94,7 +94,7 @@
year--;
}
return heavenlyStems[year % heavenlyStems.length] + earthlyBranches[year
- % earthlyBranches.length] + '骞�';
+ % earthlyBranches.length] + '骞�';
},
lunarDateI18n: function (data) {
@@ -134,7 +134,7 @@
return this.lunarYear(date) + this.lunarDateI18n(dateData[0][1] + day - 1)
} else {
return this.lunarYear(date) + this.lunarDateI18n(
- dateData[1][1] + day - (dateData[1][0] % 100))
+ dateData[1][1] + day - (dateData[1][0] % 100))
}
},
--
Gitblit v1.8.0