From d8d065624231a61e4dc86205bc2e34c9b99ea2cb Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 24 Aug 2022 12:58:27 +0800
Subject: [PATCH] 修复图表不能点击的问题，修复图表提示窗出界的问题
---
common/Tools.js | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 7a9af98..f5d896f 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -70,6 +70,22 @@
}
/**
+ * 获取随机字符串
+ * @param {number} long
+ * @return {string}
+ */
+ static getRandomString(long) {
+ long = long || 32;
+ const template = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+ const count = template.length;
+ let result = '';
+ for (let i = 0; i < long; i++) {
+ result += template.charAt(Math.floor(Math.random() * count));
+ }
+ return result;
+ }
+
+ /**
* 检查网络状态
*/
static checkOnlineState(callback) {
@@ -87,7 +103,7 @@
img.onerror = null;
callback && callback(false);
};
- img.src = 'http://tt.zhiheiot.com/static/online.png?t=' + Date.now();
+ img.src = 'http://gz.zhiheiot.com/disp/download/buildArchive/online.png?t=' + Date.now();
}
// 网络未开启
else {
@@ -500,6 +516,23 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+ /**
+ * 转换周数到日期
+ * @param year
+ * @param week
+ * @param weekDay 需要输出星期几对应的日期 (1~7)
+ * @return {Date}
+ */
+ static transWeekIndexToDate(year, week, weekDay) {
+ const yearStart = moment([year, 0, 1]);
+ const dayLong = 24 * 60 * 60 * 1000;
+ const firstWeekLong = (7 - yearStart.day()) * dayLong;
+ const weeksLong = (week - 1) * 7 * dayLong;
+ const weekDayLong = weekDay * dayLong;
+ const dayTimestamp = yearStart.valueOf() + firstWeekLong + weeksLong + weekDayLong;
+ return moment(dayTimestamp).format('YYYY-MM-DD');
+ }
+
}
// h5 中，实现 rem 转换 px
@@ -515,4 +548,6 @@
const px = (value - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
console.info(Math.round(px) + 'px');
};
-}
\ No newline at end of file
+}
+
+global.Tools = Tools;
\ No newline at end of file
--
Gitblit v1.9.1