diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java index 95ee97f..8260ab6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java @@ -569,8 +569,8 @@ public class ZhyFileManageController extends BaseController { List lists11=zhyDocmubanMapper.selectZhyDocmubanList(zhyDocmuban); zhyDocmuban.setType("模型库"); List lists22=zhyDocmubanMapper.selectZhyDocmubanList(zhyDocmuban); - zhyDocmuban.setType("规则库"); - List lists33=zhyDocmubanMapper.selectZhyDocmubanList(zhyDocmuban); +// zhyDocmuban.setType("规则库"); +// List lists33=zhyDocmubanMapper.selectZhyDocmubanList(zhyDocmuban); zhyDocmuban.setType("大类"); List lists44=zhyDocmubanMapper.selectZhyDocmubanList(zhyDocmuban); zhyDocmuban.setType("小类"); @@ -669,37 +669,37 @@ public class ZhyFileManageController extends BaseController { // } nodeList.add(zhyDoc); } - for(int i=0;i docs=test1Mapper.selectAllDoc1(); if(zhyRelationship.getFileList().size()>0){ for(int i=0;i docs=test1Mapper.selectAllDoc1(); + if(dd==null){ ZhyFileManage fileManage=test1Mapper.getFileById(docs.get(0).getFileId()); zhyRelationship.setSourceName(fileManage.getFileName().replaceAll("(?i)\\.docx$", "")); @@ -207,7 +208,13 @@ public class ZhyRelationshipController extends BaseController ZhyDoc vv = new ZhyDoc(); vv.setId(zhyRelationship.getSource()); ZhyDoc dd = test1Mapper.selectDocById(vv); - zhyRelationship.setSourceName(dd.getDocTitle()); + if(dd==null){ + ZhyFileManage fileManage=test1Mapper.getFileById(docs.get(0).getFileId()); + zhyRelationship.setSourceName(fileManage.getFileName().replaceAll("(?i)\\.docx$", "")); + }else{ + zhyRelationship.setSourceName(dd.getDocTitle()); + } +// zhyRelationship.setSourceName(dd.getDocTitle()); vv.setId(zhyRelationship.getTarget()); ZhyDoc dd2 = test1Mapper.selectDocById(vv); zhyRelationship.setTargetName(dd2.getDocTitle()); diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java index c52851b..f681518 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/DocApiController.java @@ -1234,21 +1234,21 @@ public class DocApiController extends BaseController { map12.put("name","模型库"); map12.put("children",g12); +// Map map13=new HashMap<>(); +// map13.put("id",3); +// map13.put("name","规则库"); +// map13.put("children",g13); + Map map13=new HashMap<>(); map13.put("id",3); - map13.put("name","规则库"); + map13.put("name","大类数据"); map13.put("children",g13); Map map14=new HashMap<>(); map14.put("id",4); - map14.put("name","大类数据"); + map14.put("name","小类数据"); map14.put("children",g14); - Map map15=new HashMap<>(); - map15.put("id",5); - map15.put("name","小类数据"); - map15.put("children",g15); - Map map21=new HashMap<>(); map21.put("id",1); map21.put("name","模型方法"); @@ -1269,7 +1269,7 @@ public class DocApiController extends BaseController { mapAll.put("g12",map12); mapAll.put("g13",map13); mapAll.put("g14",map14); - mapAll.put("g15",map15); +// mapAll.put("g15",map15); mapAll.put("g21",map21); mapAll.put("g22",map22); diff --git a/ruoyi-ui/src/views/system/docmuban/index.vue b/ruoyi-ui/src/views/system/docmuban/index.vue index cb6ad19..480e32d 100644 --- a/ruoyi-ui/src/views/system/docmuban/index.vue +++ b/ruoyi-ui/src/views/system/docmuban/index.vue @@ -20,9 +20,9 @@
-
+
方向
- 新增 + 新增
@@ -47,9 +47,9 @@
-
+
作战
- 新增 + 新增
@@ -73,9 +73,9 @@
-
+
装备
- 新增 + 新增
@@ -99,9 +99,9 @@
-
+
环境
- 新增 + 新增
@@ -128,8 +128,11 @@
-
-
业务系统
+
+
+
业务系统
+ 新增 +
@@ -151,8 +154,12 @@
-
-
模型库
+
+
+
模型库
+ 新增 +
+ @@ -174,31 +181,35 @@
-
-
规则库
- + + + + + + + + + + + + + + + + + + + + + + + +
+
+
大类
+ 新增 +
- - - - - -
-
-
大类
@@ -220,8 +231,12 @@
-
-
小类
+
+
+
小类
+ 新增 +
+ @@ -248,7 +263,10 @@
-
模型
+
+
模型
+ 新增 +
@@ -271,7 +289,10 @@
-
指标
+
+
指标
+ 新增 +
@@ -379,7 +400,7 @@ export default { }, { key:1, - text:"业务系统-模型库-规则库-大类-小类" + text:"业务系统-模型库-大类-小类" }, { key:2, @@ -507,7 +528,6 @@ export default { if(this.queryParams.groupId==1){ this.docmubanList11 = grouped["业务系统"] || []; this.docmubanList12 = grouped["模型库"] || []; - this.docmubanList13 = grouped["规则库"] || []; this.docmubanList14 = grouped["大类"] || []; this.docmubanList15 = grouped["小类"] || []; } @@ -537,7 +557,7 @@ export default { this.form.groupId = 0; } - if(this.form.type == "业务系统" || this.form.type == "模型库" || this.form.type == "规则库" || this.form.type == "大类" || this.form.type == "小类"){ + if(this.form.type == "业务系统" || this.form.type == "模型库" || this.form.type == "大类" || this.form.type == "小类"){ this.form.groupId = 1; } if(this.form.type == "模型" || this.form.type == "指标"){ diff --git a/ruoyi-ui/src/views/system/fileManage/index.vue b/ruoyi-ui/src/views/system/fileManage/index.vue index 63680dd..05afbc9 100644 --- a/ruoyi-ui/src/views/system/fileManage/index.vue +++ b/ruoyi-ui/src/views/system/fileManage/index.vue @@ -614,7 +614,7 @@ export default { }, { key:1, - text:"业务系统-模型库-规则库-大类-小类" + text:"业务系统-模型库-大类-小类" }, { key:2, @@ -634,7 +634,7 @@ export default { }, { key:1, - text:"业务系统-模型库-规则库-大类-小类" + text:"业务系统-模型库-大类-小类" }, { key:2, @@ -680,9 +680,8 @@ export default { 1: [ { label: "业务系统", value: "1", maxParentLevel: 0 }, { label: "模型库", value: "2", maxParentLevel: 1 }, - { label: "规则库", value: "3", maxParentLevel: 2 }, - { label: "大类", value: "4", maxParentLevel: 3 }, - { label: "小类", value: "5", maxParentLevel: 4 } + { label: "大类", value: "3", maxParentLevel: 2 }, + { label: "小类", value: "4", maxParentLevel: 3 } ], 2: [ { label: "模型", value: "1", maxParentLevel: 0 }, @@ -699,9 +698,8 @@ export default { 1: [ { label: "业务系统", value: "1" }, { label: "模型库", value: "2" }, - { label: "规则库", value: "3" }, - { label: "大类", value: "4" }, - { label: "小类", value: "5" } + { label: "大类", value: "3" }, + { label: "小类", value: "4" } ], 2: [ { label: "模型", value: "1" }, @@ -1019,7 +1017,7 @@ export default { formatGroup(row, column, cellValue) { const map = { 0: "方向-作战-装备-环境", - 1: "业务系统-模型库-规则库-大类-小类", + 1: "业务系统-模型库-大类-小类", 2: "模型-指标" }; return map[cellValue] || '未知组别';