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

#修复同时点击bug

This commit is contained in:
Bob 2020-06-28 16:52:56 +08:00
parent 2b6703b6fa
commit fdba013545
2 changed files with 94 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
.idea/workspace.xml
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="#修复同时点击bug">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" 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$/fabfile.py" beforeDir="false" afterPath="$PROJECT_DIR$/fabfile.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linbei/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/linbei/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linbei/wsgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/linbei/wsgi.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -73,6 +71,22 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="214">
<caret line="6048" column="21" selection-start-line="6048" selection-start-column="21" selection-end-line="6048" selection-end-column="21" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
<element signature="e#803#844#0" />
<element signature="e#885#924#0" />
<element signature="e#1170#1193#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
@ -82,10 +96,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/import_points.py">
<entry file="file://$PROJECT_DIR$/static/js/jspdf.customfonts.debug.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
<state relative-caret-position="12122">
<caret line="558" column="23" selection-start-line="558" selection-start-column="23" selection-end-line="558" selection-end-column="23" />
</state>
</provider>
</entry>
@ -93,7 +107,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2439">
<state relative-caret-position="506">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding>
<element signature="e#305#314#0" expanded="true" />
@ -105,7 +119,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<state relative-caret-position="198">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
@ -126,8 +140,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="3630">
<caret line="165" column="103" selection-start-line="165" selection-start-column="92" selection-end-line="165" selection-end-column="103" />
<state relative-caret-position="7370">
<caret line="335" column="43" selection-start-line="335" selection-start-column="43" selection-end-line="335" selection-end-column="43" />
</state>
</provider>
</entry>
@ -177,8 +191,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>setBearing</find>
<find>src</find>
<find>marker</find>
<find>length</find>
<find>hamburger is-closed animated fadeInLeft</find>
@ -207,6 +219,8 @@
<find>ANL</find>
<find>ajax</find>
<find>map.removeInteraction(draw)</find>
<find>current</find>
<find>ws://111.21.80.34:9004</find>
</findStrings>
<dirStrings>
<dir>D:\python\p3\linbei</dir>
@ -250,10 +264,10 @@
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
<option value="$PROJECT_DIR$/dashboard/urls.py" />
<option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
<option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/linbei/wsgi.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
</list>
</option>
</component>
@ -263,11 +277,11 @@
<other-services-enabled>true</other-services-enabled>
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-15" />
<option name="y" value="43" />
<option name="width" value="1936" />
<option name="height" value="1056" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-1688" />
<option name="y" value="16" />
<option name="width" value="1696" />
<option name="height" value="1026" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@ -275,7 +289,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -352,6 +365,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -547,14 +561,8 @@
<workItem from="1591318999695" duration="1227000" />
<workItem from="1591587017803" duration="460000" />
<workItem from="1591602854501" duration="2109000" />
<workItem from="1593253917796" duration="225000" />
</task>
<task id="LOCAL-00017" summary="#index">
<created>1573027862539</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1573027862539</updated>
<workItem from="1593253917796" duration="1756000" />
<workItem from="1593333842540" duration="512000" />
</task>
<task id="LOCAL-00018" summary="#index">
<created>1573114442908</created>
@ -892,17 +900,24 @@
<option name="project" value="LOCAL" />
<updated>1591604304551</updated>
</task>
<option name="localTasksCounter" value="66" />
<task id="LOCAL-00066" summary="#修复同时点击bug">
<created>1593254199723</created>
<option name="number" value="00066" />
<option name="presentableId" value="LOCAL-00066" />
<option name="project" value="LOCAL" />
<updated>1593254199725</updated>
</task>
<option name="localTasksCounter" value="67" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="377826000" />
<option name="totallyTimeSpent" value="379869000" />
</component>
<component name="ToolWindowManager">
<frame x="-15" y="43" width="1936" height="1056" extended-state="0" />
<frame x="-1688" y="16" width="1696" height="1026" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28700745" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.33272284" />
<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" />
@ -916,7 +931,7 @@
<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="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.2775378" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.2689732" />
<window_info anchor="bottom" id="Python Console" order="12" />
<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" />
@ -949,7 +964,6 @@
<SUITE FILE_PATH="coverage/linbei$import_points.coverage" NAME="import_points Coverage Results" MODIFIED="1573780425219" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/src/map/Map.js" />
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet-include.js" />
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
<provider selected="true" editor-type-id="text-editor">
@ -1131,10 +1145,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="6432" column="20" selection-start-line="6432" selection-start-column="20" selection-end-line="6432" selection-end-column="20" />
<state relative-caret-position="214">
<caret line="6048" column="21" selection-start-line="6048" selection-start-column="21" selection-end-line="6048" selection-end-column="21" />
<folding>
<element signature="e#464#688#0" />
<element signature="e#752#795#0" />
@ -1145,10 +1169,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/import_points.py">
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
<state relative-caret-position="286">
<caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/js/jspdf.customfonts.debug.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12122">
<caret line="558" column="23" selection-start-line="558" selection-start-column="23" selection-end-line="558" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -1161,8 +1212,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3630">
<caret line="165" column="103" selection-start-line="165" selection-start-column="92" selection-end-line="165" selection-end-column="103" />
<state relative-caret-position="7370">
<caret line="335" column="43" selection-start-line="335" selection-start-column="43" selection-end-line="335" selection-end-column="43" />
</state>
</provider>
</entry>
@ -1193,35 +1244,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/fabfile.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2439">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding>
<element signature="e#305#314#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/linbei/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
</state>
</provider>
</entry>
</component>
</project>

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

@ -6045,7 +6045,8 @@ $(function () {
//-------------------------------------------------webscoket-------------------------------------------------------
function connect_websocket() {
console.log("6666");
var str = "ws://111.21.80.34:9004";
//var str = "ws://111.21.80.34:9004";
var str = "ws://172.28.100.50:50332";
// if (window.s) {