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/api/Tree.js | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/api/Tree.js b/src/api/Tree.js
index 02276ae..423fef3 100644
--- a/src/api/Tree.js
+++ b/src/api/Tree.js
@@ -1,5 +1,6 @@
import url from './TreeIndex'
import { axios } from '@/utils/request'
+import signMd5Utils from '@/utils/encryption/signMd5Utils'
/**
* login func
@@ -13,20 +14,31 @@
* @returns {*}
*/
export function queryTreeListByProduction(parameter) {
+ let sign = signMd5Utils.getSign(url, parameter);
+ //灏嗙鍚嶅拰鏃堕棿鎴筹紝娣诲姞鍦ㄨ姹傛帴鍙� Header
+ // 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: '/mdc/mdcEquipment/queryTreeListByProduction',
method: 'get',
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
+ // headers: {
+ // 'Content-Type': 'application/json;charset=UTF-8'
+ // }
+ headers: signHeader
})
}
export function queryTreeListByDepart(parameter) {
+ let sign = signMd5Utils.getSign(url, parameter);
+ //灏嗙鍚嶅拰鏃堕棿鎴筹紝娣诲姞鍦ㄨ姹傛帴鍙� Header
+ // update-begin--author:taoyan---date:20220421--for: VUEN-410銆愮鍚嶆敼閫犮�� X-TIMESTAMP鐗垫壇
+ let signHeader = { "X-Sign": sign, "X-TIMESTAMP": signMd5Utils.getTimestamp() };
return axios({
url: '/mdc/mdcEquipment/queryTreeListByDepart',
method: 'get',
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
+ // headers: {
+ // 'Content-Type': 'application/json;charset=UTF-8'
+ // }
+ headers: signHeader
})
}
\ No newline at end of file
--
Gitblit v1.9.3