diff --git a/gyxtp/src/view/docInfo.vue b/gyxtp/src/view/docInfo.vue index 14105f7..fb31469 100644 --- a/gyxtp/src/view/docInfo.vue +++ b/gyxtp/src/view/docInfo.vue @@ -51,11 +51,11 @@
-
+
知识内容
-
+
关系图谱
@@ -63,7 +63,7 @@ -
+
图片视频
@@ -71,11 +71,11 @@
-
+
知识内容
-
+
关系图谱
@@ -83,20 +83,20 @@ -
+
图片视频
-
-
+
+
知识内容
-
+
关系图谱
@@ -104,20 +104,20 @@ -
+
图片视频
-
-
+
+
知识内容
-
+
关系图谱
@@ -125,7 +125,7 @@ -
+
图片视频
@@ -233,67 +233,71 @@ @@ -654,8 +658,9 @@ export default { }, onNodeClick(nodeObject, $event) { - var url = localStorage.getItem("docUrl"); + var url = localStorage.getItem("docUrl"); + console.log(url) localStorage.setItem("oldDocUrl", url) localStorage.setItem("oldLevel", this.$route.query.level); localStorage.setItem("olddocId", this.$route.query.docId) @@ -664,7 +669,12 @@ export default { 'id': nodeObject.data.docId, 'docTitle': nodeObject.text, } + if (data.docTitle=="联合作战气象海洋影响评估与决策支撑体系"){ + return + } + getDocInfo(data).then((res) => { + localStorage.setItem("docUrl", res.data.docUrl); this.$router.replace({ query: { @@ -929,7 +939,7 @@ export default { }, width: 320, height: 320, - color: '#1955ff', + color: '#ffd602', fontColor: '#000000', className: 'testNode' }) @@ -946,7 +956,7 @@ export default { docId: nodeList[a].docId, width: 300, height: 300, - color: '#ffd119' + color: 'rgb(64, 158, 255)' }) } if (nodeList[a].docLeve == "leve2") { @@ -961,7 +971,7 @@ export default { docId: nodeList[a].docId, width: 260, height: 260, - color: '#9b72a6' + color: '#ff8c00' }) } if (nodeList[a].docLeve == "leve3") { @@ -976,7 +986,7 @@ export default { docId: nodeList[a].docId, width: 220, height: 220, - color: '#b7f49e' + color:'#67c23a' }) } if (nodeList[a].docLeve == "leve4") { @@ -991,7 +1001,7 @@ export default { docId: nodeList[a].docId, width: 180, height: 180, - color: 'rgba(255,156,41,0.96)' + color: 'rgb(248,143,248)' }) } if (nodeList[a].docLeve == "leve5") { @@ -1006,7 +1016,7 @@ export default { docId: nodeList[a].docId, width: 140, height: 140, - color: 'rgba(30,255,0,0.73)' + color: 'rgb(65,154,255)' }) } if (nodeList[a].docLeve == "leve6") { @@ -1021,7 +1031,7 @@ export default { docId: nodeList[a].docId, width: 110, height: 110, - color: '#00e4ff' + color: 'rgb(0,228,255)' }) } @@ -1033,7 +1043,7 @@ export default { from: lineList[b].sourceid, to: lineList[b].targetid, text: lineList[b].name, - color: '#000000', + color: '#fff', uuid: lineList[b].uuid, lineWidth: 2 }) diff --git a/gyxtp/src/view/graphPageCopy0926.vue b/gyxtp/src/view/graphPageCopy0926.vue index 039bb41..60c0f72 100644 --- a/gyxtp/src/view/graphPageCopy0926.vue +++ b/gyxtp/src/view/graphPageCopy0926.vue @@ -349,9 +349,8 @@ export default { defaultNodeShape: 0, defaultNodeWidth: 40, defaultNodeHeight: 40, - toolBarDirection: 'h', - toolBarPositionH: 'center', - toolBarPositionV: 'bottom', + toolBarDirection: 'v', + toolBarPositionH: 'right', defaultLineShape: 1, defaultJunctionPoint: 'border', // lineUseTextPath: true, @@ -462,6 +461,9 @@ export default { 'id': nodeObject.data.docId, 'docTitle': nodeObject.text, } + if (data.docTitle=="联合作战气象海洋影响评估与决策支撑体系"){ + return + } getDocInfo(data).then((res) => { localStorage.setItem("docUrl", res.data.docUrl) this.$router.push({ diff --git a/gyxtp/src/view/graphPageNB927.vue b/gyxtp/src/view/graphPageNB927.vue new file mode 100644 index 0000000..c04708e --- /dev/null +++ b/gyxtp/src/view/graphPageNB927.vue @@ -0,0 +1,1561 @@ + + + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WordSplitter.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WordSplitter.java index ba1781f..b87916c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WordSplitter.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WordSplitter.java @@ -2268,7 +2268,7 @@ public class WordSplitter { zz.setDocLevel(1l); ZhyDoc zhy = test1Mapper.selectDoc(zz); zhy.setDocParentId(0l); - zhy.setGroupId(Long.valueOf(i)); + zhy.setGroupId(0l); updateList.add(zhy); @@ -2287,7 +2287,7 @@ public class WordSplitter { aa.setDocUrl(String.valueOf(ll.get(a).get("docUrl"))); aa.setDocParentId(TopId); aa.setCreateTime(new Date()); - aa.setGroupId(Long.valueOf(i)); + aa.setGroupId(0l); updateList.add(aa); } else { int aaaaa = 0; @@ -2318,7 +2318,7 @@ public class WordSplitter { newDoc.setCreateTime(new Date()); newDoc.setDocParentId(zhy1.getId()); System.out.println(newDoc); - newDoc.setGroupId(Long.valueOf(i)); + newDoc.setGroupId(0l); updateList.add(newDoc); aaaaa = 1; break; @@ -2334,7 +2334,7 @@ public class WordSplitter { aa.setDocUrl(String.valueOf(ll.get(a).get("docUrl"))); aa.setDocParentId(TopId); aa.setCreateTime(new Date()); - aa.setGroupId(Long.valueOf(i)); + aa.setGroupId(0l); System.out.println(aa); updateList.add(aa); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZhyFileManageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZhyFileManageServiceImpl.java index 3de1cb3..4042a6e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZhyFileManageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZhyFileManageServiceImpl.java @@ -136,7 +136,7 @@ public class ZhyFileManageServiceImpl { String name1 = name; String name2 = source; ZhyDocRelation zz1 = new ZhyDocRelation(); - zz1.setRelationship("属于"); + zz1.setRelationship("包含"); zz1.setSource(Long.valueOf(fileId)); zz1.setTarget(OneId); zz1.setSourceName(name1); @@ -151,7 +151,7 @@ public class ZhyFileManageServiceImpl { String target = list1.get(i).getDocTitle(); // String aa = relationUtil.analyzeRelationship(source,target); - String aa = "属于"; + String aa = "包含"; // System.out.println(aa); //获取两个的Id Long TwoId = list1.get(i).getId(); @@ -175,7 +175,7 @@ public class ZhyFileManageServiceImpl { String source = list2.get(a1).getDocTitle(); String target = list1.get(i).getDocTitle(); // String aa = relationUtil.analyzeRelationship(source,target); - String aa = "属于"; + String aa = "包含"; System.out.println(aa); //获取两个的Id Long TwoId = list1.get(i).getId(); @@ -199,7 +199,7 @@ public class ZhyFileManageServiceImpl { for(int i=0;i 一键清除 - 导入文献 - + + + @@ -164,17 +164,17 @@ export default { name: "SysPoint", data() { return { - upload1: { - tip: "准备上传文件", - open: false, - title: "", - oprnIno: false, - isUploading: false, - updateSupport: 0, - headers: {Authorization: "Bearer " + getToken()}, - url: "http://localhost:10031/system/SysPoint/insertPoint" - // url: "http://127.0.0.1:10031/system/fileManage/addFile" - }, + // upload1: { + // tip: "准备上传文件", + // open: false, + // title: "", + // oprnIno: false, + // isUploading: false, + // updateSupport: 0, + // headers: {Authorization: "Bearer " + getToken()}, + // url: "http://localhost:10031/system/SysPoint/insertPoint" + // // url: "http://127.0.0.1:10031/system/fileManage/addFile" + // }, typeOptions: [ { label: '作者', value: 'author' }, { label: '机构', value: 'agency' }, @@ -214,7 +214,7 @@ export default { }; }, created() { - this.getList(); + // this.getList(); }, methods: { handleImportRelation() {