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

#人员点击

This commit is contained in:
Bob 2020-06-05 09:13:48 +08:00
parent e49e608c04
commit 04790fc5ed
6 changed files with 396 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

420
.idea/workspace.xml
View File

@ -2,38 +2,12 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment=""> <list default="true" id="9cbc7ee8-e518-44ca-870c-9743cf0f1b98" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房一层围墙.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房一层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房一层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房一层设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房一层门.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房七层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房七层建筑物.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房七层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房七层门.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房三层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房三层建筑物.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房三层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房三层门.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房二层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房二层建筑物.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房二层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房二层门.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房五层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房五层建筑物.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房五层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房五层门.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房六层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房六层建筑物.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房六层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房六层门.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房四层大型设备.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房四层建筑物.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房四层楼梯.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dashboard/static/dashboard/json/主机房四层门.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" 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" />
<change beforePath="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dashboard/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linbei/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/linbei/settings.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -100,12 +74,123 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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"> <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="440"> <state relative-caret-position="466">
<caret line="6409" column="37" selection-start-line="6409" selection-start-column="37" selection-end-line="6409" selection-end-column="37" /> <caret line="1701" column="13" lean-forward="true" selection-start-line="1701" selection-start-column="13" selection-end-line="1701" selection-end-column="13" />
<folding> <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" />
<element signature="e#1653#1960#0" />
<element signature="e#2031#2338#0" />
<element signature="e#2405#2565#0" />
<element signature="e#2605#3069#0" />
<element signature="e#3136#3597#0" />
<element signature="e#3665#4130#0" />
<element signature="e#4197#4661#0" />
<element signature="e#4739#4876#0" />
<element signature="e#5228#5484#0" />
<element signature="e#5575#6036#0" />
<element signature="e#6081#6536#0" />
<element signature="e#6577#7031#0" />
<element signature="e#7073#7531#0" />
<element signature="e#7570#8023#0" />
<element signature="e#8030#8071#0" />
<element signature="e#8619#9080#0" />
<element signature="e#9124#9580#0" />
<element signature="e#9619#10072#0" />
<element signature="e#10112#10566#0" />
<element signature="e#10614#11075#0" />
<element signature="e#11119#11575#0" />
<element signature="e#11615#12069#0" />
<element signature="e#12108#12561#0" />
<element signature="e#12610#13071#0" />
<element signature="e#13115#13571#0" />
<element signature="e#13611#14065#0" />
<element signature="e#14104#14557#0" />
<element signature="e#14605#15066#0" />
<element signature="e#15110#15566#0" />
<element signature="e#15606#16060#0" />
<element signature="e#16099#16552#0" />
<element signature="e#16600#17061#0" />
<element signature="e#17105#17561#0" />
<element signature="e#17601#18055#0" />
<element signature="e#18094#18547#0" />
<element signature="e#18594#19055#0" />
<element signature="e#19099#19555#0" />
<element signature="e#19595#20049#0" />
<element signature="e#20088#20541#0" />
<element signature="e#20584#21048#0" />
<element signature="e#21091#21600#0" />
<element signature="e#21643#21890#0" />
<element signature="e#21933#22180#0" />
<element signature="e#22223#22470#0" />
<element signature="e#22546#23007#0" />
<element signature="e#23079#23535#0" />
<element signature="e#23602#24056#0" />
<element signature="e#24120#24573#0" />
<element signature="e#24650#25111#0" />
<element signature="e#25183#25639#0" />
<element signature="e#25706#26160#0" />
<element signature="e#26224#26677#0" />
<element signature="e#26755#27216#0" />
<element signature="e#27289#27745#0" />
<element signature="e#27813#28267#0" />
<element signature="e#28332#28785#0" />
<element signature="e#28861#29318#0" />
<element signature="e#29388#29843#0" />
<element signature="e#29910#30364#0" />
<element signature="e#30440#30901#0" />
<element signature="e#30973#31429#0" />
<element signature="e#31496#31950#0" />
<element signature="e#32014#32467#0" />
<element signature="e#32543#33004#0" />
<element signature="e#33076#33532#0" />
<element signature="e#33599#34053#0" />
<element signature="e#34117#34570#0" />
<element signature="e#34648#35109#0" />
<element signature="e#35182#35638#0" />
<element signature="e#35706#36160#0" />
<element signature="e#36225#36678#0" />
<element signature="e#36755#37216#0" />
<element signature="e#37288#37744#0" />
<element signature="e#37811#38265#0" />
<element signature="e#38329#38782#0" />
<element signature="e#38855#39093#0" />
<element signature="e#39159#39396#0" />
<element signature="e#39485#39729#0" />
<element signature="e#39798#40036#0" />
<element signature="e#40106#40344#0" />
<element signature="e#40430#40673#0" />
<element signature="e#40751#40991#0" />
<element signature="e#41074#41316#0" />
<element signature="e#41389#41627#0" />
<element signature="e#41688#41924#0" />
<element signature="e#41987#42223#0" />
<element signature="e#42283#42519#0" />
<element signature="e#42587#42825#0" />
<element signature="e#42894#43132#0" />
<element signature="e#43200#43438#0" />
<element signature="e#43512#43750#0" />
<element signature="e#43821#44059#0" />
<element signature="e#44126#44363#0" />
<element signature="e#44433#44671#0" />
<element signature="e#44746#44985#0" />
<element signature="e#45069#45310#0" />
<element signature="e#45378#45616#0" />
<element signature="e#45684#45922#0" />
<element signature="e#45991#46229#0" />
<element signature="e#46297#46535#0" />
<element signature="e#46603#46841#0" />
<element signature="e#46910#47148#0" />
<element signature="e#47216#47454#0" />
<element signature="e#47526#47764#0" />
<element signature="e#47843#48083#0" />
<element signature="e#48144#48380#0" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
@ -124,8 +209,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/linbei/settings.py"> <entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3410"> <state relative-caret-position="1870">
<caret line="158" column="64" selection-start-line="158" selection-start-column="64" selection-end-line="158" selection-end-column="64" /> <caret line="85" selection-start-line="85" selection-end-line="95" />
<folding> <folding>
<element signature="e#305#314#0" expanded="true" /> <element signature="e#305#314#0" expanded="true" />
</folding> </folding>
@ -133,11 +218,20 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://D:/2020/linbei/decode.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="21" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308"> <state relative-caret-position="3630">
<caret line="59" column="26" lean-forward="true" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" /> <caret line="165" column="103" selection-start-line="165" selection-start-column="92" selection-end-line="165" selection-end-column="103" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -145,8 +239,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/urls.py"> <entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66"> <state relative-caret-position="176">
<caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" /> <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
<folding> <folding>
<element signature="e#0#19#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
@ -157,10 +251,10 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/views.py"> <entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="250">
<caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" /> <caret line="40" column="14" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding> <folding>
<element signature="e#0#30#0" expanded="true" /> <element signature="e#0#11#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -180,16 +274,13 @@
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Python Script" />
<option value="HTML File" /> <option value="HTML File" />
<option value="Python Script" />
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>max</find>
<find>cors</find>
<find>sidebar</find>
<find>result-panel</find> <find>result-panel</find>
<find>setBearing</find> <find>setBearing</find>
<find>src</find> <find>src</find>
@ -216,6 +307,10 @@
<find>zhuyaoshebei</find> <find>zhuyaoshebei</find>
<find>base-station-1</find> <find>base-station-1</find>
<find>点击</find> <find>点击</find>
<find>click</find>
<find>基站名称</find>
<find>ANL</find>
<find>ajax</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>D:\python\p3\linbei</dir> <dir>D:\python\p3\linbei</dir>
@ -253,15 +348,16 @@
<option value="$PROJECT_DIR$/dashboard/static/dashboard/css/popup.css" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/css/popup.css" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/popup.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/popup.js" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/vector.html" />
<option value="$PROJECT_DIR$/dashboard/urls.py" />
<option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/results_by_keywords.html" />
<option value="$PROJECT_DIR$/../linbeitest/create_pyc.py" /> <option value="$PROJECT_DIR$/../linbeitest/create_pyc.py" />
<option value="$PROJECT_DIR$/fabfile.py" /> <option value="$PROJECT_DIR$/fabfile.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/vector.js" />
<option value="$PROJECT_DIR$/linbei/settings.py" /> <option value="$PROJECT_DIR$/test.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index.html" />
<option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/dashboard/urls.py" />
<option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index.js" />
</list> </list>
</option> </option>
</component> </component>
@ -272,8 +368,8 @@
<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="283" />
<option name="y" value="-8" /> <option name="y" value="78" />
<option name="width" value="1936" /> <option name="width" value="1936" />
<option name="height" value="1056" /> <option name="height" value="1056" />
</component> </component>
@ -283,6 +379,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -359,7 +456,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -369,7 +465,7 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="false" /> <property name="database.console.LAST_STATE" value="false" />
<property name="editor.config.ad.shown" value="true" /> <property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/dashboard/static/dashboard/json" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
@ -544,14 +640,15 @@
<workItem from="1589503690650" duration="9696000" /> <workItem from="1589503690650" duration="9696000" />
<workItem from="1589536426196" duration="584000" /> <workItem from="1589536426196" duration="584000" />
<workItem from="1589763484644" duration="2881000" /> <workItem from="1589763484644" duration="2881000" />
<workItem from="1589850757158" duration="3906000" /> <workItem from="1589850757158" duration="4972000" />
</task> <workItem from="1590464860981" duration="1300000" />
<task id="LOCAL-00011" summary="#index"> <workItem from="1590570960144" duration="944000" />
<created>1568186037061</created> <workItem from="1590581891736" duration="592000" />
<option name="number" value="00011" /> <workItem from="1590626853978" duration="1238000" />
<option name="presentableId" value="LOCAL-00011" /> <workItem from="1591252817898" duration="6847000" />
<option name="project" value="LOCAL" /> <workItem from="1591268601699" duration="1623000" />
<updated>1568186037061</updated> <workItem from="1591289116263" duration="1056000" />
<workItem from="1591318999695" duration="572000" />
</task> </task>
<task id="LOCAL-00012" summary="#index"> <task id="LOCAL-00012" summary="#index">
<created>1570519321771</created> <created>1570519321771</created>
@ -889,17 +986,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1589510660593</updated> <updated>1589510660593</updated>
</task> </task>
<option name="localTasksCounter" value="60" /> <task id="LOCAL-00060" summary="#更换数据">
<created>1589854722709</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1589854722709</updated>
</task>
<option name="localTasksCounter" value="61" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="359139000" /> <option name="totallyTimeSpent" value="374377000" />
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22470714" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27902022" />
<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" />
@ -913,7 +1017,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 anchor="bottom" id="Terminal" order="11" visible="true" weight="0.2688985" /> <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.2775378" />
<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" />
@ -943,20 +1047,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$" /> <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>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="15" column="29" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/deps.js" />
<entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/build/deps.js" /> <entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/build/deps.js" />
<entry file="file://$PROJECT_DIR$/Leaflet-rotate-master/src/map/Map.js" /> <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/static/dashboard/js/leaflet-include.js" />
@ -1143,6 +1233,16 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test.py" />
<entry file="das://26d98690-c6ef-4479-9128-3a8b28bfc2b3/database/linbei/schema/public/table/auth_user">
<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$/import_points.py"> <entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550"> <state relative-caret-position="550">
@ -1152,30 +1252,34 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/linbei/settings.py"> <entry file="file://$PROJECT_DIR$/linbei/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3410"> <state relative-caret-position="1870">
<caret line="158" column="64" selection-start-line="158" selection-start-column="64" selection-end-line="158" selection-end-column="64" /> <caret line="85" selection-start-line="85" selection-end-line="95" />
<folding> <folding>
<element signature="e#305#314#0" expanded="true" /> <element signature="e#305#314#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py"> <entry file="file://D:/2020/linbei/decode.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66"> <state>
<caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" /> <caret selection-end-line="21" selection-end-column="26" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="3630">
<caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" /> <caret line="165" column="103" selection-start-line="165" selection-start-column="92" selection-end-line="165" selection-end-column="103" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
<folding> <folding>
<element signature="e#0#30#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1187,22 +1291,136 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="40" column="14" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</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="440"> <state relative-caret-position="466">
<caret line="6409" column="37" selection-start-line="6409" selection-start-column="37" selection-end-line="6409" selection-end-column="37" /> <caret line="1701" column="13" lean-forward="true" selection-start-line="1701" selection-start-column="13" selection-end-line="1701" selection-end-column="13" />
<folding> <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" />
<element signature="e#1653#1960#0" />
<element signature="e#2031#2338#0" />
<element signature="e#2405#2565#0" />
<element signature="e#2605#3069#0" />
<element signature="e#3136#3597#0" />
<element signature="e#3665#4130#0" />
<element signature="e#4197#4661#0" />
<element signature="e#4739#4876#0" />
<element signature="e#5228#5484#0" />
<element signature="e#5575#6036#0" />
<element signature="e#6081#6536#0" />
<element signature="e#6577#7031#0" />
<element signature="e#7073#7531#0" />
<element signature="e#7570#8023#0" />
<element signature="e#8030#8071#0" />
<element signature="e#8619#9080#0" />
<element signature="e#9124#9580#0" />
<element signature="e#9619#10072#0" />
<element signature="e#10112#10566#0" />
<element signature="e#10614#11075#0" />
<element signature="e#11119#11575#0" />
<element signature="e#11615#12069#0" />
<element signature="e#12108#12561#0" />
<element signature="e#12610#13071#0" />
<element signature="e#13115#13571#0" />
<element signature="e#13611#14065#0" />
<element signature="e#14104#14557#0" />
<element signature="e#14605#15066#0" />
<element signature="e#15110#15566#0" />
<element signature="e#15606#16060#0" />
<element signature="e#16099#16552#0" />
<element signature="e#16600#17061#0" />
<element signature="e#17105#17561#0" />
<element signature="e#17601#18055#0" />
<element signature="e#18094#18547#0" />
<element signature="e#18594#19055#0" />
<element signature="e#19099#19555#0" />
<element signature="e#19595#20049#0" />
<element signature="e#20088#20541#0" />
<element signature="e#20584#21048#0" />
<element signature="e#21091#21600#0" />
<element signature="e#21643#21890#0" />
<element signature="e#21933#22180#0" />
<element signature="e#22223#22470#0" />
<element signature="e#22546#23007#0" />
<element signature="e#23079#23535#0" />
<element signature="e#23602#24056#0" />
<element signature="e#24120#24573#0" />
<element signature="e#24650#25111#0" />
<element signature="e#25183#25639#0" />
<element signature="e#25706#26160#0" />
<element signature="e#26224#26677#0" />
<element signature="e#26755#27216#0" />
<element signature="e#27289#27745#0" />
<element signature="e#27813#28267#0" />
<element signature="e#28332#28785#0" />
<element signature="e#28861#29318#0" />
<element signature="e#29388#29843#0" />
<element signature="e#29910#30364#0" />
<element signature="e#30440#30901#0" />
<element signature="e#30973#31429#0" />
<element signature="e#31496#31950#0" />
<element signature="e#32014#32467#0" />
<element signature="e#32543#33004#0" />
<element signature="e#33076#33532#0" />
<element signature="e#33599#34053#0" />
<element signature="e#34117#34570#0" />
<element signature="e#34648#35109#0" />
<element signature="e#35182#35638#0" />
<element signature="e#35706#36160#0" />
<element signature="e#36225#36678#0" />
<element signature="e#36755#37216#0" />
<element signature="e#37288#37744#0" />
<element signature="e#37811#38265#0" />
<element signature="e#38329#38782#0" />
<element signature="e#38855#39093#0" />
<element signature="e#39159#39396#0" />
<element signature="e#39485#39729#0" />
<element signature="e#39798#40036#0" />
<element signature="e#40106#40344#0" />
<element signature="e#40430#40673#0" />
<element signature="e#40751#40991#0" />
<element signature="e#41074#41316#0" />
<element signature="e#41389#41627#0" />
<element signature="e#41688#41924#0" />
<element signature="e#41987#42223#0" />
<element signature="e#42283#42519#0" />
<element signature="e#42587#42825#0" />
<element signature="e#42894#43132#0" />
<element signature="e#43200#43438#0" />
<element signature="e#43512#43750#0" />
<element signature="e#43821#44059#0" />
<element signature="e#44126#44363#0" />
<element signature="e#44433#44671#0" />
<element signature="e#44746#44985#0" />
<element signature="e#45069#45310#0" />
<element signature="e#45378#45616#0" />
<element signature="e#45684#45922#0" />
<element signature="e#45991#46229#0" />
<element signature="e#46297#46535#0" />
<element signature="e#46603#46841#0" />
<element signature="e#46910#47148#0" />
<element signature="e#47216#47454#0" />
<element signature="e#47526#47764#0" />
<element signature="e#47843#48083#0" />
<element signature="e#48144#48380#0" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="59" column="26" lean-forward="true" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="26" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

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

@ -1670,6 +1670,8 @@ $(function () {
closer.blur(); closer.blur();
return false; return false;
}; };
map.on("click", function (e) { map.on("click", function (e) {
map.forEachFeatureAtPixel(e.pixel, function (feature, layer) { map.forEachFeatureAtPixel(e.pixel, function (feature, layer) {
//do something //do something
@ -1682,14 +1684,24 @@ $(function () {
status = '在线' status = '在线'
} }
console.log(name) console.log(name)
if (name) { var fea = feature.values_.geometry.flatCoordinates
console.log(fea)
if (feature.values_.geometry.flatCoordinates.length == 4) {
content.innerHTML = '<code>' + '基站名称:' + name + '</code><br><code>' + '基站状态:' + status + '</code>'; content.innerHTML = '<code>' + '基站名称:' + name + '</code><br><code>' + '基站状态:' + status + '</code>';
overlay.setPosition(coordinate); overlay.setPosition(coordinate);
map.addOverlay(overlay); map.addOverlay(overlay);
} else { } else if (feature.values_.geometry.flatCoordinates.length == 5) {
console.log("******************************************************") var WI = feature.values_.geometry.flatCoordinates[3]
$.getJSON("/getJsonString/", {"WI": WI}, function (res) {
console.log(res)
content.innerHTML = '<code>' + '姓名:' + res.data + '</code><br><code>' + 'ID:' + feature.values_.geometry.flatCoordinates[2] + '</code><br><code>' + 'stat:' + feature.values_.geometry.flatCoordinates[4] + '</code>';
overlay.setPosition(coordinate);
map.addOverlay(overlay);
})
} }
}) })
}); });
@ -5669,8 +5681,7 @@ $(function () {
map.addLayer(jianzhuwu6) map.addLayer(jianzhuwu6)
map.addLayer(door6) map.addLayer(door6)
} } else if (value == '39') {
else if (value == '39') {
map.removeLayer(changquxingqudianweizhi); map.removeLayer(changquxingqudianweizhi);
map.removeLayer(changqushiwaijizhan); map.removeLayer(changqushiwaijizhan);
map.removeLayer(qidongguolufangMCCpeidianjianjizhan); map.removeLayer(qidongguolufangMCCpeidianjianjizhan);
@ -5880,19 +5891,20 @@ $(function () {
// console.log(array[i].ID) // console.log(array[i].ID)
var x = array[i].x; var x = array[i].x;
var y = array[i].y; var y = array[i].y;
var ID = array[i].ID;
var WI = array[i].WI;
var stat = array[i].stat;
lon = (x * Math.cos(38 * Math.PI / 180) + y * Math.sin(38 * Math.PI / 180)) / 91026.63 + 107.553186752; lon = (x * Math.cos(38 * Math.PI / 180) + y * Math.sin(38 * Math.PI / 180)) / 91026.63 + 107.553186752;
lat = (y * Math.cos(38 * Math.PI / 180) - x * Math.sin(38 * Math.PI / 180)) / 111000 + 34.9092271939; lat = (y * Math.cos(38 * Math.PI / 180) - x * Math.sin(38 * Math.PI / 180)) / 111000 + 34.9092271939;
// console.log(lon, lat); // console.log(lon, lat);
var lonlat = new Array(lon, lat); var lonlat = new Array(lon, lat, ID, WI, stat);
marker.push(lonlat); marker.push(lonlat);
//添加marker //添加marker
} }
addMarker(marker) addMarker(marker)
} }
// if (i== 'MID'){
// console.log('message: ' + e.data)
// }
if (socket.readyState == WebSocket.OPEN) socket.onopen(); if (socket.readyState == WebSocket.OPEN) socket.onopen();
window.s = socket; window.s = socket;
} }
@ -6350,6 +6362,7 @@ $(function () {
} }
}); });
$(".base-station-2").click(function () { $(".base-station-2").click(function () {
var flag = document.getElementsByClassName('base-station-2'); var flag = document.getElementsByClassName('base-station-2');
for (var i = 0; i < flag.length; i++) { for (var i = 0; i < flag.length; i++) {

4
dashboard/templates/dashboard/index.html
View File

@ -163,12 +163,12 @@
<h6 class="panel-title">坐标测量</h6> <h6 class="panel-title">坐标测量</h6>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p><input type="checkbox" name="item" class="base-people-1"><span <p><input type="checkbox" name="item" class="base-people-1" id="base-people"><span
class="glyphicon glyphicon-user" class="glyphicon glyphicon-user"
aria-hidden="true" aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label style="background-color: green;margin-left: 10px"></span><label
style="color: black">人员</label></p> style="color: black">人员</label></p>
<p><input type="checkbox" name="item" class="base-station-1"><span <p><input type="checkbox" name="item" class="base-station-1" id="base-station"><span
class="glyphicon glyphicon-tower" class="glyphicon glyphicon-tower"
aria-hidden="true" aria-hidden="true"
style="background-color: green;margin-left: 10px"></span><label style="background-color: green;margin-left: 10px"></span><label

1
dashboard/urls.py
View File

@ -6,4 +6,5 @@ urlpatterns = [
path('2/', views.index_2, name='index_2'), path('2/', views.index_2, name='index_2'),
path('points/search/by/keywords/', views.points_search_by_keywords, name='points-search-by-keywords'), path('points/search/by/keywords/', views.points_search_by_keywords, name='points-search-by-keywords'),
path('points/search/by/sn/', views.points_search_by_sn, name='points-search-by-sn'), path('points/search/by/sn/', views.points_search_by_sn, name='points-search-by-sn'),
path('getJsonString/',views.GetJsonString,name='GetJsonString')
] ]

32
dashboard/views.py
View File

@ -1,3 +1,5 @@
import json
from django.db.models import Q from django.db.models import Q
from django.http import HttpResponse from django.http import HttpResponse
from django.shortcuts import render from django.shortcuts import render
@ -31,5 +33,35 @@ def points_search_by_sn(request):
return render(request,'dashboard/index.html',{'points':points}) return render(request,'dashboard/index.html',{'points':points})
import binascii
def GetJsonString(request) -> str:
strn = request.GET.get('WI')
print(strn)
# strn = '32,39,31,33,5F20,4E09'
if len(strn) == 0:
return ""
arrStr = strn.split(',')
newba = bytearray(len(arrStr) * 2)
nIndex = 0
for i in range(len(arrStr)):
# 16进制转整数
s = int(arrStr[i], 16)
n = int(s)
newba[nIndex] = int(n % 256)
newba[nIndex + 1] = int(n / 256)
nIndex += 2
# print(" --", i, " ", n, " ", n % 256, " ", int(n / 256))
# print("=========%s | %s | %s" % (strn, newba, newba.decode("utf-16")))
print(newba.decode("utf-16"))
return HttpResponse(json.dumps({
"status":"1",
"data":newba.decode("utf-16")
}))
#
# GetJsonString("32,39,31,33")
# GetJsonString("5F20,4E09")

20
linbei/settings.py
View File

@ -83,16 +83,16 @@ WSGI_APPLICATION = 'linbei.wsgi.application'
# Database # Database
# https://docs.djangoproject.com/en/2.1/ref/settings/#databases # https://docs.djangoproject.com/en/2.1/ref/settings/#databases
DATABASES = { # DATABASES = {
'default': { # 'default': {
'ENGINE': 'django.contrib.gis.db.backends.postgis', # 'ENGINE': 'django.contrib.gis.db.backends.postgis',
'NAME': 'linbei', # 'NAME': 'linbei',
'USER': 'linbei', # 'USER': 'linbei',
'PASSWORD': 'g214G214', # 'PASSWORD': 'g214G214',
'HOST': '210.77.68.250', # 'HOST': '210.77.68.250',
'PORT': '5432', # 'PORT': '5432',
} # }
} # }
# Password validation # Password validation
# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators