From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/utils/encryption/signMd5Utils.js | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/utils/encryption/signMd5Utils.js b/src/utils/encryption/signMd5Utils.js
index 9dee410..3c2279a 100644
--- a/src/utils/encryption/signMd5Utils.js
+++ b/src/utils/encryption/signMd5Utils.js
@@ -104,23 +104,35 @@
return paramStr;
};
- static getDateTimeToString() {
- const date_ = new Date()
- const year = date_.getFullYear()
- let month = date_.getMonth() + 1
- let day = date_.getDate()
- if (month < 10) month = '0' + month
- if (day < 10) day = '0' + day
- let hours = date_.getHours()
- let mins = date_.getMinutes()
- let secs = date_.getSeconds()
- const msecs = date_.getMilliseconds()
- if (hours < 10) hours = '0' + hours
- if (mins < 10) mins = '0' + mins
- if (secs < 10) secs = '0' + secs
- if (msecs < 10) secs = '0' + msecs
- return year + '' + month + '' + day + '' + hours + '' + mins + '' + secs
+ /**
+ * 鎺ュ彛绛惧悕鐢� 鐢熸垚header涓殑鏃堕棿鎴�
+ * @returns {number}
+ */
+ static getTimestamp(){
+ return new Date().getTime()
}
+
+ // /**
+ // * 鑾峰彇瀹㈡埛绔椂闂达紙绛惧悕鍙傛暟 X_TIMESTAMP锛�
+ // * @returns {string}
+ // */
+ // static getDateTimeToString() {
+ // const date_ = new Date()
+ // const year = date_.getFullYear()
+ // let month = date_.getMonth() + 1
+ // let day = date_.getDate()
+ // if (month < 10) month = '0' + month
+ // if (day < 10) day = '0' + day
+ // let hours = date_.getHours()
+ // let mins = date_.getMinutes()
+ // let secs = date_.getSeconds()
+ // const msecs = date_.getMilliseconds()
+ // if (hours < 10) hours = '0' + hours
+ // if (mins < 10) mins = '0' + mins
+ // if (secs < 10) secs = '0' + secs
+ // if (msecs < 10) secs = '0' + msecs
+ // return year + '' + month + '' + day + '' + hours + '' + mins + '' + secs
+ // }
// true:鏁板�煎瀷鐨勶紝false锛氶潪鏁板�煎瀷
static myIsNaN(value) {
return typeof value === 'number' && !isNaN(value);
--
Gitblit v1.9.3