From 8e9f556423b0e3a19ce70df2bca8c351035368b0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 12 Sep 2024 16:06:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/utils/utility.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index 9500459..2ca8375 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:57:54
- * @LastEditTime: 2024-08-16 17:15:26
+ * @LastEditTime: 2024-09-12 10:55:38
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 公共模块方法
@@ -36,7 +36,7 @@
// 下拉框
export { default as options } from './selectOption';
-
+export { default as caseTypeSelect } from './caseTypeSelect';
export { default as caseOptions } from './caseCauseSelect';
// icon 对照表
@@ -107,7 +107,7 @@
if (num) {
var str = num.toString();
var reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g;
- return str.replace(reg, '$1，');
+ return str.replace(reg, '$1,');
} else {
return 0;
}
@@ -165,6 +165,8 @@
return info({ type: 'success', content });
}
+
+
// 手机号码正则
export const mobileRegExp = new RegExp('^1([0-9][0-9]|[0-9][0-9]|[0-9][0-9]|[0-9][0-9]|[0-9][0-9])\\d{8}$', 'g');
@@ -178,8 +180,12 @@
}
// 时间格式化
-export function timeFormat(value, isValue) {
- return !!value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
+export function timeFormat(value, isValue, timeFormat) {
+ return !!value ? moment(value).format(timeFormat ? timeFormat : 'YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
+}
+
+export function minuteFormat(value, isValue) {
+ return !!value ? moment(value).format('YYYY-MM-DD HH:mm') : isValue ? '' : '-';
}
export function dateFormat(value) {
@@ -320,3 +326,45 @@
export function verifyEmpty(value) {
return value?.replace(/\s+/g, '');
}
+
+// 获取元素距离可视区域顶部、左部的距离
+export const getOffset = (ele) => {
+ var top = ele.offsetTop
+ var left = ele.offsetLeft
+ while (ele.offsetParent) {
+ ele = ele.offsetParent
+ if (window.navigator.userAgent.indexOf('MSTE 8') > -1) {
+ top += ele.offsetTop
+ left += ele.offsetLeft
+ } else {
+ top += ele.offsetTop + ele.clientTop
+ left += ele.offsetLeft + ele.clientLeft
+ }
+ }
+ return {
+ left: left,
+ top: top,
+ }
+}
+
+export const getSize = () => {
+ let windowW, windowH, contentH, contentW, scrollT;
+ windowH = window.innerHeight;
+ windowW = window.innerWidth;
+ scrollT = document.documentElement.scrollTop || document.body.scrollTop;
+ contentH =
+ document.documentElement.scrollHeight > document.body.scrollHeight ?
+ document.documentElement.scrollHeight :
+ document.body.scrollHeight;
+ contentW =
+ document.documentElement.scrollWidth > document.body.scrollWidth ?
+ document.documentElement.scrollWidth :
+ document.body.scrollWidth;
+ return {
+ windowW,
+ windowH,
+ contentH,
+ contentW,
+ scrollT
+ };
+};
--
Gitblit v1.8.0