xieshen
/
linbei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#index

This commit is contained in:
Bob 2019-12-06 15:12:47 +08:00
parent fe5f930833
commit 48f864b7a9
2 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
.idea/workspace.xml
View File

@ -73,13 +73,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-738"> <state relative-caret-position="3630">
<caret line="165" column="27" lean-forward="true" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" /> <caret line="165" column="27" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -87,8 +82,13 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472"> <state relative-caret-position="375">
<caret line="381" column="41" selection-start-line="381" selection-start-column="41" selection-end-line="381" selection-end-column="41" /> <caret line="125" column="69" lean-forward="true" selection-start-line="125" selection-start-column="69" selection-end-line="125" selection-end-column="69" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -186,10 +186,10 @@
<auto-save>true</auto-save> <auto-save>true</auto-save>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" /> <option name="x" value="240" />
<option name="y" value="-8" /> <option name="y" value="130" />
<option name="width" value="1936" /> <option name="width" value="1440" />
<option name="height" value="1056" /> <option name="height" value="780" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
@ -197,6 +197,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -208,7 +209,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -354,7 +354,8 @@
<workItem from="1574902551900" duration="32559000" /> <workItem from="1574902551900" duration="32559000" />
<workItem from="1575251847234" duration="7796000" /> <workItem from="1575251847234" duration="7796000" />
<workItem from="1575334609373" duration="2816000" /> <workItem from="1575334609373" duration="2816000" />
<workItem from="1575421048549" duration="2499000" /> <workItem from="1575421048549" duration="4522000" />
<workItem from="1575616042709" duration="221000" />
</task> </task>
<task id="LOCAL-00001" summary="#creat"> <task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created> <created>1567674653918</created>
@ -580,17 +581,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1575341166174</updated> <updated>1575341166174</updated>
</task> </task>
<option name="localTasksCounter" value="33" /> <task id="LOCAL-00033" summary="#index">
<created>1575527819345</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1575527819345</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="247727000" /> <option name="totallyTimeSpent" value="249971000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22044729" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2550586" />
<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" />
@ -604,7 +612,7 @@
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32937366" /> <window_info anchor="bottom" id="Version Control" order="8" weight="0.32937366" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.30561554" /> <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.31533477" />
<window_info anchor="bottom" id="Python Console" order="12" /> <window_info anchor="bottom" id="Python Console" order="12" />
<window_info anchor="bottom" id="Database Console" order="13" weight="0.32937366" /> <window_info anchor="bottom" id="Database Console" order="13" weight="0.32937366" />
<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" />
@ -825,15 +833,6 @@
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/BaseStation_C_ALL.json"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/json/BaseStation_C_ALL.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="das://26d98690-c6ef-4479-9128-3a8b28bfc2b3/database/linbei/schema/public/table/dashboard_points">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true">
<filter text="" />
</filtering>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/urls.py"> <entry file="file://$PROJECT_DIR$/linbei/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
@ -910,13 +909,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-738"> <state relative-caret-position="3630">
<caret line="165" column="27" lean-forward="true" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" /> <caret line="165" column="27" selection-start-line="165" selection-start-column="27" selection-end-line="165" selection-end-column="27" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -927,10 +921,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="das://26d98690-c6ef-4479-9128-3a8b28bfc2b3/database/linbei/schema/public/table/dashboard_points">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true">
<filter text="" />
</filtering>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472"> <state relative-caret-position="375">
<caret line="381" column="41" selection-start-line="381" selection-start-column="41" selection-end-line="381" selection-end-column="41" /> <caret line="125" column="69" lean-forward="true" selection-start-line="125" selection-start-column="69" selection-end-line="125" selection-end-column="69" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

6
dashboard/static/dashboard/js/index.js
View File

@ -115,8 +115,8 @@ $(function () {
}); });
$("#map").click(function (e) { $("#map").click(function (e) {
var t = ol.proj.transform(map.getEventCoordinate(e), 'EPSG:3857', 'EPSG:4326'); var t = ol.proj.transform(map.getEventCoordinate(e), 'EPSG:3857', 'EPSG:4326');
var x = ((t[0] - 107.553186752) * Math.cos(-38 * Math.PI / 180) * 91026.63 + (t[1] - 34.90922719390) * 111000 * Math.sin(-38 * Math.PI / 180)).toFixed(1); var y = ((t[0] - 107.553186752) * Math.cos(-38 * Math.PI / 180) * 91026.63 + (t[1] - 34.90922719390) * 111000 * Math.sin(-38 * Math.PI / 180)).toFixed(1);
var y = ((t[1] - 34.90922719390) * Math.cos(-38 * Math.PI / 180) * 111000 - (t[0] - 107.553186752) * Math.sin(-38 * Math.PI / 180) * 91026.63).toFixed(1); var x = ((t[1] - 34.90922719390) * Math.cos(-38 * Math.PI / 180) * 111000 - (t[0] - 107.553186752) * Math.sin(-38 * Math.PI / 180) * 91026.63).toFixed(1) * -1;
$("#x").html("x:" + x); $("#x").html("x:" + x);
$("#y").html("y:" + y); $("#y").html("y:" + y);
@ -376,7 +376,7 @@ $(function () {
var str; var str;
var ws = $(".wsurl").val(); var ws = $(".wsurl").val();
console.log(ws.length); console.log(ws.length);
if (ws.length != 0){ if (ws.length != 0) {
str = ws str = ws
} else { } else {
str = "ws://111.21.80.34:9004" str = "ws://111.21.80.34:9004"