Skip to content

lzzzzl / spiderboard

Go to a project
Commit ee1d5b74 by lzzzzl
Options

体验更改

parent c34a5b04
Inline Side-by-side
Showing with 171 additions and 247 deletions
.idea/workspace.xml
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="77000b58-e61d-499b-a063-4fbd5e5111a8" name="Default" comment=""> <list default="true" id="77000b58-e61d-499b-a063-4fbd5e5111a8" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" />
<change beforePath="$PROJECT_DIR$/app/Model/SpiderModel.php" afterPath="$PROJECT_DIR$/app/Model/SpiderModel.php" /> <change beforePath="$PROJECT_DIR$/app/Model/SpiderModel.php" afterPath="$PROJECT_DIR$/app/Model/SpiderModel.php" />
<change beforePath="$PROJECT_DIR$/config/perm.php" afterPath="$PROJECT_DIR$/config/perm.php" />
<change beforePath="$PROJECT_DIR$/public/js/spider/board.js" afterPath="$PROJECT_DIR$/public/js/spider/board.js" /> <change beforePath="$PROJECT_DIR$/public/js/spider/board.js" afterPath="$PROJECT_DIR$/public/js/spider/board.js" />
<change beforePath="$PROJECT_DIR$/public/js/spider/boardconfig.js" afterPath="$PROJECT_DIR$/public/js/spider/boardconfig.js" />
<change beforePath="$PROJECT_DIR$/resources/views/spider/board.blade.php" afterPath="$PROJECT_DIR$/resources/views/spider/board.blade.php" /> <change beforePath="$PROJECT_DIR$/resources/views/spider/board.blade.php" afterPath="$PROJECT_DIR$/resources/views/spider/board.blade.php" />
<change beforePath="$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php" afterPath="$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -20,102 +22,50 @@ ...@@ -20,102 +22,50 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
<file leaf-file-name="board.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="boardconfig.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="19" column="67" lean-forward="false" selection-start-line="19" selection-start-column="67" selection-end-line="19" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="website.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".env" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="540">
<caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
<folding /> <folding>
<marker date="1564563710804" expanded="true" signature="135:146" ph="..." />
<marker date="1564563710804" expanded="true" signature="406:431" ph="..." />
<marker date="1564563710804" expanded="true" signature="743:771" ph="..." />
<marker date="1564563710804" expanded="true" signature="1046:1068" ph="..." />
<marker date="1564563710804" expanded="true" signature="1353:1379" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="view.php" pinned="false" current-in-tab="false"> <file leaf-file-name="boardconfig.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/view.php"> <entry file="file://$PROJECT_DIR$/public/js/spider/boardconfig.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="441">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="services.php" pinned="false" current-in-tab="false"> <file leaf-file-name="board.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/services.php"> <entry file="file://$PROJECT_DIR$/public/js/spider/board.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="330">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="session.php" pinned="false" current-in-tab="false"> <file leaf-file-name="board.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/session.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2178">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="queue.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/queue.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1770">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="platform.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/platform.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="perm.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/perm.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="database.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6654"> <state relative-caret-position="573">
<caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" /> <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding /> <folding>
<marker date="1564563365556" expanded="true" signature="538:557" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -131,7 +81,6 @@ ...@@ -131,7 +81,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>skuexposelxly</find>
<find>ApiSkuExposeLx</find> <find>ApiSkuExposeLx</find>
<find>erp</find> <find>erp</find>
<find>comparepri</find> <find>comparepri</find>
...@@ -161,6 +110,7 @@ ...@@ -161,6 +110,7 @@
<find>updateContent</find> <find>updateContent</find>
<find>on_of</find> <find>on_of</find>
<find>on_off</find> <find>on_off</find>
<find>ApiSpiderList</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -204,8 +154,6 @@ ...@@ -204,8 +154,6 @@
<option value="$PROJECT_DIR$/resources/views/spiderwindow.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spiderwindow.blade.php" />
<option value="$PROJECT_DIR$/resources/views/spider/addboard.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spider/addboard.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/addboard.js" /> <option value="$PROJECT_DIR$/public/js/spider/addboard.js" />
<option value="$PROJECT_DIR$/public/js/spider/boardconfig.js" />
<option value="$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php" />
<option value="$PROJECT_DIR$/resources/views/spider_card.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spider_card.blade.php" />
<option value="$PROJECT_DIR$/resources/views/spider/modifyserver.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spider/modifyserver.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/modifyserver.js" /> <option value="$PROJECT_DIR$/public/js/spider/modifyserver.js" />
...@@ -215,11 +163,13 @@ ...@@ -215,11 +163,13 @@
<option value="$PROJECT_DIR$/public/js/spider/nodeinfo.js" /> <option value="$PROJECT_DIR$/public/js/spider/nodeinfo.js" />
<option value="$PROJECT_DIR$/resources/views/spider/quickmodify.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spider/quickmodify.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/quickmodify.js" /> <option value="$PROJECT_DIR$/public/js/spider/quickmodify.js" />
<option value="$PROJECT_DIR$/app/Model/SpiderModel.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" />
<option value="$PROJECT_DIR$/public/js/spider/board.js" />
<option value="$PROJECT_DIR$/config/perm.php" /> <option value="$PROJECT_DIR$/config/perm.php" />
<option value="$PROJECT_DIR$/resources/views/spider/board.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spider/board.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" />
<option value="$PROJECT_DIR$/app/Model/SpiderModel.php" />
<option value="$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/boardconfig.js" />
<option value="$PROJECT_DIR$/public/js/spider/board.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -330,6 +280,7 @@ ...@@ -330,6 +280,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -364,11 +315,6 @@ ...@@ -364,11 +315,6 @@
<path> <path>
<item name="spider" type="b2602c69:ProjectViewProjectNode" /> <item name="spider" type="b2602c69:ProjectViewProjectNode" />
<item name="spider" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="spider" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="spider" type="b2602c69:ProjectViewProjectNode" />
<item name="spider" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
...@@ -406,7 +352,6 @@ ...@@ -406,7 +352,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
</panes> </panes>
</component> </component>
...@@ -643,12 +588,14 @@ ...@@ -643,12 +588,14 @@
<workItem from="1563934643395" duration="17355000" /> <workItem from="1563934643395" duration="17355000" />
<workItem from="1564043147884" duration="24532000" /> <workItem from="1564043147884" duration="24532000" />
<workItem from="1564364942671" duration="12957000" /> <workItem from="1564364942671" duration="12957000" />
<workItem from="1564390285638" duration="3177000" /> <workItem from="1564390285638" duration="4294000" />
<workItem from="1564449397474" duration="3015000" />
<workItem from="1564561312310" duration="3138000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1832927000" /> <option name="totallyTimeSpent" value="1840197000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-11" y="-11" width="2278" height="1466" extended-state="6" /> <frame x="-11" y="-11" width="2278" height="1466" extended-state="6" />
...@@ -778,13 +725,6 @@ ...@@ -778,13 +725,6 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/SpiderManageModel.php" /> <entry file="file://$PROJECT_DIR$/app/Model/SpiderManageModel.php" />
<entry file="file://$PROJECT_DIR$/resources/views/spider.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1188">
<caret line="36" column="10" lean-forward="false" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/addboard.js"> <entry file="file://$PROJECT_DIR$/public/js/spider/addboard.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792"> <state relative-caret-position="792">
...@@ -796,7 +736,6 @@ ...@@ -796,7 +736,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="395"> <state relative-caret-position="395">
<caret line="98" column="33" lean-forward="false" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="33" /> <caret line="98" column="33" lean-forward="false" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="33" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -820,9 +759,6 @@ ...@@ -820,9 +759,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3771"> <state relative-caret-position="-3771">
<caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> <caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<folding>
<marker date="1557450944559" expanded="true" signature="3146:3268" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -831,7 +767,6 @@ ...@@ -831,7 +767,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="738"> <state relative-caret-position="738">
<caret line="222" column="23" lean-forward="false" selection-start-line="222" selection-start-column="9" selection-end-line="222" selection-end-column="23" /> <caret line="222" column="23" lean-forward="false" selection-start-line="222" selection-start-column="9" selection-end-line="222" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -840,29 +775,6 @@ ...@@ -840,29 +775,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33"> <state relative-caret-position="33">
<caret line="1" column="62" lean-forward="false" selection-start-line="1" selection-start-column="62" selection-end-line="1" selection-end-column="62" /> <caret line="1" column="62" lean-forward="false" selection-start-line="1" selection-start-column="62" selection-end-line="1" selection-end-column="62" />
<folding>
<marker date="1564380336831" expanded="true" signature="278:293" ph="..." />
<marker date="1564380336831" expanded="true" signature="320:333" ph="..." />
<marker date="1564380336831" expanded="true" signature="496:509" ph="..." />
<marker date="1564380336831" expanded="true" signature="496:511" ph="..." />
<marker date="1564380336831" expanded="true" signature="631:639" ph="..." />
<marker date="1564380336831" expanded="true" signature="696:706" ph="..." />
<marker date="1564380336831" expanded="true" signature="764:777" ph="..." />
<marker date="1564380336831" expanded="true" signature="836:853" ph="..." />
<marker date="1564380336831" expanded="true" signature="1236:1260" ph="..." />
<marker date="1564380336831" expanded="true" signature="1284:1307" ph="..." />
<marker date="1564380336831" expanded="true" signature="1284:1308" ph="..." />
<marker date="1564380336831" expanded="true" signature="1333:1357" ph="..." />
<marker date="1564380336831" expanded="true" signature="1382:1405" ph="..." />
<marker date="1564380336831" expanded="true" signature="1382:1406" ph="..." />
<marker date="1564380336831" expanded="true" signature="1513:1537" ph="..." />
<marker date="1564380336831" expanded="true" signature="2118:2143" ph="..." />
<marker date="1564380336831" expanded="true" signature="2167:2192" ph="..." />
<marker date="1564380336831" expanded="true" signature="2217:2242" ph="..." />
<marker date="1564380336831" expanded="true" signature="2267:2292" ph="..." />
<marker date="1564380336831" expanded="true" signature="2403:2428" ph="..." />
<marker date="1564380336831" expanded="true" signature="3011:3019" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -870,25 +782,6 @@ ...@@ -870,25 +782,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1122"> <state relative-caret-position="1122">
<caret line="34" column="24" lean-forward="false" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" /> <caret line="34" column="24" lean-forward="false" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/modifyserver.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="36" selection-end-column="6" />
<folding>
<marker date="1564370483666" expanded="true" signature="38:43" ph="..." />
<marker date="1564370483666" expanded="true" signature="350:379" ph="..." />
<marker date="1564370483666" expanded="true" signature="448:477" ph="..." />
<marker date="1564370483666" expanded="true" signature="546:575" ph="..." />
<marker date="1564370483666" expanded="true" signature="644:673" ph="..." />
<marker date="1564370483666" expanded="true" signature="1029:1059" ph="..." />
<marker date="1564370483666" expanded="true" signature="1128:1158" ph="..." />
<marker date="1564370483666" expanded="true" signature="1227:1257" ph="..." />
<marker date="1564370483666" expanded="true" signature="1326:1356" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -896,7 +789,6 @@ ...@@ -896,7 +789,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1254"> <state relative-caret-position="1254">
<caret line="38" column="14" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="46" selection-end-column="3" /> <caret line="38" column="14" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="46" selection-end-column="3" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -904,7 +796,6 @@ ...@@ -904,7 +796,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="726"> <state relative-caret-position="726">
<caret line="22" column="97" lean-forward="false" selection-start-line="22" selection-start-column="97" selection-end-line="22" selection-end-column="97" /> <caret line="22" column="97" lean-forward="false" selection-start-line="22" selection-start-column="97" selection-end-line="22" selection-end-column="97" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -912,150 +803,157 @@ ...@@ -912,150 +803,157 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="606"> <state relative-caret-position="606">
<caret line="33" column="23" lean-forward="false" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" /> <caret line="33" column="23" lean-forward="false" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.php"> <entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="903"> <state relative-caret-position="-6654">
<caret line="344" column="0" lean-forward="false" selection-start-line="344" selection-start-column="0" selection-end-line="344" selection-end-column="0" /> <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/SpiderModel.php"> <entry file="file://$PROJECT_DIR$/config/view.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427"> <state relative-caret-position="0">
<caret line="51" column="16" lean-forward="false" selection-start-line="51" selection-start-column="16" selection-end-line="51" selection-end-column="16" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php"> <entry file="file://$PROJECT_DIR$/config/perm.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750"> <state relative-caret-position="528">
<caret line="120" column="37" lean-forward="false" selection-start-line="120" selection-start-column="21" selection-end-line="120" selection-end-column="37" /> <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/addboard.blade.php"> <entry file="file://$PROJECT_DIR$/config/platform.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-372"> <state relative-caret-position="0">
<caret line="9" column="77" lean-forward="false" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="77" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php"> <entry file="file://$PROJECT_DIR$/config/queue.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-297"> <state relative-caret-position="-1770">
<caret line="2" column="39" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<marker date="1563953719399" expanded="true" signature="135:146" ph="..." />
<marker date="1563953719399" expanded="true" signature="406:431" ph="..." />
<marker date="1563953719399" expanded="true" signature="721:747" ph="..." />
<marker date="1563953719399" expanded="true" signature="1037:1065" ph="..." />
<marker date="1563953719399" expanded="true" signature="1340:1362" ph="..." />
<marker date="1563953719399" expanded="true" signature="1726:1753" ph="..." />
<marker date="1563953719399" expanded="true" signature="2021:2047" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/boardconfig.js"> <entry file="file://$PROJECT_DIR$/config/services.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243"> <state relative-caret-position="0">
<caret line="18" column="29" lean-forward="false" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="29" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/board.js"> <entry file="file://$PROJECT_DIR$/config/session.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="571"> <state relative-caret-position="-2178">
<caret line="51" column="33" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="33" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php"> <entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627"> <state relative-caret-position="561">
<caret line="19" column="67" lean-forward="false" selection-start-line="19" selection-start-column="67" selection-end-line="19" selection-end-column="67" /> <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/database.php"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6654"> <state relative-caret-position="396">
<caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" /> <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/view.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="1167">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="36" column="10" lean-forward="false" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/perm.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528"> <state relative-caret-position="1639">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" /> <caret line="344" column="0" lean-forward="false" selection-start-line="344" selection-start-column="0" selection-end-line="344" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/platform.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="593">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="63" column="70" lean-forward="false" selection-start-line="63" selection-start-column="70" selection-end-line="63" selection-end-column="70" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/queue.php"> <entry file="file://$PROJECT_DIR$/app/Model/SpiderModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1770"> <state relative-caret-position="790">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="29" column="45" lean-forward="false" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/services.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/addboard.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="-42">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="19" column="10" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="19" selection-end-column="10" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/session.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/modifyserver.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2178"> <state relative-caret-position="264">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="8" column="52" lean-forward="false" selection-start-line="8" selection-start-column="52" selection-end-line="8" selection-end-column="52" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/website.php"> <entry file="file://$PROJECT_DIR$/public/js/spider/boardconfig.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="441">
<caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="540">
<caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
<folding>
<marker date="1564563710804" expanded="true" signature="135:146" ph="..." />
<marker date="1564563710804" expanded="true" signature="406:431" ph="..." />
<marker date="1564563710804" expanded="true" signature="743:771" ph="..." />
<marker date="1564563710804" expanded="true" signature="1046:1068" ph="..." />
<marker date="1564563710804" expanded="true" signature="1353:1379" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<marker date="1564563365556" expanded="true" signature="538:557" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/board.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
app/Http/Controllers/AccessApiController.php
...@@ -59,8 +59,9 @@ class AccessApiController extends Controller ...@@ -59,8 +59,9 @@ class AccessApiController extends Controller
$limit = $request['limit']; $limit = $request['limit'];
$p = $request['p']; $p = $request['p'];
$task_code = !empty($request['task_code']) ? $request['task_code'] : '';
$data = (new SpiderModel())->spiderList($limit, $p); $data = (new SpiderModel())->spiderList($limit, $p, $task_code);
$this->ExportLayui(0,'成功',$data['data'],$data['total']); $this->ExportLayui(0,'成功',$data['data'],$data['total']);
} }
......
app/Model/SpiderModel.php
...@@ -20,12 +20,16 @@ class SpiderModel extends Model ...@@ -20,12 +20,16 @@ class SpiderModel extends Model
* @param $p * @param $p
* @return mixed * @return mixed
*/ */
public function spiderList($limit, $p) { public function spiderList($limit, $p, $task_code) {
$limit = !empty($limit) ? $limit : ''; $limit = !empty($limit) ? $limit : '';
$p = !empty($p) ? $p : 1; $p = !empty($p) ? $p : 1;
$data = $this->where('status','!=',2)->paginate($limit,['*'],'p',$p)->toArray(); $map = [];
if (!empty($task_code))
$map[] = ['task_code', '=', $task_code];
$data = $this->where('status','!=',2)->where($map)->paginate($limit,['*'],'p',$p)->toArray();
foreach ($data['data'] as $k => $v) { foreach ($data['data'] as $k => $v) {
$data['data'][$k]['status_name'] = platform_status($v['status']); $data['data'][$k]['status_name'] = platform_status($v['status']);
......
public/js/spider/board.js
...@@ -6,28 +6,50 @@ layui.use(['table', 'form', 'laydate', 'layer'], function () { ...@@ -6,28 +6,50 @@ layui.use(['table', 'form', 'laydate', 'layer'], function () {
table.render({ table.render({
elem:'#table', elem:'#table',
loading:true, loading:true,
cellMinWidth: 150, cellMinWidth: 100,
page:true, page:true,
limit: 50,
url: '/api/ApiSpiderList/', url: '/api/ApiSpiderList/',
request:{pageName:'p', limitName:'limit'}, request:{pageName:'p', limitName:'limit'},
cols: [[ cols: [[
{field:'status', title:'状态', width:85, templet: '#switchTpl', unresize: true}, {field:'status', title:'状态', width:85, templet: '#switchTpl', unresize: true},
{field:'platform', title:'平台名称'}, {field:'task_code', title:'任务码', sort: true},
{field:'task_code', title:'任务码'}, {field:'concurrency', title:'并发数', sort: true},
{field:'concurrency', title:'并发数'}, {field:'platform', title:'平台名称', sort: true},
{field:'queue', title:'队列'}, {field:'queue', title:'队列', width: 250, sort: true},
{field:'unique_code', title:'唯一码'}, {field:'remain_task', title:'剩余任务数', width: 140, sort: true},
{field:'start_time', title:'开始时间', width:200}, {field:'remain_wrong_task', title:'剩余异常任务数', width:140, sort: true},
{field:'run_time', title:'运行时间', width:200}, {field:'wrong_radio', title:'错误率', sort: true},
{field:'task_type', title:'任务类型'}, {field:'start_time', title:'开始时间', width:200, sort: true},
{field:'remain_task', title:'剩余任务数'}, {field:'run_time', title:'运行时间', width:200, sort: true},
{field:'remain_wrong_task', title:'剩余异常任务数'}, {field:'task_type', title:'任务类型', sort: true},
{field:'wrong_radio', title:'错误率'}, {field:'unique_code', title:'唯一码', width: 250, sort: true},
{fixed: 'right', title:'', align:'center', toolbar: '#modify', width: 200}, {fixed: 'right', title:'', align:'center', toolbar: '#modify', width: 200},
]], ]],
id: 'idTest' id: 'idTest'
}); });
var $ = layui.$, active = {
reload: function(){
//执行重载
table.reload('idTest', {
page: {
curr: 1 //重新从第 1 页开始
}
, where: {
task_code: $('#task_code').val(),
}
})
},
};
$('.load').on('click', function(){
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
form.on('switch(status)', function(){ form.on('switch(status)', function(){
var data = { var data = {
id:$(this).attr('data-id'), id:$(this).attr('data-id'),
......
public/js/spider/boardconfig.js
...@@ -18,10 +18,8 @@ layui.use(['table', 'form', 'laydate', 'layer'], function () { ...@@ -18,10 +18,8 @@ layui.use(['table', 'form', 'laydate', 'layer'], function () {
var data = { var data = {
id:$('#id').val(), id:$('#id').val(),
platform: $("#platform").val(), platform: $("#platform").val(),
task_code:$("#task_code").val(),
concurrency:$("#concurrency").val(), concurrency:$("#concurrency").val(),
queue:$("#queue").val(), queue:$("#queue").val(),
start_time:$("#start_time").val(),
task_type:$("#task_type").val(), task_type:$("#task_type").val(),
} }
$.ajax({ $.ajax({
......
resources/views/spider/board.blade.php
<div class="layui-form"> <div class="layui-form">
<div class="layui-form-item"> <div class="layui-form-item">
<button class="layui-btn layui-btn-fluid" id="add" lay-submit lay-filter="add" style="width: 216px">添加配置</button> <div class="layui-inline">
<button class="layui-btn layui-btn-fluid" id="add" lay-submit lay-filter="add" style="width: 216px">添加配置</button>
</div>
<div class="layui-inline">
<input type="hidden" class="layui-input">
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" id="task_code" placeholder="请输入任务码" autocomplete="off" class="layui-input" value="{{$_GET['name'] or ''}}">
</div>
</div>
<div class="layui-inline">
<button class="btn btn btn-outline btn-primary load" id="search" lay-submit lay-filter="*" data-type="reload">搜索</button>
</div>
</div> </div>
<table class="layui-table" id="table" lay-filter="demo"> <table class="layui-table" id="table" lay-filter="demo">
</table> </table>
......
resources/views/spider/boardconfig.blade.php
...@@ -8,12 +8,6 @@ ...@@ -8,12 +8,6 @@
<input type="text" name="platform" id="platform" value="{{$detail['platform'] or ''}}" lay-verify="required" autocomplete="off" class="layui-input"> <input type="text" name="platform" id="platform" value="{{$detail['platform'] or ''}}" lay-verify="required" autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">任务码</label>
<div class="layui-input-block">
<input type="text" name="task_code" id="task_code" value="{{$detail['task_code'] or ''}}" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">
<label class="layui-form-label">并发数</label> <label class="layui-form-label">并发数</label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -27,12 +21,6 @@ ...@@ -27,12 +21,6 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">
<label class="layui-form-label"><span class="layui-badge-dot"></span>开始时间</label>
<div class="layui-input-block">
<input type="text" name="start_time" id="start_time" autocomplete="off" class="layui-input" value="{{$detail['start_time'] or ''}}" lay-verify="required">
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">任务类型</label> <label class="layui-form-label">任务类型</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="task_type" id="task_type" value="{{$detail['task_type'] or ''}}" autocomplete="off" class="layui-input"> <input type="text" name="task_type" id="task_type" value="{{$detail['task_type'] or ''}}" autocomplete="off" class="layui-input">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment