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/api/manage.js | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/api/manage.js b/src/api/manage.js index bbd29a1..2d86db1 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -16,7 +16,9 @@ export function postAction(url,parameter) { let sign = signMd5Utils.getSign(url, parameter); //灏嗙鍚嶅拰鏃堕棿鎴筹紝娣诲姞鍦ㄨ姹傛帴鍙� Header - let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()}; + // update-begin--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇 + let signHeader = { "X-Sign": sign, "X-TIMESTAMP": signMd5Utils.getTimestamp() }; + // update-end--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇 return axios({ url: url, @@ -30,7 +32,9 @@ export function httpAction(url,parameter,method) { let sign = signMd5Utils.getSign(url, parameter); //灏嗙鍚嶅拰鏃堕棿鎴筹紝娣诲姞鍦ㄨ姹傛帴鍙� Header - let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()}; + // update-begin--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇 + let signHeader = { "X-Sign": sign, "X-TIMESTAMP": signMd5Utils.getTimestamp() }; + // update-end--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇 return axios({ url: url, @@ -53,7 +57,9 @@ export function getAction(url,parameter) { let sign = signMd5Utils.getSign(url, parameter); //灏嗙鍚嶅拰鏃堕棿鎴筹紝娣诲姞鍦ㄨ姹傛帴鍙� Header - let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()}; + // update-begin--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇 + let signHeader = { "X-Sign": sign, "X-TIMESTAMP": signMd5Utils.getTimestamp() }; + // update-end--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇 return axios({ url: url, @@ -129,6 +135,14 @@ }) } +export function postFileAction(url, parameter, headers) { + return axios({ + url: url, + method: 'post', + data: parameter, + headers: { 'Content-Type': 'multipart/form-data', 'Authorization': 'Bearer ' + Vue.ls.get('keycloakToken') } + }) +} /** * 涓嬭浇鏂囦欢 鐢ㄤ簬excel瀵煎嚭 * @param url -- Gitblit v1.9.3