From fa261e8c1220b31af54e8167e4de9c3320b1af27 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期四, 26 十二月 2024 10:52:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/Client/PLTClient/src/com/vci/client/logon/base/SysCofigMenuBar.java | 10 +-
Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleTreeCellRenderer.java | 4
Source/Client/PLTClient/src/com/vci/client/logon/client/VciApplet.java | 2
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 2
Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanelV2.java | 6 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java | 18 +++---
Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json | 18 +++---
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 2
Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/ModelManagementPanel.java | 16 ++--
Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleConfigMainPanel.java | 8 +-
Source/Service/FrameService/src/com/vci/server/framework/funcmng/function/FunctionService.java | 2
Bin/properties/menuConfig.json | 18 +++---
Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/BSRoleRightPanel.java | 4
Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanel.java | 6 +-
Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/FunOperateExcelImportDialogActionListener.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 10 +-
Bin/sql/ModifyTable.sql | 2
Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/RoleRightPanel.java | 6 +-
18 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/Bin/properties/menuConfig.json b/Bin/properties/menuConfig.json
index 3776823..bf727e3 100644
--- a/Bin/properties/menuConfig.json
+++ b/Bin/properties/menuConfig.json
@@ -5,10 +5,10 @@
{
"hasChildren": true,
"children": [],
- "id": "systemManagmentNode",
+ "id": "system",
"name": "绠＄悊鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "systemManagmentNode",
+ "code": "system",
"alias": "system",
"category": "0",
"meta": {
@@ -21,10 +21,10 @@
{
"hasChildren": true,
"children": [],
- "id": "modelManagmentNode",
+ "id": "business",
"name": "涓氬姟鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "modelManagmentNode",
+ "code": "business",
"alias": "model",
"category": "0",
"meta": {
@@ -85,7 +85,7 @@
],
"id": "VCIBaseTreeNode",
"name": "绯荤粺妯″潡閰嶇疆",
- "parentId": "systemManagmentNode",
+ "parentId": "system",
"code": "rootNode",
"alias": "root",
"category": "0",
@@ -100,10 +100,10 @@
"hasChildren": true,
"children": [],
"childType": -1,
- "id": "systemManagmentNode",
+ "id": "system",
"name": "绠＄悊鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "systemManagmentNode",
+ "code": "system",
"alias": "system",
"category": "0",
"meta": {
@@ -117,10 +117,10 @@
"hasChildren": true,
"children": [],
"childType": -1,
- "id": "modelManagmentNode",
+ "id": "business",
"name": "涓氬姟鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "modelManagmentNode",
+ "code": "business",
"alias": "model",
"category": "0",
"meta": {
diff --git a/Bin/sql/ModifyTable.sql b/Bin/sql/ModifyTable.sql
index 11de491..42cf0fa 100644
--- a/Bin/sql/ModifyTable.sql
+++ b/Bin/sql/ModifyTable.sql
@@ -1,5 +1,5 @@
-- 修改管理菜单的父类型，控制给三员授权时，不能看到业务功能，给普通用户授权时不能看到系统配置管理功能
-UPDATE PLFUNCTION p SET p.PLPARENTID ='systemManagmentNode' WHERE p.PLNAME IN ('系统配置', '规则管理', '对象建模') AND p.PLPARENTID ='modelManagmentNode';
+UPDATE PLFUNCTION p SET p.PLPARENTID ='system' WHERE p.PLNAME IN ('系统配置', '规则管理', '对象建模') AND p.PLPARENTID ='business';
-- 修改日志表，增加PLDESCRIPTION描述字段，将PLRESULT拆分为两个字段，操作结果寸PLRESULT，日志描述存PLDESCRIPTION。
ALTER TABLE PLLOG ADD PLCONTENT VARCHAR2(1000);
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/FunOperateExcelImportDialogActionListener.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/FunOperateExcelImportDialogActionListener.java
index 1e95177..cadab2e 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/FunOperateExcelImportDialogActionListener.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/FunOperateExcelImportDialogActionListener.java
@@ -240,7 +240,7 @@
} else {
funObj.setId(userId);
- funObj.setParentId("modelManagmentNode");
+ funObj.setParentId("business");
fuzhi(funObj,oneData);
fileDatas.add(funObj);
first=false;
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/ModelManagementPanel.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/ModelManagementPanel.java
index 266f87e..3881bf2 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/ModelManagementPanel.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/functiontree/ModelManagementPanel.java
@@ -1008,10 +1008,10 @@
if(object instanceof FunctionObject) {
FunctionObject plFunObject = (FunctionObject) object;
puid = plFunObject.getId();
- }else if("modelManagmentNode".equals(object)) {
- puid = "modelManagmentNode";
- }else if("systemManagmentNode".equals(object)) {
- puid = "systemManagmentNode";
+ }else if("business".equals(object)) {
+ puid = "business";
+ }else if("system".equals(object)) {
+ puid = "system";
}
res = modelDelegate.deleteModule(puid);
/**
@@ -1153,10 +1153,10 @@
if(object instanceof FunctionObject) {
FunctionObject plFunObject = (FunctionObject)object;
parentId = plFunObject.getId();
- }else if("modelManagmentNode".equals(object)) {
- parentId = "modelManagmentNode";
- }else if("systemManagmentNode".equals(object)) {
- parentId = "systemManagmentNode";
+ }else if("business".equals(object)) {
+ parentId = "business";
+ }else if("system".equals(object)) {
+ parentId = "system";
}
obj.setParentId(parentId);
}else{
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleConfigMainPanel.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleConfigMainPanel.java
index 6d5a572..7b68673 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleConfigMainPanel.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleConfigMainPanel.java
@@ -141,7 +141,7 @@
FunctionClientDelegate funcDel = new FunctionClientDelegate(LogonApplication.getUserEntityObject());
if (!selectNode.isExpand()) {
selectNode.setExpand(true);
- if (object instanceof FunctionObject || object.equals("modelManagmentNode") || object.equals("systemManagmentNode")) {
+ if (object instanceof FunctionObject || object.equals("business") || object.equals("system")) {
String parentId = "";
if(object instanceof FunctionObject){
parentId = ((FunctionObject) object).getId();
@@ -214,11 +214,11 @@
private void initTree(VCIBaseTreeNode rootNode, String puid) {
// 绠＄悊鍔熻兘瀹氫箟
systemConstructionTree = new VCIBaseTreeNode(LocaleDisplay.getI18nString("rmip.framework.systemFunctionTree.systemFunctionModel",
- "RMIPFramework", getLocale()), "systemManagmentNode");
+ "RMIPFramework", getLocale()), "system");
// 涓氬姟鍔熻兘瀹氫箟
modelConstructionTree = new VCIBaseTreeNode(LocaleDisplay.getI18nString("rmip.framework.systemFunctionTree.businessFunctionModel",
- "RMIPFramework", getLocale()), "modelManagmentNode");
+ "RMIPFramework", getLocale()), "business");
// 鎿嶄綔瀹氫箟
operateTypeNode = new VCIBaseTreeNode(LocaleDisplay.getI18nString("rmip.framework.operateType.operateTypeModel.file",
@@ -267,7 +267,7 @@
if (object instanceof OperateObject|| object.equals("operateNode")) {
newPanel = new OperateMangePanel(object,transmitTreeObject);
}
- else if (object.equals("modelManagmentNode") || object.equals("systemManagmentNode") || object instanceof FunctionObject) {
+ else if (object.equals("business") || object.equals("system") || object instanceof FunctionObject) {
newPanel = new ModelManagementPanel(object,transmitTreeObject, this);
}
else if (object instanceof FuncOperationObject){
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleTreeCellRenderer.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleTreeCellRenderer.java
index be3f2a7..1aa1487 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleTreeCellRenderer.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightConfig/modelConfig/ModuleTreeCellRenderer.java
@@ -47,9 +47,9 @@
if (obj instanceof String) {
if (obj.equals("root")) {
icon = "house.png";
- } else if (obj.equals(("modelManagmentNode"))) {
+ } else if (obj.equals(("business"))) {
icon = "businessModule.png";
- } else if (obj.equals(("systemManagmentNode"))) {
+ } else if (obj.equals(("system"))) {
icon = "sysModule.png";
} else if (obj.equals(("sysConfNode"))) {
icon = "options.png";
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/BSRoleRightPanel.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/BSRoleRightPanel.java
index 6d3f276..0369d63 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/BSRoleRightPanel.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/BSRoleRightPanel.java
@@ -211,7 +211,7 @@
FunctionObject[] funcObjs = null;
FunctionClientDelegate funcDel = new FunctionClientDelegate();
try {
- funcObjs = funcDel.getModuleListByParentIdForBS("modelManagmentNode", false);
+ funcObjs = funcDel.getModuleListByParentIdForBS("business", false);
funMap.clear();
for(int k = 0;k < funcObjs.length;k++) {
funMap.put(funcObjs[k].getId(),funcObjs[k].getName() );
@@ -221,7 +221,7 @@
for (int i = 0; i < funcObjs.length; i++) {
VCIBaseTreeNode node = new VCIBaseTreeNode(funcObjs[i].getName(), funcObjs[i]);
- if ("modelManagmentNode".equals(funcObjs[i].getParentId())) {
+ if ("business".equals(funcObjs[i].getParentId())) {
// if(res && list.contains(funcObjs[i].getId())) {
// continue;
// }
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanel.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanel.java
index 485adee..b29bb7d 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanel.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanel.java
@@ -244,17 +244,17 @@
FunctionObject[] funcObjs = null;
// FunctionClientDelegate funcDel = new FunctionClientDelegate();
try {
- String rootModel = "modelManagmentNode";
+ String rootModel = "business";
UserObject curUser = LogonApplication.getUserObject();
// 瓒呯骇绠＄悊鍛樼粰涓夊憳璐﹀彿鎺堟潈
if (RightControlUtil.isAdminOrDeveloperOrRoot(curUser.getUserName())) {
- rootModel = "systemManagmentNode";
+ rootModel = "system";
}
// 涓夊憳鍙互缁欐櫘閫氱敤鎴锋巿鏉冧笟鍔″姛鑳�
else if (RightControlUtil.isThreeAdminCurUser()) {
- rootModel = "modelManagmentNode";
+ rootModel = "business";
}
// 鍏朵粬鐢ㄦ埛涓嶈兘鎺堟潈
else {
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanelV2.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanelV2.java
index b83e102..d477a61 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanelV2.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/CSRoleRightPanelV2.java
@@ -292,17 +292,17 @@
FunctionObject[] funcObjs = null;
try {
- String rootModel = "modelManagmentNode";
+ String rootModel = "business";
UserObject curUser = LogonApplication.getUserObject();
// 瓒呯骇绠＄悊鍛樼粰涓夊憳璐﹀彿鎺堟潈
if (RightControlUtil.isAdminOrDeveloperOrRoot(curUser.getUserName())) {
- rootModel = "systemManagmentNode";
+ rootModel = "system";
}
// 涓夊憳鍙互缁欐櫘閫氱敤鎴锋巿鏉冧笟鍔″姛鑳�
else if (RightControlUtil.isThreeAdminCurUser()) {
- rootModel = "modelManagmentNode";
+ rootModel = "business";
}
// 鍏朵粬鐢ㄦ埛涓嶈兘鎺堟潈
else {
diff --git a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/RoleRightPanel.java b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/RoleRightPanel.java
index f614bcc..b1c0cea 100644
--- a/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/RoleRightPanel.java
+++ b/Source/Client/PLTClient/src/com/vci/client/framework/rightdistribution/roleRight/RoleRightPanel.java
@@ -215,9 +215,9 @@
boolean bAdmin = RightControlUtil.isAdminOrDeveloperOrRoot(curUser.getUserName());
if (bAdmin)
- funcObjs = funcDel.getModuleListByParentId("systemManagmentNode", false);
+ funcObjs = funcDel.getModuleListByParentId("system", false);
else
- funcObjs = funcDel.getModuleListByParentId("modelManagmentNode", false);
+ funcObjs = funcDel.getModuleListByParentId("business", false);
funMap.clear();
for(int k = 0;k < funcObjs.length;k++) {
@@ -228,7 +228,7 @@
for (int i = 0; i < funcObjs.length; i++) {
VCIBaseTreeNode node = new VCIBaseTreeNode(funcObjs[i].getName(), funcObjs[i]);
- //if ("modelManagmentNode".equals(funcObjs[i].getParentId())) {
+ //if ("business".equals(funcObjs[i].getParentId())) {
// if(res && list.contains(funcObjs[i].getId())) {
// continue;
// }
diff --git a/Source/Client/PLTClient/src/com/vci/client/logon/base/SysCofigMenuBar.java b/Source/Client/PLTClient/src/com/vci/client/logon/base/SysCofigMenuBar.java
index 68eca26..a918862 100644
--- a/Source/Client/PLTClient/src/com/vci/client/logon/base/SysCofigMenuBar.java
+++ b/Source/Client/PLTClient/src/com/vci/client/logon/base/SysCofigMenuBar.java
@@ -61,22 +61,22 @@
@Override
public void initSpecialMenuBar(){
String userName = LogonApplication.getUserEntityObject().getUserName();
- String parentId = "modelManagmentNode";
+ String parentId = "business";
if (RightControlUtil.isAdminOrDeveloperOrRoot(userName)) {
// 绯荤粺鑿滃崟
- parentId = "systemManagmentNode" ;
+ parentId = "system" ;
BuildMenu(userName, parentId);
// 涓氬姟鑿滃崟
- //parentId = "modelManagmentNode" ;
+ //parentId = "business" ;
//BuildMenu(userName, parentId);
} else if (RightControlUtil.isThreeAdminCurUser()) {
- parentId = "systemManagmentNode" ;
+ parentId = "system" ;
BuildMenu(userName, parentId);
} else {
- parentId = "modelManagmentNode" ;
+ parentId = "business" ;
BuildMenu(userName, parentId);
}
diff --git a/Source/Client/PLTClient/src/com/vci/client/logon/client/VciApplet.java b/Source/Client/PLTClient/src/com/vci/client/logon/client/VciApplet.java
index 6f41c7f..38480f4 100644
--- a/Source/Client/PLTClient/src/com/vci/client/logon/client/VciApplet.java
+++ b/Source/Client/PLTClient/src/com/vci/client/logon/client/VciApplet.java
@@ -118,7 +118,7 @@
}
/**鑾峰彇褰撳墠鐢ㄦ埛鐪嬪埌鐨勭涓�绾ц妭鐐规ā鍧�**/
- FunctionObject[] funcObjs = RightControlUtil.getFunctionsByRight("modelManagmentNode", userName);
+ FunctionObject[] funcObjs = RightControlUtil.getFunctionsByRight("business", userName);
for(int i = 0;i<funcObjs.length;i++){
VCIModuleMainPanel mailPanel = new VCIModuleMainPanel(funcObjs[i]);
moduleListMap.put(index, mailPanel);
diff --git a/Source/Service/FrameService/src/com/vci/server/framework/funcmng/function/FunctionService.java b/Source/Service/FrameService/src/com/vci/server/framework/funcmng/function/FunctionService.java
index 5d4a652..2eeb096 100644
--- a/Source/Service/FrameService/src/com/vci/server/framework/funcmng/function/FunctionService.java
+++ b/Source/Service/FrameService/src/com/vci/server/framework/funcmng/function/FunctionService.java
@@ -1036,7 +1036,7 @@
/**妫�鏌ユā鍧楀悕绉版槸鍚﹂噸澶嶏紝閲嶅杩斿洖1**/
String hql = "from Function where id in (" + toInSql(oids.toArray(new String[0])) + ") and parentId = ?";
Object[] values = new Object[1];
- values[0] = "modelManagmentNode";
+ values[0] = "business";
List<Function> list = impl.findEntites(hql, values);
if(!CollectionUtils.isEmpty(list)){
functions.addAll(list);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index f241c1e..8aa0539 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -58,12 +58,12 @@
/**
* 鑿滃崟鐨勬牴鑺傜偣涓婚敭锛岃繖涓槸骞冲彴瀹氫箟鐨�
*/
- private final String ROOT_MENU_ID = "modelManagmentNode";
+ private final String ROOT_MENU_ID = "business";
/**
* 绠＄悊鍔熻兘妯″潡鑿滃崟鏍硅妭鐐�
*/
- private final String SYSTEMMANAGMENTNODE = "systemManagmentNode";
+ private final String SYSTEMMANAGMENTNODE = "system";
/**
* 鎿嶄綔绫诲瀷绠＄悊鑿滃崟鏍硅妭鐐�
@@ -461,7 +461,7 @@
return menuVOList;
}
boolean isFunctionObject = Func.isNotBlank(modeType) && modeType.equalsIgnoreCase("FunctionObject");
- if(parentId.equals("systemManagmentNode") || parentId.equals("modelManagmentNode") || isFunctionObject){
+ if(parentId.equals("system") || parentId.equals("business") || isFunctionObject){
int childType = this.checkChildObject(parentId);
if(isFunctionObject){
try {
@@ -522,9 +522,9 @@
try{
MenuVO parentNode = null;
//灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
- if("systemManagmentNode".equals(parentId)){
+ if("system".equals(parentId)){
parentNode = JsonConfigReader.getSysModuleConf().getSystemManagmentNode();
- }else if("modelManagmentNode".equals(parentId)){
+ }else if("business".equals(parentId)){
parentNode = JsonConfigReader.getSysModuleConf().getModelManagmentNode();
}
//濡傛灉鏌ヨ鐨勬槸绗竴灞傝妭鐐瑰氨闇�瑕佺洿鎺ヨ繑鍥瀞ystemManagmentNode鎴杕odelManagmentNode鑺傜偣
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
index 70f48bc..4d48b37 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
@@ -154,10 +154,10 @@
String puid = "";
if("FunctionObject".equals(menuVO.getModeType())) {
puid = menuVO.getId();
- }else if("modelManagmentNode".equals(menuVO.getId())) {
- puid = "modelManagmentNode";
- }else if("systemManagmentNode".equals(menuVO.getId())) {
- puid = "systemManagmentNode";
+ }else if("business".equals(menuVO.getId())) {
+ puid = "business";
+ }else if("system".equals(menuVO.getId())) {
+ puid = "system";
}
if(Func.isBlank(puid)){
throw new VciBaseException("鏈壘鍒拌鍒犻櫎鐨勬ā鍧楋紒");
@@ -850,7 +850,7 @@
} else {
funObj.id = id;
- funObj.parentId = "modelManagmentNode";
+ funObj.parentId = "business";
fuzhi(funObj,oneData);
fileFunctionDatas.add(funObj);
first=false;
@@ -1300,10 +1300,10 @@
/*String parentId = "";
if(menuVO.getModeType().equals("FunctionObject")) {
parentId = menuVO.getParentId();
- }else if("modelManagmentNode".equals(menuVO.getParentId())) {
- parentId = "modelManagmentNode";
- }else if("systemManagmentNode".equals(menuVO.getParentId())) {
- parentId = "systemManagmentNode";
+ }else if("business".equals(menuVO.getParentId())) {
+ parentId = "business";
+ }else if("system".equals(menuVO.getParentId())) {
+ parentId = "system";
}*/
obj.parentId = menuVO.getParentId();
}else{
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json
index 3776823..bf727e3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json
@@ -5,10 +5,10 @@
{
"hasChildren": true,
"children": [],
- "id": "systemManagmentNode",
+ "id": "system",
"name": "绠＄悊鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "systemManagmentNode",
+ "code": "system",
"alias": "system",
"category": "0",
"meta": {
@@ -21,10 +21,10 @@
{
"hasChildren": true,
"children": [],
- "id": "modelManagmentNode",
+ "id": "business",
"name": "涓氬姟鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "modelManagmentNode",
+ "code": "business",
"alias": "model",
"category": "0",
"meta": {
@@ -85,7 +85,7 @@
],
"id": "VCIBaseTreeNode",
"name": "绯荤粺妯″潡閰嶇疆",
- "parentId": "systemManagmentNode",
+ "parentId": "system",
"code": "rootNode",
"alias": "root",
"category": "0",
@@ -100,10 +100,10 @@
"hasChildren": true,
"children": [],
"childType": -1,
- "id": "systemManagmentNode",
+ "id": "system",
"name": "绠＄悊鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "systemManagmentNode",
+ "code": "system",
"alias": "system",
"category": "0",
"meta": {
@@ -117,10 +117,10 @@
"hasChildren": true,
"children": [],
"childType": -1,
- "id": "modelManagmentNode",
+ "id": "business",
"name": "涓氬姟鍔熻兘妯″潡",
"parentId": "VCIBaseTreeNode",
- "code": "modelManagmentNode",
+ "code": "business",
"alias": "model",
"category": "0",
"meta": {
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index d98046b..6f487d3 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -243,7 +243,7 @@
lazy: true,
treeLoad: (node, resolve) => {
const params = {
- parentId: node.level === 0 ? "modelManagmentNode" : node.data.id,
+ parentId: node.level === 0 ? "business" : node.data.id,
modeType: node.level === 0 ? "firstNode" : node.data.modeType,
}
getSysModelTreeMenuByPID(params).then(res => {
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index 4625e1c..b8a67d3 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -243,7 +243,7 @@
lazy: true,
treeLoad: (node, resolve) => {
const params = {
- parentId: node.level === 0 ? "systemManagmentNode" : node.data.id,
+ parentId: node.level === 0 ? "system" : node.data.id,
modeType: node.level === 0 ? "firstNode" : node.data.modeType,
}
getSysModelTreeMenuByPID(params).then(res => {
--
Gitblit v1.9.3