From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 01 三月 2024 10:09:04 +0800 Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分,与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw --- 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