Skip to content

J
Jz-Php
提交 90241e29 authored 作者: chengye's avatar chengye
浏览文件
操作

修复地图显示bug

上级 b7221ed4
显示空白字符变更
内嵌 并排
正在显示 包含 90 行增加 和 179 行删除
.idea/workspace.xml
浏览文件 @ 90241e29
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment=""> <list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" 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$/application/em/model/EmInvoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/model/EmInvoice.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/application/admin/controller/Basestation.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Basestation.php" 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" />
...@@ -25,11 +25,29 @@ ...@@ -25,11 +25,29 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-46"> <state relative-caret-position="233">
<caret line="42" column="36" selection-start-line="42" selection-start-column="36" selection-end-line="42" selection-end-column="36" /> <caret line="72" column="33" lean-forward="true" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Base.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Basestation.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="735" column="42" lean-forward="true" selection-start-line="735" selection-start-column="42" selection-end-line="735" selection-end-column="42" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -65,6 +83,7 @@ ...@@ -65,6 +83,7 @@
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/application/em/controller/Invoice.php" /> <option value="$PROJECT_DIR$/application/em/controller/Invoice.php" />
<option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" /> <option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Basestation.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -80,17 +99,16 @@ ...@@ -80,17 +99,16 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2227" /> <option name="x" value="1848" />
<option name="y" value="188" /> <option name="y" value="98" />
<option name="width" value="1026" /> <option name="width" value="1364" />
<option name="height" value="546" /> <option name="height" value="735" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="Scope" currentSubView="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope" proportions="" version="1"> <navigator currentView="Scope" currentSubView="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope" proportions="" version="1">
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="ProjectPane" />
<pane id="Scope"> <pane id="Scope">
<subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope"> <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
<expand> <expand>
...@@ -103,6 +121,19 @@ ...@@ -103,6 +121,19 @@
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" /> <item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" /> <item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path> </path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="admin" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="admin" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="controller" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path> <path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" /> <item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" /> <item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
...@@ -125,6 +156,7 @@ ...@@ -125,6 +156,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="ProjectPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -162,18 +194,19 @@ ...@@ -162,18 +194,19 @@
<workItem from="1578907167448" duration="144000" /> <workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="9405000" /> <workItem from="1578972376079" duration="9405000" />
<workItem from="1579059424177" duration="1050000" /> <workItem from="1579059424177" duration="1050000" />
<workItem from="1579079847870" duration="51000" /> <workItem from="1579079847870" duration="1330000" />
<workItem from="1579164336952" duration="60000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16453000" /> <option name="totallyTimeSpent" value="17792000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" /> <frame x="1358" y="-125" 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.1544196" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15601704" />
<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" />
...@@ -226,159 +259,7 @@ ...@@ -226,159 +259,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/Desktop/flow(1).php"> <entry file="file://$USER_HOME$/Desktop/flow(1).php" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="740" column="11" lean-forward="true" selection-start-line="740" selection-start-column="11" selection-end-line="740" selection-end-column="11" />
<folding>
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#514#520#0" expanded="true" />
<element signature="e#520#526#0" expanded="true" />
<element signature="e#526#532#0" expanded="true" />
<element signature="e#532#538#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#600#606#0" expanded="true" />
<element signature="e#606#612#0" expanded="true" />
<element signature="e#612#618#0" expanded="true" />
<element signature="e#618#624#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#680#686#0" expanded="true" />
<element signature="e#686#692#0" expanded="true" />
<element signature="e#692#698#0" expanded="true" />
<element signature="e#698#704#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#760#766#0" expanded="true" />
<element signature="e#767#773#0" expanded="true" />
<element signature="n#style#0;n#a#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#3;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#891#897#0" expanded="true" />
<element signature="e#897#903#0" expanded="true" />
<element signature="e#903#909#0" expanded="true" />
<element signature="e#909#915#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#977#983#0" expanded="true" />
<element signature="e#983#989#0" expanded="true" />
<element signature="e#989#995#0" expanded="true" />
<element signature="e#995#1001#0" expanded="true" />
<element signature="n#style#0;n#a#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#1127#1133#0" expanded="true" />
<element signature="e#1133#1139#0" expanded="true" />
<element signature="e#1139#1145#0" expanded="true" />
<element signature="e#1145#1151#0" expanded="true" />
<element signature="n#style#0;n#span#2;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#3;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#4;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#514#520#0" expanded="true" />
<element signature="e#520#526#0" expanded="true" />
<element signature="e#526#532#0" expanded="true" />
<element signature="e#532#538#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#652#658#0" expanded="true" />
<element signature="e#658#664#0" expanded="true" />
<element signature="e#664#670#0" expanded="true" />
<element signature="e#670#676#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#734#740#0" expanded="true" />
<element signature="e#740#746#0" expanded="true" />
<element signature="e#746#752#0" expanded="true" />
<element signature="e#752#758#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#814#820#0" expanded="true" />
<element signature="e#821#827#0" expanded="true" />
<element signature="e#854#860#0" expanded="true" />
<element signature="e#861#867#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#922#928#0" expanded="true" />
<element signature="e#928#934#0" expanded="true" />
<element signature="e#934#940#0" expanded="true" />
<element signature="e#940#946#0" expanded="true" />
<element signature="n#style#0;n#span#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#1003#1009#0" expanded="true" />
<element signature="e#1009#1015#0" expanded="true" />
<element signature="e#1015#1021#0" expanded="true" />
<element signature="e#1021#1027#0" expanded="true" />
<element signature="n#style#0;n#span#2;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#3;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#4;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#514#520#0" expanded="true" />
<element signature="e#520#526#0" expanded="true" />
<element signature="e#526#532#0" expanded="true" />
<element signature="e#532#538#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#599#605#0" expanded="true" />
<element signature="e#605#611#0" expanded="true" />
<element signature="e#611#617#0" expanded="true" />
<element signature="e#617#623#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#681#687#0" expanded="true" />
<element signature="e#687#693#0" expanded="true" />
<element signature="e#693#699#0" expanded="true" />
<element signature="e#699#705#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#761#767#0" expanded="true" />
<element signature="e#768#774#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#3;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#831#837#0" expanded="true" />
<element signature="e#838#844#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#906#912#0" expanded="true" />
<element signature="e#912#918#0" expanded="true" />
<element signature="e#918#924#0" expanded="true" />
<element signature="e#924#930#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#987#993#0" expanded="true" />
<element signature="e#993#999#0" expanded="true" />
<element signature="e#999#1005#0" expanded="true" />
<element signature="e#1005#1011#0" expanded="true" />
<element signature="n#style#0;n#span#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#2;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#3;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common.php"> <entry file="file://$PROJECT_DIR$/application/common.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310"> <state relative-caret-position="310">
...@@ -447,8 +328,22 @@ ...@@ -447,8 +328,22 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-46"> <state relative-caret-position="233">
<caret line="42" column="36" selection-start-line="42" selection-start-column="36" selection-end-line="42" selection-end-column="36" /> <caret line="72" column="33" lean-forward="true" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Base.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Basestation.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="735" column="42" lean-forward="true" selection-start-line="735" selection-start-column="42" selection-end-line="735" selection-end-column="42" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/admin/controller/Basestation.php
浏览文件 @ 90241e29
...@@ -482,22 +482,38 @@ class Basestation extends Base ...@@ -482,22 +482,38 @@ class Basestation extends Base
} }
} }
public function basestation_map(Request $request){ public function basestation_map(Request $request){
$id= $request->get('id'); $id= $request->get('station_name');
$this->assign('data',$id); $db = Db::connect([
'type' => 'mysql',
'hostname' => '127.0.0.1',
'database' => 'jzdb',
'username' => 'root',
'password' => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX',
'hostport' => '10036',
'charset' => 'utf8',
]);
$data=$db->table('jz_message')->field('business_id')->where(['jz_name'=>$id])->find();
$this->assign('data',$data['business_id']);
return $this->fetch('base_map'); return $this->fetch('base_map');
} }
public function basestation_region(Request $request){ public function basestation_region(Request $request){
$db = Db::connect([
$data['station_id'] = $request->get('station_id'); 'type' => 'mysql',
if(empty($data['station_id'])){ 'hostname' => '127.0.0.1',
return json_encode(['code'=>500,'message'=>'ID不能为空']); 'database' => 'jzdb',
'username' => 'root',
'password' => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX',
'hostport' => '10036',
'charset' => 'utf8',
]);
$data['business_id']= $request->get('station_id');
if(empty($data['business_id'])){
return json_encode(['code'=>5001,'message'=>'ID不能为空']);
} }
$url=config('database.geturl')."v1/getbaseMap"; $data=$db->table('jz_message')->field('jz_name,project_code,jz_code,jz_longitude,jz_latitude')->where(['business_id'=>$data['business_id']])->find();
$deresult=json_decode(httpPOST($url,$data),true);
return json($deresult['data']); return json($data);
} }
...@@ -566,7 +582,7 @@ class Basestation extends Base ...@@ -566,7 +582,7 @@ class Basestation extends Base
return $this->fetch('base_region'); return $this->fetch('base_region');
} }
public function base_regiondata(Request $request){ public function base_regiondata(Request $request){
$map =[]; $map =[];
$user = session('user'); $user = session('user');
$admi[]=['name','=',$user['name']]; $admi[]=['name','=',$user['name']];
...@@ -628,7 +644,7 @@ public function base_regiondata(Request $request){ ...@@ -628,7 +644,7 @@ public function base_regiondata(Request $request){
$geturl=$url.'?'.$reqstr; $geturl=$url.'?'.$reqstr;
$result=json_decode(curlGet($geturl),true); $result=json_decode(curlGet($geturl),true);
return json($result['data']); return json($result['data']);
} }
//数据导入 //数据导入
public function base_import(Request $request){ public function base_import(Request $request){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论