This commit is contained in:
jingquan huang 2019-12-19 22:22:00 +08:00
parent 923a260dbf
commit 6816a2ec97
4 changed files with 124 additions and 54 deletions

View File

@ -3,7 +3,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0b71a6a1-d7aa-4903-a1f1-4488fea56112" name="Default Changelist" comment=""> <list default="true" id="0b71a6a1-d7aa-4903-a1f1-4488fea56112" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/js/map.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/map.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/css/demo.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/demo.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/machine.html" beforeDir="false" afterPath="$PROJECT_DIR$/machine.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/map.html" beforeDir="false" afterPath="$PROJECT_DIR$/map.html" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -13,18 +15,6 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10032">
<caret line="528" column="49" selection-start-line="528" selection-start-column="42" selection-end-line="528" selection-end-column="49" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/echarts_map_test 1.html"> <entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -52,7 +42,7 @@
<entry file="file://$PROJECT_DIR$/demo_1.html"> <entry file="file://$PROJECT_DIR$/demo_1.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31502"> <state relative-caret-position="31502">
<caret line="1658" column="38" lean-forward="true" selection-start-line="1658" selection-start-column="38" selection-end-line="1658" selection-end-column="38" /> <caret line="1658" column="38" selection-start-line="1658" selection-start-column="38" selection-end-line="1658" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -60,16 +50,31 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/map.html"> <entry file="file://$PROJECT_DIR$/map.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10792"> <state relative-caret-position="-1073">
<caret line="568" column="7" lean-forward="true" selection-start-line="568" selection-start-column="7" selection-end-line="568" selection-end-column="7" /> <caret line="20" column="52" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/machine.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/demo.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="384" column="16" lean-forward="true" selection-start-line="384" selection-start-column="16" selection-end-line="384" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/demo.js"> <entry file="file://$PROJECT_DIR$/js/demo.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="874">
<caret line="46" column="14" selection-start-line="46" selection-start-column="14" selection-end-line="46" selection-end-column="14" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
@ -77,11 +82,27 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/map.js"> <entry file="file://$PROJECT_DIR$/js/map.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="191"> <state relative-caret-position="-149">
<caret line="476" column="36" selection-start-line="476" selection-start-column="36" selection-end-line="476" selection-end-column="36" /> <caret line="660" column="47" selection-start-line="660" selection-start-column="43" selection-end-line="660" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/public.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1342" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/machine.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="70">
<caret line="124" column="39" selection-start-line="124" selection-start-column="39" selection-end-line="124" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -101,6 +122,15 @@
<find>backg</find> <find>backg</find>
<find>班公湖</find> <find>班公湖</find>
<find>http</find> <find>http</find>
<find>alert</find>
<find>首页</find>
<find>3</find>
<find>panding</find>
<find>canvas</find>
<find>onclick</find>
<find>maps</find>
<find>中印边境包含哪几段</find>
<find>fixed-left</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@ -111,9 +141,11 @@
<list> <list>
<option value="$PROJECT_DIR$/echarts_map_test 1.html" /> <option value="$PROJECT_DIR$/echarts_map_test 1.html" />
<option value="$PROJECT_DIR$/demo.html" /> <option value="$PROJECT_DIR$/demo.html" />
<option value="$PROJECT_DIR$/map.html" />
<option value="$PROJECT_DIR$/test.html" /> <option value="$PROJECT_DIR$/test.html" />
<option value="$PROJECT_DIR$/js/map.js" /> <option value="$PROJECT_DIR$/js/map.js" />
<option value="$PROJECT_DIR$/css/demo.css" />
<option value="$PROJECT_DIR$/machine.html" />
<option value="$PROJECT_DIR$/map.html" />
</list> </list>
</option> </option>
</component> </component>
@ -140,6 +172,11 @@
<item name="geo_info_platform" type="b2602c69:ProjectViewProjectNode" /> <item name="geo_info_platform" type="b2602c69:ProjectViewProjectNode" />
<item name="geo_info_platform" type="462c0819:PsiDirectoryNode" /> <item name="geo_info_platform" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="geo_info_platform" type="b2602c69:ProjectViewProjectNode" />
<item name="geo_info_platform" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@ -179,18 +216,18 @@
<workItem from="1576569409159" duration="1687000" /> <workItem from="1576569409159" duration="1687000" />
<workItem from="1576671812636" duration="1016000" /> <workItem from="1576671812636" duration="1016000" />
<workItem from="1576723846646" duration="6468000" /> <workItem from="1576723846646" duration="6468000" />
<workItem from="1576743516593" duration="368000" /> <workItem from="1576743516593" duration="639000" />
<workItem from="1576750279779" duration="2300000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9539000" /> <option name="totallyTimeSpent" value="12110000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="820" extended-state="0" /> <frame x="0" y="23" width="1440" height="820" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15593705" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15808298" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -203,7 +240,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" /> <window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" /> <window_info anchor="bottom" id="Version Control" order="9" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.26785713" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.35164836" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" /> <window_info anchor="bottom" id="Messages" order="12" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -292,32 +329,55 @@
<entry file="file://$PROJECT_DIR$/demo_1.html"> <entry file="file://$PROJECT_DIR$/demo_1.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31502"> <state relative-caret-position="31502">
<caret line="1658" column="38" lean-forward="true" selection-start-line="1658" selection-start-column="38" selection-end-line="1658" selection-end-column="38" /> <caret line="1658" column="38" selection-start-line="1658" selection-start-column="38" selection-end-line="1658" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/public.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1342" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/machine.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/map.html"> <entry file="file://$PROJECT_DIR$/map.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10792"> <state relative-caret-position="-1073">
<caret line="568" column="7" lean-forward="true" selection-start-line="568" selection-start-column="7" selection-end-line="568" selection-end-column="7" /> <caret line="20" column="52" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-149">
<caret line="660" column="47" selection-start-line="660" selection-start-column="43" selection-end-line="660" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/machine.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="70">
<caret line="124" column="39" selection-start-line="124" selection-start-column="39" selection-end-line="124" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/demo.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="384" column="16" lean-forward="true" selection-start-line="384" selection-start-column="16" selection-end-line="384" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/demo.js"> <entry file="file://$PROJECT_DIR$/js/demo.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="874">
<caret line="46" column="14" selection-start-line="46" selection-start-column="14" selection-end-line="46" selection-end-column="14" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="191">
<caret line="476" column="36" selection-start-line="476" selection-start-column="36" selection-end-line="476" selection-end-column="36" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

View File

@ -49,6 +49,18 @@ body{
height: 100%; height: 100%;
} }
.ml10{
margin-left: 10px;
}
.ml5{
margin-left: 5px;
}
.ml15{
margin-left: 15px;
}
.div-b, .div-b,
.div-c{ .div-c{
color:rgb(255, 255, 255); color:rgb(255, 255, 255);

View File

@ -17,14 +17,14 @@
基于知识图谱的兵要信息平台 基于知识图谱的兵要信息平台
</h2> </h2>
<ul class="map-nav"> <ul class="map-nav">
<li> <li class="ml10">
<a href="./map.html">首页</a> <a href="./map.html">首页</a>
</li> </li>
<li> <li class="ml10">
<a href="javscript:void(0)">产品</a> <a href="javscript:void(0)" title="正在完善中">新闻动态</a>
</li> </li>
<li> <li class="ml10">
<a href="javscript:void(0)">后台管理</a> <a href="javscript:void(0)" title="正在完善中">后台管理</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -44,7 +44,7 @@
</span> --> </span> -->
<li class="info-item"> <li class="info-item">
<div class="show_detail"> <div class="show_detail">
<img class="user_img" src="./image/3.jpg" /> <img class="user_img" src="./image/300.jpg" />
<ul class="detail_info"> <ul class="detail_info">
<li class="info_txt" data-key="user">admin</li> <li class="info_txt" data-key="user">admin</li>
<li class="info_txt" data-key="off">退出</li> <li class="info_txt" data-key="off">退出</li>

View File

@ -31,14 +31,14 @@
基于知识图谱的兵要信息平台 基于知识图谱的兵要信息平台
</h2> </h2>
<ul class="map-nav"> <ul class="map-nav">
<li> <li class="ml10">
<a href="javscript:void(0)">首页</a> <a href="/map.html">首页</a>
</li> </li>
<li> <li class="ml10">
<a href="javscript:void(0)">产品</a> <a href="javscript:void(0)" title="正在完善中">新闻动态</a>
</li> </li>
<li> <li class="ml10">
<a href="javscript:void(0)">后台管理</a> <a href="javscript:void(0)" title="正在完善中">后台管理</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -58,7 +58,7 @@
</span> </span>
<li class="info-item"> <li class="info-item">
<div class="show_detail"> <div class="show_detail">
<img class="user_img" src="./image/3.jpg" /> <img class="user_img" src="./image/300.png" />
<ul class="detail_info"> <ul class="detail_info">
<li class="info_txt" data-key="user">admin</li> <li class="info_txt" data-key="user">admin</li>
<li class="info_txt" data-key="off">退出</li> <li class="info_txt" data-key="off">退出</li>
@ -74,7 +74,7 @@
<img src="./image/1.png" />服务优势 <img src="./image/1.png" />服务优势
</a> </a>
<a class="bottomItem" href="./machine.html"> <a class="bottomItem" href="./machine.html">
<img src="./image/2.png" />AI语音 <img src="./image/2.png" />AI智能服务
</a> </a>
<a class="bottomItem" href="javscript:void(0)"> <a class="bottomItem" href="javscript:void(0)">
<img src="./image/3.png" />案例精选 <img src="./image/3.png" />案例精选
@ -300,7 +300,7 @@
let node = nodeMap[nodeName]; let node = nodeMap[nodeName];
if (node.hasAppend === true || Object.keys(node.nodes).length === 0 || Object.keys(node.links).length === 0) { if (node.hasAppend === true || Object.keys(node.nodes).length === 0 || Object.keys(node.links).length === 0) {
alert("无法继续展开"); alert("没有数据继续展开");
return return
} }
Object.values(node.nodes).forEach(n => { Object.values(node.nodes).forEach(n => {
@ -334,7 +334,6 @@
function loadData(name) { function loadData(name) {
result = sync_request('https://api.ownthink.com/kg/knowledge?entity='+name) result = sync_request('https://api.ownthink.com/kg/knowledge?entity='+name)
if (JSON.stringify(result.data) == '{}'){ if (JSON.stringify(result.data) == '{}'){
alert("nothing")
return 0 return 0
} }
fillInfo(result, name) fillInfo(result, name)
@ -367,7 +366,6 @@
function init(name) { function init(name) {
result = sync_request('https://api.ownthink.com/kg/knowledge?entity='+name) result = sync_request('https://api.ownthink.com/kg/knowledge?entity='+name)
if (!result.data) { if (!result.data) {
alert("nothing")
return 0 return 0
} }
graphList = {"keyword":{ graphList = {"keyword":{