Commit caf9335b by 侯昆

图谱跳转

1 parent dec545c2
...@@ -19,7 +19,6 @@ package com.dookay.cihai.core.aip; ...@@ -19,7 +19,6 @@ package com.dookay.cihai.core.aip;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baidu.aip.imageclassify.AipImageClassify; import com.baidu.aip.imageclassify.AipImageClassify;
import com.baidu.aip.util.Base64Util; import com.baidu.aip.util.Base64Util;
import com.dookay.cihai.core.aip.config.AipProperties;
import com.dookay.cihai.core.aip.enums.ImageInputTypeEnum; import com.dookay.cihai.core.aip.enums.ImageInputTypeEnum;
import com.dookay.cihai.core.aip.model.ImageResult; import com.dookay.cihai.core.aip.model.ImageResult;
import com.dookay.coral.common.core.exception.ServiceException; import com.dookay.coral.common.core.exception.ServiceException;
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<%--添加此行消除额外空格--%> <%--添加此行消除额外空格--%>
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script> <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
<script src="${ctx}/static/js/vendor.js"></script> <script src="${ctx}/static/js/vendor.js"></script>
<script src="${ctx}/static/js/plugins/lodash.core.js"></script>
<script src="${ctx}/static/js/backend.js"></script> <script src="${ctx}/static/js/backend.js"></script>
<script src="${ctx}/static/js/layer/layer.js"></script> <script src="${ctx}/static/js/layer/layer.js"></script>
<script src="${ctx}/static/js/main.js"></script> <script src="${ctx}/static/js/main.js"></script>
......
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
jQuery.get(location.href + "/map", {}, function (data) { jQuery.get(location.href + "/map", {}, function (data) {
if (data.code == "OK") { if (data.code == "OK") {
mapData = data.data; mapData = data.data;
relationPic('relation-pic', mapData); return newNetwork('relation-pic', mapData);
} else { } else {
console.log("请求数据失败"); console.log("请求数据失败");
} }
...@@ -333,8 +333,8 @@ ...@@ -333,8 +333,8 @@
function loadRelated() { function loadRelated() {
jQuery.get(location.href + "/related", {}, function (data) { jQuery.get(location.href + "/related", {}, function (data) {
if (data.code == "OK") { if (data.code == "OK") {
mapData = data.data; relateData = data.data;
relationPic('word-analysis', relateData); return newNetwork('word-analysis', relateData);
} else { } else {
console.log("请求数据失败"); console.log("请求数据失败");
} }
...@@ -342,8 +342,8 @@ ...@@ -342,8 +342,8 @@
} }
function relationPic(id, data) { function newNetwork(id, data) {
return new vis.Network(document.getElementById(id), mapData, { var netWork = new vis.Network(document.getElementById(id), data, {
nodes: { nodes: {
shape: 'dot', shape: 'dot',
borderWidth: 3, borderWidth: 3,
...@@ -357,11 +357,27 @@ ...@@ -357,11 +357,27 @@
}, },
font: { font: {
color: '#333' color: '#333'
},
},
});
netWork.on("doubleClick", function (e) {
console.log(e);
var i = e.nodes[0];
var node = _.filter(data.nodes, function (n) {
return n.id == i;
});
jQuery.get("/home/search", {keyword: node[0].label}, function (data) {
if (data.code == "OK") {
location.href = data.data;
} else {
myApp.dialog.alert(data.message);
} }
} })
}); });
return netWork;
}; };
$('.js-refresh').click(function () { $('.js-refresh').click(function () {
wordAnalysis.destroy(); wordAnalysis.destroy();
loadRelated(); loadRelated();
...@@ -369,8 +385,6 @@ ...@@ -369,8 +385,6 @@
var mapData = {}; var mapData = {};
var relateData = {}; var relateData = {};
relationPic('relation-pic', mapData); var map = loadMap();
var wordAnalysis = relationPic('word-analysis', mapData); var wordAnalysis = loadRelated();
loadMap();
loadRelated();
</script> </script>
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!