From a64da2da9e94583e2c8da1711a762107d5682ea1 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 24 Aug 2022 16:13:54 +0800
Subject: [PATCH] 修复多个图表绘制异常的问题
---
common/Tools.js | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index 0a8afb9..f5d896f 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -12,12 +12,13 @@
* 显示消息
* @param msg
* @param [duration=2000]
+ * @param [mask=false]
*/
- static toast(msg, duration = 2000) {
+ static toast(msg, duration = 2000, mask = false) {
Taro.showToast({
title: msg,
icon: 'none',
- mask: true,
+ mask,
duration,
});
}
@@ -69,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) {
@@ -86,7 +103,7 @@
img.onerror = null;
callback && callback(false);
};
- img.src = 'http://test.zhiheiot.com/download/buildArchive/online.png?t=' + Date.now();
+ img.src = 'http://gz.zhiheiot.com/disp/download/buildArchive/online.png?t=' + Date.now();
}
// 网络未开启
else {
@@ -499,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
@@ -514,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