From cff069951a9f591262fe15fdf1a6a03a9b221c2c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 七月 2023 10:07:33 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue | 2
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/vo/MenuVO.java | 6 +++
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java | 8 ++++
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Menu.java | 6 +++
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 10 +++-
Source/UBCS-WEB/src/views/system/menu.vue | 4 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java | 5 +-
Source/UBCS-WEB/vue.config.js | 4 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 16 ++++++++
9 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 1663b08..3f9db09 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -119,14 +119,18 @@
this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑妯℃澘')
}else {
const selectList=[]
- let exportArr=[]
+ let exportArr={}
+ const ids = this.selectRow.map(item => item.oid).join(',')
this.selectRow.forEach(item=>{
selectList.push(
item.oid
)
})
- exportArr=this.value.map(index => this.tableHeadData[index].prop);
- exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':selectList,'attrIdIndexMap[index]':exportArr}).then(res=>{
+ //宸查�夋嫨灞炴��
+ this.value.map(index => this.tableHeadData[index].prop).forEach((item, index) => {
+ exportArr[`attrIdIndexMap[${index}]`] = item
+ })
+ exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':ids,...exportArr}).then(res=>{
console.log(res)
})
}
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
index bbbb00e..8d0fa1e 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -28,12 +28,12 @@
},
watch:{
referConfigOption (){
- console.log(111)
if(func.notEmpty(this.referConfigOption.referConfig) || func.notEmpty(this.referConfigOption.referBtmId)){
this.openReconfigInterFace(this.referConfigOption);
}else{
this.openTipsChooseOrCust();
}
+
},
},
methods: {
diff --git a/Source/UBCS-WEB/src/views/system/menu.vue b/Source/UBCS-WEB/src/views/system/menu.vue
index 30e004c..7b87dcb 100644
--- a/Source/UBCS-WEB/src/views/system/menu.vue
+++ b/Source/UBCS-WEB/src/views/system/menu.vue
@@ -232,11 +232,11 @@
dicData: [
{
label: "鍚�",
- value: false
+ value: "false"
},
{
label: "鏄�",
- value: true
+ value: "true"
}
],
hide: true
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Menu.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Menu.java
index 790f531..a171e37 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Menu.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Menu.java
@@ -118,6 +118,12 @@
private String remark;
/**
+ * 鏄惁缂撳瓨
+ */
+ @ApiModelProperty(value = "鏄惁缂撳瓨")
+ private String keepAlive;
+
+ /**
* 鏄惁宸插垹闄�
*/
@TableLogic
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/vo/MenuVO.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/vo/MenuVO.java
index 94e7ec2..e62ba6c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/vo/MenuVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/vo/MenuVO.java
@@ -21,11 +21,13 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.system.entity.Menu;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tool.node.INode;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -90,4 +92,8 @@
* 鏄惁鏂扮獥鍙ｆ墦寮�
*/
private String isOpenName;
+ /**
+ * 鍓嶇鏄惁闅愯棌
+ */
+ private HashMap<String,Boolean> meta = new HashMap<>();
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
index 039a4b3..6204bfc 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
@@ -180,8 +180,9 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "鍓嶇鑿滃崟鏁版嵁", notes = "鍓嶇鑿滃崟鏁版嵁")
public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
- List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
- return R.data(list);
+ List<MenuVO> lists = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
+ menuService.handleKeepAlive(lists);
+ return R.data(lists);
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
index 1a6e9e3..48cc81b 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
@@ -174,4 +174,12 @@
*/
List<Menu> getMenuButtonByType(String btmType);
+ /**
+ * 瀵筀eepAlive鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
+ *
+ * @param childMenu
+ * @return
+ */
+ void handleKeepAlive(List<MenuVO> childMenu);
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index 7905b2c..dac120f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -303,4 +303,20 @@
return baseMapper.selectMenuChildByBtnType(btmType);
}
+ /**
+ * 瀵筀eepAlive鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
+ *
+ * @param childMenu
+ * @return
+ */
+ @Override
+ public void handleKeepAlive(List<MenuVO> childMenu) {
+ childMenu.forEach(list->{
+ list.getMeta().put("keepAlive","true".equals(list.getKeepAlive()));
+ if(list.getChildren().size()>0){
+ handleKeepAlive(list.getChildren());
+ }
+ });
+ }
+
}
--
Gitblit v1.9.3