From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期一, 18 三月 2024 16:08:49 +0800 Subject: [PATCH] 1、mdc菜单下除特殊要求外,页面表格最少条数由10条调整为30条,每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮,实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题 --- 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