This commit is contained in:
Bob 2019-12-09 09:08:56 +08:00
parent f9c1f40747
commit 1f5afe1ae2
2 changed files with 34 additions and 15 deletions

View File

@ -82,8 +82,13 @@
<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="221">
<caret line="118" column="161" selection-start-line="118" selection-start-column="161" selection-end-line="118" selection-end-column="161" />
<state relative-caret-position="309">
<caret line="119" lean-forward="true" selection-start-line="119" selection-end-line="119" />
<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>
</provider>
</entry>
@ -91,8 +96,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4796">
<caret line="218" column="41" selection-start-line="218" selection-start-column="41" selection-end-line="218" selection-end-column="41" />
<state relative-caret-position="2831">
<caret line="214" column="77" lean-forward="true" selection-start-line="214" selection-start-column="77" selection-end-line="214" selection-end-column="77" />
</state>
</provider>
</entry>
@ -351,7 +356,8 @@
<workItem from="1575334609373" duration="2816000" />
<workItem from="1575421048549" duration="4522000" />
<workItem from="1575616042709" duration="903000" />
<workItem from="1575622080443" duration="20000" />
<workItem from="1575622080443" duration="636000" />
<workItem from="1575851747431" duration="731000" />
</task>
<task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created>
@ -591,17 +597,24 @@
<option name="project" value="LOCAL" />
<updated>1575616367487</updated>
</task>
<option name="localTasksCounter" value="35" />
<task id="LOCAL-00035" summary="#index">
<created>1575622126691</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1575622126691</updated>
</task>
<option name="localTasksCounter" value="36" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="250673000" />
<option name="totallyTimeSpent" value="252020000" />
</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.25772098" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2603834" />
<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" />
@ -928,15 +941,20 @@
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4796">
<caret line="218" column="41" selection-start-line="218" selection-start-column="41" selection-end-line="218" selection-end-column="41" />
<state relative-caret-position="2831">
<caret line="214" column="77" lean-forward="true" selection-start-line="214" selection-start-column="77" selection-end-line="214" selection-end-column="77" />
</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="221">
<caret line="118" column="161" selection-start-line="118" selection-start-column="161" selection-end-line="118" selection-end-column="161" />
<state relative-caret-position="309">
<caret line="119" lean-forward="true" selection-start-line="119" selection-end-line="119" />
<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>
</provider>
</entry>

View File

@ -115,8 +115,8 @@ $(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);
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[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);
@ -595,7 +595,7 @@ $(function () {
//==================================绘制多边形完毕=======================================================================
//========================================基站=====================================================
//========================================基站显示隐藏=====================================================
$(".base-station-1").click(function () {
var flag = document.getElementsByClassName('base-station-1');
for (var i = 0; i < flag.length; i++) {
@ -644,6 +644,7 @@ $(function () {
}
}
});
//=============================================================================================================
window.globalConfig = {