From fe5f93083338ffd7ad74b9cfaa76831d08a11242 Mon Sep 17 00:00:00 2001
From: Bob <1397910458@qq.com>
Date: Thu, 5 Dec 2019 14:36:58 +0800
Subject: [PATCH] #index

---
 .idea/workspace.xml                    | 81 ++++++++++++--------------
 dashboard/static/dashboard/js/index.js |  2 +-
 2 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 98d0c90..d550965 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,7 @@
   <component name="ChangeListManager">
     <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$/dashboard/static/dashboard/js/vector.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/json/build.json" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/build.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/json/grass.json" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/grass.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dashboard/static/dashboard/json/road.json" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/road.json" 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,11 +70,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="310">
-              <caret line="206" column="32" lean-forward="true" selection-start-line="206" selection-start-column="32" selection-end-line="206" selection-end-column="32" />
+            <state relative-caret-position="-738">
+              <caret line="165" column="27" lean-forward="true" 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" />
@@ -87,16 +84,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <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="406">
-              <caret line="150" column="7" lean-forward="true" selection-start-line="140" selection-start-column="4" selection-end-line="150" selection-end-column="7" />
-              <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="472">
+              <caret line="381" column="41" selection-start-line="381" selection-start-column="41" selection-end-line="381" selection-end-column="41" />
             </state>
           </provider>
         </entry>
@@ -104,7 +96,7 @@
       <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="274">
+            <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>
           </provider>
@@ -181,9 +173,9 @@
         <option value="$PROJECT_DIR$/dashboard/urls.py" />
         <option value="$PROJECT_DIR$/dashboard/views.py" />
         <option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" />
-        <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
         <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
         <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" />
+        <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
       </list>
     </option>
   </component>
@@ -205,7 +197,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -217,6 +208,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -361,7 +353,8 @@
       <workItem from="1574816525242" duration="21703000" />
       <workItem from="1574902551900" duration="32559000" />
       <workItem from="1575251847234" duration="7796000" />
-      <workItem from="1575334609373" duration="1549000" />
+      <workItem from="1575334609373" duration="2816000" />
+      <workItem from="1575421048549" duration="2499000" />
     </task>
     <task id="LOCAL-00001" summary="#creat">
       <created>1567674653918</created>
@@ -580,17 +573,24 @@
       <option name="project" value="LOCAL" />
       <updated>1575271847946</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="#index">
+      <created>1575341166174</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1575341166174</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="243961000" />
+    <option name="totallyTimeSpent" value="247727000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21831736" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22044729" />
       <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" />
@@ -604,7 +604,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.30561554" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.30561554" />
       <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" />
@@ -908,34 +908,29 @@
         </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="-738">
+          <caret line="165" column="27" lean-forward="true" 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>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
+        <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>
       </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="406">
-          <caret line="150" column="7" lean-forward="true" selection-start-line="140" selection-start-column="4" selection-end-line="150" selection-end-column="7" />
-          <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>
-    <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="206" column="32" lean-forward="true" selection-start-line="206" selection-start-column="32" selection-end-line="206" selection-end-column="32" />
-          <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="472">
+          <caret line="381" column="41" selection-start-line="381" selection-start-column="41" selection-end-line="381" selection-end-column="41" />
         </state>
       </provider>
     </entry>
diff --git a/dashboard/static/dashboard/js/index.js b/dashboard/static/dashboard/js/index.js
index d489f58..5d7c402 100644
--- a/dashboard/static/dashboard/js/index.js
+++ b/dashboard/static/dashboard/js/index.js
@@ -379,7 +379,7 @@ $(function () {
         if (ws.length != 0){
             str = ws
         } else {
-            str = "ws://210.77.68.214:50332"
+            str = "ws://111.21.80.34:9004"
         }