This commit is contained in:
Bob 2019-11-15 09:15:31 +08:00
parent 17472098c0
commit 18a27ae5cf
3 changed files with 125 additions and 89 deletions

View File

@ -3,6 +3,8 @@
<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 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/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/dashboard/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/import_points.py" beforeDir="false" afterPath="$PROJECT_DIR$/import_points.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" />
@ -66,26 +68,67 @@
</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="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="733"> <state relative-caret-position="858">
<caret line="139" lean-forward="true" selection-start-line="139" selection-end-line="139" /> <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
<folding> <folding>
<element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#1;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<marker date="1573638855202" expanded="true" signature="1087:1113" ph="..." /> <marker date="1573698249266" expanded="true" signature="1087:1113" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="24" column="26" lean-forward="true" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/26d98690-c6ef-4479-9128-3a8b28bfc2b3/console.sql">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="47" selection-start-column="47" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<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="580"> <state relative-caret-position="506">
<caret line="27" column="28" lean-forward="true" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" /> <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#30#0" expanded="true" /> <element signature="e#0#30#0" expanded="true" />
</folding> </folding>
@ -96,8 +139,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="220"> <state relative-caret-position="198">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" /> <caret line="10" selection-start-line="10" selection-end-line="10" />
<folding> <folding>
<element signature="e#0#19#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
@ -120,14 +163,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="1606">
<caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" /> <caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" />
<folding>
<element signature="e#753#792#0#HTML" expanded="true" />
<element signature="e#1633#1674#0#HTML" expanded="true" />
<element signature="e#2419#2460#0#HTML" expanded="true" />
<element signature="e#1792#1826#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -178,14 +215,15 @@
<option value="$PROJECT_DIR$/dashboard/static/dashboard/css/style.css" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/css/style.css" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet.ChineseTmsProviders.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/leaflet.ChineseTmsProviders.js" />
<option value="$PROJECT_DIR$/linbei/settings.py" /> <option value="$PROJECT_DIR$/linbei/settings.py" />
<option value="$PROJECT_DIR$/import_points.py" />
<option value="$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css" />
<option value="$PROJECT_DIR$/dashboard/models.py" />
<option value="$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html" /> <option value="$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html" />
<option value="$PROJECT_DIR$/dashboard/views.py" /> <option value="$PROJECT_DIR$/dashboard/views.py" />
<option value="$PROJECT_DIR$/dashboard/urls.py" /> <option value="$PROJECT_DIR$/dashboard/urls.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$/dashboard/static/dashboard/js/index_1.js" /> <option value="$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/26d98690-c6ef-4479-9128-3a8b28bfc2b3/console.sql" />
<option value="$PROJECT_DIR$/import_points.py" />
<option value="$PROJECT_DIR$/dashboard/models.py" />
</list> </list>
</option> </option>
</component> </component>
@ -328,7 +366,7 @@
<property name="DefaultHtmlFileTemplate" value="HTML File" /> <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="true" /> <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$" /> <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" />
@ -444,6 +482,8 @@
<workItem from="1573433843998" duration="1289000" /> <workItem from="1573433843998" duration="1289000" />
<workItem from="1573520211053" duration="848000" /> <workItem from="1573520211053" duration="848000" />
<workItem from="1573607045845" duration="22410000" /> <workItem from="1573607045845" duration="22410000" />
<workItem from="1573698166914" duration="681000" />
<workItem from="1573779837448" duration="621000" />
</task> </task>
<task id="LOCAL-00001" summary="#creat"> <task id="LOCAL-00001" summary="#creat">
<created>1567674653918</created> <created>1567674653918</created>
@ -585,20 +625,25 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1573638900089</updated> <updated>1573638900089</updated>
</task> </task>
<option name="localTasksCounter" value="21" /> <task id="LOCAL-00021" summary="#index">
<created>1573698257115</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1573698257115</updated>
</task>
<option name="localTasksCounter" value="22" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64847000" /> <option name="totallyTimeSpent" value="66149000" />
</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" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31576145" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.3221512" />
<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="Database Console" weight="0.32937366" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32937366" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32937366" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32937366" /> <window_info anchor="bottom" id="Run" order="2" weight="0.32937366" />
@ -610,13 +655,14 @@
<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" weight="0.18034557" /> <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.18034557" />
<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="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" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="SciView" order="3" /> <window_info anchor="right" id="SciView" order="3" />
<window_info anchor="right" id="Database" order="4" weight="0.21884984" /> <window_info anchor="right" id="Database" order="4" visible="true" weight="0.21884984" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -629,7 +675,7 @@
<option name="LAST_COMMIT_MESSAGE" value="#index" /> <option name="LAST_COMMIT_MESSAGE" value="#index" />
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/linbei$import_points.coverage" NAME="import_points Coverage Results" MODIFIED="1573628885258" 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/static/dashboard/css/legend.css"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/css/legend.css">
@ -725,16 +771,8 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/dashboard.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/dashboard.js" />
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/map-height.js" />
<state relative-caret-position="44">
<caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/map-height.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://D:/2019/linbei/drawer-master/dist/js/drawer.min.js"> <entry file="file://D:/2019/linbei/drawer-master/dist/js/drawer.min.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
@ -789,16 +827,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/26d98690-c6ef-4479-9128-3a8b28bfc2b3/console.sql">
<provider selected="true" editor-type-id="text-editor" />
</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="110"> <state relative-caret-position="110">
@ -826,44 +854,22 @@
</state> </state>
</provider> </provider>
</entry> </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/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="580"> <state relative-caret-position="506">
<caret line="27" column="28" lean-forward="true" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" /> <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#30#0" expanded="true" /> <element signature="e#0#30#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="das://26d98690-c6ef-4479-9128-3a8b28bfc2b3/database/linbei/schema/public/table/dashboard_points"> <entry file="file://$PROJECT_DIR$/dashboard/urls.py">
<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/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="198">
<caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" /> <caret line="10" selection-start-line="10" selection-end-line="10" />
<folding> <folding>
<element signature="e#0#11#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -880,29 +886,59 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html"> <entry file="file://$PROJECT_DIR$/dashboard/templates/dashboard/index_1.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="1606">
<caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" /> <caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" />
<folding> </state>
<element signature="e#753#792#0#HTML" expanded="true" /> </provider>
<element signature="e#1633#1674#0#HTML" expanded="true" /> </entry>
<element signature="e#2419#2460#0#HTML" expanded="true" /> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/css/dashboard.css">
<element signature="e#1792#1826#0#HTML" expanded="true" /> <provider selected="true" editor-type-id="text-editor" />
</folding> </entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/26d98690-c6ef-4479-9128-3a8b28bfc2b3/console.sql">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="47" selection-start-column="47" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js"> <entry file="file://$PROJECT_DIR$/dashboard/static/dashboard/js/index_1.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="733"> <state relative-caret-position="858">
<caret line="139" lean-forward="true" selection-start-line="139" selection-end-line="139" /> <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
<folding> <folding>
<element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#1;n#!!top" expanded="true" /> <element signature="n#style#0;n#button#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<marker date="1573638855202" expanded="true" signature="1087:1113" ph="..." /> <marker date="1573698249266" expanded="true" signature="1087:1113" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/import_points.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="24" column="26" lean-forward="true" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</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>
</component> </component>
</project> </project>

View File

@ -7,10 +7,10 @@ from django.db import models
class Points(models.Model): class Points(models.Model):
id = models.UUIDField('id', primary_key=True, default=uuid.uuid4) id = models.UUIDField('id', primary_key=True, default=uuid.uuid4)
sn = models.CharField('id', max_length=256, blank=True, null=True) sn = models.CharField('id', max_length=256, blank=True, null=True)
point_lon = models.FloatField(null=True, blank=True) point_lon = models.CharField(max_length=256,null=True, blank=True)
point_lat = models.FloatField(null=True, blank=True) point_lat = models.CharField(max_length=256,null=True, blank=True)
x = models.FloatField(null=True, blank=True) x = models.CharField(max_length=256,null=True, blank=True)
y = models.FloatField(null=True, blank=True) y = models.CharField(max_length=256,null=True, blank=True)
created = models.DateTimeField('创建时间', auto_now_add=True) created = models.DateTimeField('创建时间', auto_now_add=True)
updated = models.DateTimeField('更新时间', auto_now=True) updated = models.DateTimeField('更新时间', auto_now=True)
deleted = models.BooleanField(default=False) deleted = models.BooleanField(default=False)

View File

@ -23,7 +23,7 @@ def insert_specimen(sn,point_lon,point_lat,x,y):
if __name__ == '__main__': if __name__ == '__main__':
with open('D:/2019/linbei/BaseStation_P_C.csv', encoding='utf-8') as csvfile: with open('D:/2019/linbei/BaseStation_C_ALL.csv', encoding='utf-8') as csvfile:
reader = csv.reader(csvfile) reader = csv.reader(csvfile)
i = [] i = []
for r in reader: for r in reader: