Skip to content

lzzzzl / spiderboard

Go to a project
Commit ad9db969 by lzzzzl
Options

修改

parent ee1d5b74
Inline Side-by-side
Showing with 265 additions and 103 deletions
.idea/workspace.xml
...@@ -2,13 +2,16 @@ ...@@ -2,13 +2,16 @@
<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="" afterPath="$PROJECT_DIR$/public/js/spider/boardquickmodify.js" />
<change beforePath="" afterPath="$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.php" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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/Http/Controllers/AccessController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/AccessController.php" />
<change beforePath="$PROJECT_DIR$/app/Http/function.php" afterPath="$PROJECT_DIR$/app/Http/function.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" />
...@@ -25,7 +28,7 @@ ...@@ -25,7 +28,7 @@
<file leaf-file-name="boardconfig.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/boardconfig.blade.php"> <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="540"> <state relative-caret-position="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" /> <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="135:146" ph="..." />
...@@ -48,11 +51,61 @@ ...@@ -48,11 +51,61 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="board.js" pinned="false" current-in-tab="true"> <file leaf-file-name="board.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/spider/board.js"> <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="330"> <state relative-caret-position="639">
<caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" /> <caret line="113" column="56" lean-forward="true" selection-start-line="112" selection-start-column="32" selection-end-line="113" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="783">
<caret line="353" column="7" lean-forward="false" selection-start-line="353" selection-start-column="7" selection-end-line="353" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="boardquickmodify.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="26" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="boardquickmodify.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/spider/boardquickmodify.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="20" column="36" lean-forward="false" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccessApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="771">
<caret line="131" column="38" lean-forward="false" selection-start-line="131" selection-start-column="21" selection-end-line="131" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="perm.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/perm.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="145" lean-forward="false" selection-start-line="8" selection-start-column="145" selection-end-line="8" selection-end-column="145" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -61,10 +114,11 @@ ...@@ -61,10 +114,11 @@
<file leaf-file-name="board.blade.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$/resources/views/spider/board.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573"> <state relative-caret-position="825">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> <caret line="25" column="8" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding> <folding>
<marker date="1564563365556" expanded="true" signature="538:557" ph="..." /> <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
<marker date="1564713465742" expanded="true" signature="734:753" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -119,9 +173,6 @@ ...@@ -119,9 +173,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/app/Model/SupplierModel.php" />
<option value="$PROJECT_DIR$/resources/views/analysis/supplierpriceratio.blade.php" />
<option value="$PROJECT_DIR$/app/Model/LxOrderModel.php" />
<option value="$PROJECT_DIR$/config/internal_label.php" /> <option value="$PROJECT_DIR$/config/internal_label.php" />
<option value="$PROJECT_DIR$/app/Model/UserLabelModel.php" /> <option value="$PROJECT_DIR$/app/Model/UserLabelModel.php" />
<option value="$PROJECT_DIR$/app/Model/DownloadModel.php" /> <option value="$PROJECT_DIR$/app/Model/DownloadModel.php" />
...@@ -159,17 +210,20 @@ ...@@ -159,17 +210,20 @@
<option value="$PROJECT_DIR$/public/js/spider/modifyserver.js" /> <option value="$PROJECT_DIR$/public/js/spider/modifyserver.js" />
<option value="$PROJECT_DIR$/app/Http/dataHandlefunction.php" /> <option value="$PROJECT_DIR$/app/Http/dataHandlefunction.php" />
<option value="$PROJECT_DIR$/resources/views/spider/nodeinfo.blade.php" /> <option value="$PROJECT_DIR$/resources/views/spider/nodeinfo.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AccessController.php" />
<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$/config/perm.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$/resources/views/spider/boardconfig.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/boardconfig.js" /> <option value="$PROJECT_DIR$/public/js/spider/boardconfig.js" />
<option value="$PROJECT_DIR$/app/Http/function.php" />
<option value="$PROJECT_DIR$/resources/views/spider/board.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AccessController.php" />
<option value="$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/board.js" /> <option value="$PROJECT_DIR$/public/js/spider/board.js" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php" />
<option value="$PROJECT_DIR$/public/js/spider/boardquickmodify.js" />
<option value="$PROJECT_DIR$/app/Model/SpiderModel.php" />
<option value="$PROJECT_DIR$/config/perm.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -280,7 +334,6 @@ ...@@ -280,7 +334,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -296,21 +349,7 @@ ...@@ -296,21 +349,7 @@
<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="app" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="spider" type="b2602c69:ProjectViewProjectNode" />
<item name="spider" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="Controllers" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="spider" type="b2602c69:ProjectViewProjectNode" />
<item name="spider" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="Model" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="spider" type="b2602c69:ProjectViewProjectNode" /> <item name="spider" type="b2602c69:ProjectViewProjectNode" />
...@@ -353,6 +392,7 @@ ...@@ -353,6 +392,7 @@
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -590,12 +630,13 @@ ...@@ -590,12 +630,13 @@
<workItem from="1564364942671" duration="12957000" /> <workItem from="1564364942671" duration="12957000" />
<workItem from="1564390285638" duration="4294000" /> <workItem from="1564390285638" duration="4294000" />
<workItem from="1564449397474" duration="3015000" /> <workItem from="1564449397474" duration="3015000" />
<workItem from="1564561312310" duration="3138000" /> <workItem from="1564561312310" duration="5174000" />
<workItem from="1564712055483" duration="2580000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1840197000" /> <option name="totallyTimeSpent" value="1844813000" />
</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" />
...@@ -636,14 +677,6 @@ ...@@ -636,14 +677,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/config/cache.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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/internal_label.php" />
<entry file="file://$PROJECT_DIR$/config/salt.php" /> <entry file="file://$PROJECT_DIR$/config/salt.php" />
<entry file="file://$PROJECT_DIR$/resources/views/index.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -755,13 +788,6 @@ ...@@ -755,13 +788,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/function.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/condition.blade.php" /> <entry file="file://$PROJECT_DIR$/resources/views/spider/condition.blade.php" />
<entry file="file://$PROJECT_DIR$/app/Http/dataHandlefunction.php"> <entry file="file://$PROJECT_DIR$/app/Http/dataHandlefunction.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -792,13 +818,6 @@ ...@@ -792,13 +818,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/quickmodify.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/quickmodify.js"> <entry file="file://$PROJECT_DIR$/public/js/spider/quickmodify.js">
<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">
...@@ -820,13 +839,6 @@ ...@@ -820,13 +839,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/platform.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="0"> <state relative-caret-position="0">
...@@ -866,7 +878,6 @@ ...@@ -866,7 +878,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="396">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" 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 />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -874,46 +885,78 @@ ...@@ -874,46 +885,78 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1167"> <state relative-caret-position="1167">
<caret line="36" column="10" lean-forward="false" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.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="1639"> <state relative-caret-position="-42">
<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="19" column="10" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="19" selection-end-column="10" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.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="593"> <state relative-caret-position="264">
<caret line="63" column="70" lean-forward="false" selection-start-line="63" selection-start-column="70" selection-end-line="63" selection-end-column="70" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/SpiderModel.php"> <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="790"> <state relative-caret-position="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" /> <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$/app/Http/function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705">
<caret line="203" column="20" lean-forward="false" selection-start-line="203" selection-start-column="9" selection-end-line="203" selection-end-column="20" />
<folding>
<marker date="1564712568361" expanded="true" signature="3146:3268" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="783">
<caret line="353" column="7" lean-forward="false" selection-start-line="353" selection-start-column="7" selection-end-line="353" selection-end-column="7" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/addboard.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/quickmodify.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-42"> <state relative-caret-position="330">
<caret line="19" column="10" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="19" selection-end-column="10" /> <caret line="10" column="14" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/modifyserver.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="25" column="8" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
<marker date="1564713465742" expanded="true" signature="734:753" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="264">
<caret line="8" column="52" lean-forward="false" selection-start-line="8" selection-start-column="52" selection-end-line="8" selection-end-column="52" /> <caret line="8" column="26" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -926,34 +969,42 @@ ...@@ -926,34 +969,42 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.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="540"> <state relative-caret-position="639">
<caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" /> <caret line="113" column="56" lean-forward="true" selection-start-line="112" selection-start-column="32" selection-end-line="113" selection-end-column="56" />
<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>
<entry file="file://$PROJECT_DIR$/resources/views/spider/board.blade.php"> <entry file="file://$PROJECT_DIR$/public/js/spider/boardquickmodify.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573"> <state relative-caret-position="660">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> <caret line="20" column="36" lean-forward="false" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
<folding> <folding />
<marker date="1564563365556" expanded="true" signature="538:557" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/board.js"> <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="330"> <state relative-caret-position="705">
<caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" /> <caret line="214" column="94" lean-forward="false" selection-start-line="214" selection-start-column="94" selection-end-line="214" selection-end-column="94" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="771">
<caret line="131" column="38" lean-forward="false" selection-start-line="131" selection-start-column="21" selection-end-line="131" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/perm.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="145" lean-forward="false" selection-start-line="8" selection-start-column="145" selection-end-line="8" selection-end-column="145" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
app/Http/Controllers/AccessApiController.php
...@@ -126,4 +126,14 @@ class AccessApiController extends Controller ...@@ -126,4 +126,14 @@ class AccessApiController extends Controller
} }
/**
* 更新所有面板状态
*/
private function ApiUpdateAllBoard() {
$data = (new SpiderModel())->updateAllBoard();
$this->Export($data);
}
} }
app/Http/Controllers/AccessController.php
...@@ -345,4 +345,16 @@ class AccessController extends Controller ...@@ -345,4 +345,16 @@ class AccessController extends Controller
return view('spiderwindow', $data); return view('spiderwindow', $data);
} }
/**
* 列表页快速修改
* @param $request
* @param $data
* @param $id
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function boardQuickModify($request, $data, $id) {
$data['title'] = '快速修改';
return view('spiderwindow', $data);
}
} }
app/Http/function.php
...@@ -201,3 +201,14 @@ function export_csv($data = [], $header_data = [], $file_name = '') ...@@ -201,3 +201,14 @@ function export_csv($data = [], $header_data = [], $file_name = '')
fclose($fp);exit; fclose($fp);exit;
} }
function time2string($second){
$day = floor($second/(3600*24));
$second = $second%(3600*24);
$hour = floor($second/3600);
$second = $second%3600;
$minute = floor($second/60);
$second = $second%60;
// 不用管怎么实现的，能用就ok
return $day.'天'.$hour.'小时'.$minute.'分'.$second.'秒';
}
app/Model/SpiderModel.php
...@@ -34,7 +34,7 @@ class SpiderModel extends Model ...@@ -34,7 +34,7 @@ class SpiderModel extends Model
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']);
$data['data'][$k]['start_time'] = date("Y-m-d H:i:s", $v['start_time']); $data['data'][$k]['start_time'] = date("Y-m-d H:i:s", $v['start_time']);
$data['data'][$k]['run_time'] .= '秒'; $data['data'][$k]['run_time'] = time2string($v['run_time']);
} }
return $data; return $data;
...@@ -201,4 +201,24 @@ class SpiderModel extends Model ...@@ -201,4 +201,24 @@ class SpiderModel extends Model
} }
/**
* 更新所有面板状态
* @return array
*/
public function updateAllBoard() {
$collect = Request::all();
$collect = TrimX($collect, false, ['status']);
unset($collect['s']);
$result = DB::connection('dashboard')->table('spider_board')->where('status', '!=', '2')->update($collect);
if ($result) {
return [0,'成功'];
} else {
return [1,'失败'];
}
}
} }
config/perm.php
...@@ -6,7 +6,7 @@ return [ ...@@ -6,7 +6,7 @@ return [
'NotAuth' 'NotAuth'
), ),
//api不用验证方法 //api不用验证方法
'ApiNotAuth'=>array('ApiSpiderList','ApiUpdateStatus','ApiConfigContent','ApiAddConfig','ApiUpdateNode','ApiUpdateAllNode' 'ApiNotAuth'=>array('ApiSpiderList','ApiUpdateStatus','ApiConfigContent','ApiAddConfig','ApiUpdateNode','ApiUpdateAllNode','ApiUpdateAllBoard'
), ),
'MenuSign'=>'/web/',//菜单去除掉标记，生成菜单时用 'MenuSign'=>'/web/',//菜单去除掉标记，生成菜单时用
......
public/js/spider/board.js
...@@ -141,3 +141,18 @@ $('#add').click(function () { ...@@ -141,3 +141,18 @@ $('#add').click(function () {
}); });
}); });
}); });
$('#quick_modify').click(function () {
layui.use('layer', function () {
var layer = layui.layer;
layer.open({
type: 2,
area: ['250px', '250px'],
offset: '100px',
fixed: false,
maxmin: true,
content: '/web/boardquickmodify',
title: '快速修改',
});
});
});
public/js/spider/boardquickmodify.js 0 → 100644
var status = 1;
layui.use(['table', 'form', 'laydate', 'layer'], function () {
var form = layui.form;
form.on('switch(status)', function(){
status = this.checked ? 0:1
});
})
$('#submit').click(function () {
$.ajax({
url:'/api/ApiUpdateAllBoard',
type:'get',
dataType:'json',
data: {'status': status},
success:function () {
layer.msg('修改成功');
window.parent.location.reload();
parent.layer.closeAll();
},
error:function () {
layer.msg('修改失败');
}
});
});
resources/views/spider/board.blade.php
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<button class="layui-btn layui-btn-fluid" id="add" lay-submit lay-filter="add" style="width: 216px">添加配置</button> <button class="layui-btn layui-btn-fluid" id="add" lay-submit lay-filter="add" style="width: 216px">添加配置</button>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="quick_modify" lay-submit lay-filter="quick_modify" style="width: 216px;">一键更改</button>
</div>
<div class="layui-inline">
<input type="hidden" class="layui-input"> <input type="hidden" class="layui-input">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
......
resources/views/spider/boardquickmodify.blade.php 0 → 100644
<div class="layui-form">
<div class="layui-input-block">
<input type="checkbox" name="check" value="" lay-skin="switch" lay-text="启动|停止" lay-filter="status">
</div>
<br>
<br>
<br>
<div class="layui-input-block">
<button id="submit" class="layui-btn">确认</button>
</div>
</div>
\ No newline at end of file
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