This commit is contained in:
Bob 2019-12-06 16:48:46 +08:00
parent 48f864b7a9
commit f9c1f40747
2 changed files with 26 additions and 28 deletions

View File

@ -82,13 +82,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<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 relative-caret-position="221">
<caret line="118" column="161" selection-start-line="118" selection-start-column="161" selection-end-line="118" selection-end-column="161" />
</state>
</provider>
</entry>
@ -355,7 +350,8 @@
<workItem from="1575251847234" duration="7796000" />
<workItem from="1575334609373" duration="2816000" />
<workItem from="1575421048549" duration="4522000" />
<workItem from="1575616042709" duration="221000" />
<workItem from="1575616042709" duration="903000" />
<workItem from="1575622080443" duration="20000" />
</task>
<task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created>
@ -588,17 +584,24 @@
<option name="project" value="LOCAL" />
<updated>1575527819345</updated>
</task>
<option name="localTasksCounter" value="34" />
<task id="LOCAL-00034" summary="#index">
<created>1575616367487</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1575616367487</updated>
</task>
<option name="localTasksCounter" value="35" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="249971000" />
<option name="totallyTimeSpent" value="250673000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2550586" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25772098" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@ -907,6 +910,15 @@
</state>
</provider>
</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/vector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3630">
@ -921,24 +933,10 @@
</state>
</provider>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<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 relative-caret-position="221">
<caret line="118" column="161" selection-start-line="118" selection-start-column="161" selection-end-line="118" selection-end-column="161" />
</state>
</provider>
</entry>

View File

@ -116,7 +116,7 @@ $(function () {
$("#map").click(function (e) {
var t = ol.proj.transform(map.getEventCoordinate(e), 'EPSG:3857', 'EPSG:4326');
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 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;
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);
$("#x").html("x:" + x);
$("#y").html("y:" + y);