Skip to content

lzzzzl / spiderboard

Go to a project
Commit 7b38f176 by lzzzzl
Options

新增

parent ad9db969
Inline Side-by-side
Showing with 139 additions and 336 deletions
.idea/workspace.xml
...@@ -2,16 +2,12 @@ ...@@ -2,16 +2,12 @@
<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/AccessController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/AccessController.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/DataManageModel.php" afterPath="" />
<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/addboard.js" afterPath="$PROJECT_DIR$/public/js/spider/addboard.js" />
<change beforePath="$PROJECT_DIR$/public/js/spider/board.js" afterPath="$PROJECT_DIR$/public/js/spider/board.js" /> <change beforePath="$PROJECT_DIR$/resources/views/spider/addboard.blade.php" afterPath="$PROJECT_DIR$/resources/views/spider/addboard.blade.php" />
<change beforePath="$PROJECT_DIR$/resources/views/spider/board.blade.php" afterPath="$PROJECT_DIR$/resources/views/spider/board.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,38 +21,25 @@ ...@@ -25,38 +21,25 @@
</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="boardconfig.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="addboard.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php"> <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="0"> <state relative-caret-position="396">
<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="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
<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>
</file>
<file leaf-file-name="boardconfig.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/spider/boardconfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<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="board.js" pinned="false" current-in-tab="false"> <file leaf-file-name="addboard.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/spider/board.js"> <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="639"> <state relative-caret-position="66">
<caret line="113" column="56" lean-forward="true" selection-start-line="112" selection-start-column="32" selection-end-line="113" selection-end-column="56" /> <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="7" selection-end-column="14" />
<folding /> <folding>
<element signature="n#style#0;n#input#0;n#div#0;n#div#4;n#form#0;n#!!top" expanded="true" />
<marker date="1564989176329" expanded="true" signature="1900:1905" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -64,28 +47,18 @@ ...@@ -64,28 +47,18 @@
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.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="783"> <state relative-caret-position="682">
<caret line="353" column="7" lean-forward="false" selection-start-line="353" selection-start-column="7" selection-end-line="353" selection-end-column="7" /> <caret line="305" column="44" lean-forward="false" selection-start-line="305" selection-start-column="44" selection-end-line="305" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="boardquickmodify.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="SpiderModel.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.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="264"> <state relative-caret-position="429">
<caret line="8" column="26" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="26" /> <caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
<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 /> <folding />
</state> </state>
</provider> </provider>
...@@ -94,36 +67,13 @@ ...@@ -94,36 +67,13 @@
<file leaf-file-name="AccessApiController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="AccessApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.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="771"> <state relative-caret-position="461">
<caret line="131" column="38" lean-forward="false" selection-start-line="131" selection-start-column="21" selection-end-line="131" selection-end-column="38" /> <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="37" selection-end-line="103" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="board.blade.php" pinned="false" current-in-tab="false">
<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>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -135,8 +85,6 @@ ...@@ -135,8 +85,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>ApiSkuExposeLx</find>
<find>erp</find>
<find>comparepri</find> <find>comparepri</find>
<find>ApiSpe</find> <find>ApiSpe</find>
<find>skuexposekeyword</find> <find>skuexposekeyword</find>
...@@ -165,6 +113,8 @@ ...@@ -165,6 +113,8 @@
<find>on_of</find> <find>on_of</find>
<find>on_off</find> <find>on_off</find>
<find>ApiSpiderList</find> <find>ApiSpiderList</find>
<find>ApiAddConfig</find>
<find>insertContent</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -203,8 +153,6 @@ ...@@ -203,8 +153,6 @@
<option value="$PROJECT_DIR$/app/Model/DataManageModel.php" /> <option value="$PROJECT_DIR$/app/Model/DataManageModel.php" />
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<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$/public/js/spider/addboard.js" />
<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" />
...@@ -217,13 +165,15 @@ ...@@ -217,13 +165,15 @@
<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$/app/Http/function.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/AccessController.php" />
<option value="$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.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$/app/Http/Controllers/AccessApiController.php" />
<option value="$PROJECT_DIR$/public/js/spider/boardquickmodify.js" /> <option value="$PROJECT_DIR$/public/js/spider/boardquickmodify.js" />
<option value="$PROJECT_DIR$/app/Model/SpiderModel.php" />
<option value="$PROJECT_DIR$/config/perm.php" /> <option value="$PROJECT_DIR$/config/perm.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AccessController.php" />
<option value="$PROJECT_DIR$/resources/views/spider/addboard.blade.php" />
<option value="$PROJECT_DIR$/public/js/spider/addboard.js" />
<option value="$PROJECT_DIR$/app/Model/SpiderModel.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -349,6 +299,25 @@ ...@@ -349,6 +299,25 @@
<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="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>
<item name="spider" type="b2602c69:ProjectViewProjectNode" />
<item name="spider" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="config" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
...@@ -631,12 +600,13 @@ ...@@ -631,12 +600,13 @@
<workItem from="1564390285638" duration="4294000" /> <workItem from="1564390285638" duration="4294000" />
<workItem from="1564449397474" duration="3015000" /> <workItem from="1564449397474" duration="3015000" />
<workItem from="1564561312310" duration="5174000" /> <workItem from="1564561312310" duration="5174000" />
<workItem from="1564712055483" duration="2580000" /> <workItem from="1564712055483" duration="3361000" />
<workItem from="1564987926206" duration="1405000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1844813000" /> <option name="totallyTimeSpent" value="1846999000" />
</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" />
...@@ -758,20 +728,6 @@ ...@@ -758,20 +728,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$/public/js/spider/addboard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="24" column="44" lean-forward="false" selection-start-line="18" selection-start-column="12" selection-end-line="24" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/DataManageModel.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider_card.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/spider_card.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639"> <state relative-caret-position="639">
...@@ -888,13 +844,6 @@ ...@@ -888,13 +844,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/addboard.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-42">
<caret line="19" column="10" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="19" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/modifyserver.blade.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="264"> <state relative-caret-position="264">
...@@ -902,20 +851,6 @@ ...@@ -902,20 +851,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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"> <entry file="file://$PROJECT_DIR$/app/Http/function.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705"> <state relative-caret-position="705">
...@@ -926,37 +861,33 @@ ...@@ -926,37 +861,33 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessController.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="783"> <state relative-caret-position="330">
<caret line="353" column="7" lean-forward="false" selection-start-line="353" selection-start-column="7" selection-end-line="353" selection-end-column="7" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/quickmodify.blade.php"> <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="330"> <state relative-caret-position="264">
<caret line="10" column="14" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="32" selection-end-column="6" /> <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>
</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="825"> <state relative-caret-position="660">
<caret line="25" column="8" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="26" 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 />
<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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardquickmodify.blade.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="264"> <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" /> <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>
...@@ -971,40 +902,83 @@ ...@@ -971,40 +902,83 @@
</entry> </entry>
<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="639"> <state relative-caret-position="33">
<caret line="113" column="56" lean-forward="true" selection-start-line="112" selection-start-column="32" selection-end-line="113" selection-end-column="56" /> <caret line="113" column="56" lean-forward="false" selection-start-line="112" selection-start-column="32" selection-end-line="113" selection-end-column="56" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/boardquickmodify.js"> <entry file="file://$PROJECT_DIR$/app/Model/DataManageModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660"> <state relative-caret-position="395">
<caret line="20" column="36" lean-forward="false" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/SpiderModel.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="705"> <state relative-caret-position="222">
<caret line="214" column="94" lean-forward="false" selection-start-line="214" selection-start-column="94" selection-end-line="214" selection-end-column="94" /> <caret line="13" column="124" lean-forward="false" selection-start-line="13" selection-start-column="110" selection-end-line="13" selection-end-column="124" />
<folding>
<marker date="1564713465742" expanded="true" signature="734:753" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/spider/boardconfig.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="19" column="89" lean-forward="false" selection-start-line="19" selection-start-column="55" selection-end-line="19" selection-end-column="89" />
<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/Controllers/AccessController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="305" column="44" lean-forward="false" selection-start-line="305" selection-start-column="44" selection-end-line="305" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AccessApiController.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="771"> <state relative-caret-position="461">
<caret line="131" column="38" lean-forward="false" selection-start-line="131" selection-start-column="21" selection-end-line="131" selection-end-column="38" /> <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="37" selection-end-line="103" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/perm.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="264"> <state relative-caret-position="66">
<caret line="8" column="145" lean-forward="false" selection-start-line="8" selection-start-column="145" selection-end-line="8" selection-end-column="145" /> <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="7" selection-end-column="14" />
<folding>
<element signature="n#style#0;n#input#0;n#div#0;n#div#4;n#form#0;n#!!top" expanded="true" />
<marker date="1564989176329" expanded="true" signature="1900:1905" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/spider/addboard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/SpiderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
app/Http/Controllers/AccessController.php
...@@ -303,6 +303,7 @@ class AccessController extends Controller ...@@ -303,6 +303,7 @@ class AccessController extends Controller
*/ */
public function addBoard($request, $data, $id) { public function addBoard($request, $data, $id) {
$data['title'] = '添加'; $data['title'] = '添加';
$data['time'] = date("Y-m-d H:i:s");
return view('spiderwindow', $data); return view('spiderwindow', $data);
} }
......
app/Model/DataManageModel.php deleted 100644 → 0
<?php
namespace App\Model;
use Illuminate\Database\Eloquent\Model;
use Request;
use Config;
use DB;
use RedisDB;
class DataManageModel extends Model
{
protected $connection = 'dashboard';
protected $table = 'data_manage';
public $timestamps = false;
/**
* 数据列表
* @param $limit
* @param $p
* @return mixed
*/
public function dataList($limit, $p) {
$limit = !empty($limit) ? $limit : '';
$p = !empty($p) ? $p : 1;
$data = $this->paginate($limit,['*'],'p',$p)->toArray();
foreach ($data['data'] as $k => $v) {
$data['data'][$k]['platform_type'] = platform_type($v['platform_type']);
$data['data'][$k]['status_name'] = platform_status($v['status']);
$data['data'][$k]['frequency'] = timestamp_to_hour($v['frequency']);
$data['data'][$k]['start_time'] = date("Y-m-d H:i:s", $v['start_time']);
$data['data'][$k]['end_time'] = date("Y-m-d H:i:s", $v['end_time']);
}
return $data;
}
public function dataSingle($id) {
$arr = [];
$data = $this->where('id','=',$id)->get();
foreach ($data as $k => $v) {
$arr['platform_name'] = $v['platform_name'];
$arr['platform_cn_name'] = $v['platform_cn_name'];
$arr['key'] = $v['key'];
$arr['frequency'] = $v['frequency'];
$arr['start_time'] = date("Y-m-d H:i:s", $v['start_time']);
$arr['end_time'] = date("Y-m-d H:i:s", $v['end_time']);
$arr['condition'] = $v['condition'];
$arr['condition_desc'] = $v['condition_desc'];
$arr['canal'] = $v['canal'];
$arr['hk_delivery_time'] = $v['hk_delivery_time'];
$arr['cn_delivery_time'] = $v['cn_delivery_time'];
$arr['rmb_ratio'] = $v['rmb_ratio'];
$arr['usd_ratio'] = $v['usd_ratio'];
$arr['file_addr'] = $v['file_addr'];
$arr['file_name'] = $v['file_name'];
$arr['id'] = $v['id'];
}
return $arr;
}
public function updateOnOff() {
$collect = Request::all();
$map['id'] = !empty($collect['id']) ? $collect['id'] : '';
$collect = TrimX($collect, false, ['on_off']);
$result = $this->where($map)->update($collect);
if ($result) {
return [0,'成功'];
} else {
return [1,'失败'];
}
}
public function updateManualPush() {
$collect = Request::all();
$map['id'] = !empty($collect['id']) ? $collect['id'] : '';
$collect = TrimX($collect, false, ['manual_push']);
$result = $this->where($map)->update($collect);
if ($result) {
return [0,'成功'];
} else {
return [1,'失败'];
}
}
public function updateContent() {
$collect = Request::all();
$map['id'] = !empty($collect['id']) ? $collect['id'] : '';
$collect['start_time'] = strtotime($collect['start_time']);
$collect['end_time'] = strtotime($collect['end_time']);
$collect = TrimX($collect, false, ['platform_name','platform_cn_name','key','frequency','start_time','end_time','condition','condition_desc','canal','hk_delivery_time','cn_delivery_time','rmb_ratio','usd_ratio']);
unset($collect['s']);
$result = $this->where($map)->update($collect);
if ($result) {
return [0,'成功'];
} else {
return [1,'失败'];
}
}
public function insertContent() {
$collect = Request::all();
$collect['start_time'] = strtotime($collect['start_time']);
$collect['status'] = 1;
unset($collect['s']);
return $this->insert($collect);
}
public function updateExcelContent() {
$collect = Request::all();
$id = !empty($collect['id']) ? $collect['id'] : 0;
$collect = TrimX($collect, false, ['file_addr','file_name']);
unset($collect['s']);
$result = DB::connection('dashboard')->table('data_manage_file')->insert(array('manage_id' => $id, 'file_addr' => $collect['file_addr'], 'file_name' => $collect['file_name']));
if ($result) {
return [0,'成功'];
} else {
return [1,'失败'];
}
}
public function fileList() {
$collect = Request::all();
$id = !empty($collect['id']) ? $collect['id'] : 0;
$result = DB::connection('dashboard')->table('data_manage_file')->where('manage_id','=',$id)->get();
return ['data' => $result, 'total' => sizeof($result)];
}
public function deleteFile() {
$collect = Request::all();
$id = !empty($collect['id']) ? $collect['id'] : 0;
$result = DB::connection('dashboard')->table('data_manage_file')->where('id','=',$id)->delete();
if ($result) {
return [0,'成功'];
} else {
return [1,'失败'];
}
}
}
app/Model/SpiderModel.php
...@@ -29,7 +29,10 @@ class SpiderModel extends Model ...@@ -29,7 +29,10 @@ class SpiderModel extends Model
if (!empty($task_code)) if (!empty($task_code))
$map[] = ['task_code', '=', $task_code]; $map[] = ['task_code', '=', $task_code];
$data = $this->where('status','!=',2)->where($map)->paginate($limit,['*'],'p',$p)->toArray(); $map[] = ['status', '!=', 2];
$map[] = ['status', '!=', 3];
$data = $this->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']);
...@@ -67,7 +70,6 @@ class SpiderModel extends Model ...@@ -67,7 +70,6 @@ class SpiderModel extends Model
$collect = Request::all(); $collect = Request::all();
$collect['start_time'] = strtotime($collect['start_time']); $collect['start_time'] = strtotime($collect['start_time']);
$collect['status'] = 0;
unset($collect['s']); unset($collect['s']);
return $this->insert($collect); return $this->insert($collect);
......
public/js/spider/addboard.js
var on_off = 1;
layui.use(['table', 'form', 'laydate', 'layer'], function () { layui.use(['table', 'form', 'laydate', 'layer'], function () {
var laydate = layui.laydate; var laydate = layui.laydate;
...@@ -10,19 +8,16 @@ layui.use(['table', 'form', 'laydate', 'layer'], function () { ...@@ -10,19 +8,16 @@ layui.use(['table', 'form', 'laydate', 'layer'], function () {
type: 'datetime' type: 'datetime'
}); });
form.on('switch(on_off)', function(){
on_off = this.checked ? 1:2;
});
form.on('submit(submit)', function(){ form.on('submit(submit)', function(){
var data = { var data = {
on_off: on_off, status: 3,
platform: $("#platform").val(), platform: $("#platform").val(),
task_code:$("#task_code").val(), task_code:$("#task_code").val(),
concurrency:$("#concurrency").val(), concurrency:$("#concurrency").val(),
queue:$("#queue").val(), queue:$("#queue").val(),
start_time:$("#start_time").val(), start_time:$("#start_time").val(),
task_type:$("#task_type").val(), task_type:$("#task_type").val(),
unique_code: Math.round(new Date()/1000) + $("#task_code").val() + $("#concurrency").val(),
} }
$.ajax({ $.ajax({
url:'/api/ApiAddConfig', url:'/api/ApiAddConfig',
......
resources/views/spider/addboard.blade.php
<form action="" method="post" class="layui-form" style="margin:30px 50px 20px 0"> <form action="" method="post" class="layui-form" style="margin:30px 50px 20px 0">
<div class="layui-form-item"> {{--<div class="layui-form-item">--}}
<label class="layui-form-label">状态</label> {{--<label class="layui-form-label">状态</label>--}}
<div class="layui-input-block"> {{--<div class="layui-input-block">--}}
<input type="checkbox" name="check" value="" lay-skin="switch" lay-text="启动|停止" lay-filter="on_off" checked> {{--<input type="checkbox" name="check" value="" lay-skin="switch" lay-text="启动|停止" lay-filter="on_off" checked>--}}
</div> {{--</div>--}}
</div> {{--</div>--}}
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span class="layui-badge-dot"></span>平台名称</label> <label class="layui-form-label"><span class="layui-badge-dot"></span>平台名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -13,27 +13,27 @@ ...@@ -13,27 +13,27 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">任务码</label> <label class="layui-form-label"><span class="layui-badge-dot"></span>任务码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="task_code" style="width: 250px" class="layui-input"> <input type="text" id="task_code" lay-verify="required" style="width: 250px" class="layui-input">
</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">并发数</label> <label class="layui-form-label"><span class="layui-badge-dot"></span>并发数</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name="concurrency" id="concurrency" style="width: 250px" class="layui-input"> <input type="number" name="concurrency" lay-verify="required" id="concurrency" style="width: 250px" class="layui-input">
</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">队列</label> <label class="layui-form-label"><span class="layui-badge-dot"></span>队列</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="queue" id="queue" style="width: 250px" class="layui-input"> <input type="text" name="queue" id="queue" lay-verify="required" style="width: 250px" class="layui-input">
</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> <label class="layui-form-label"><span class="layui-badge-dot"></span>开始时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="start_time" id="start_time" style="width: 250px" lay-verify="required" class="layui-input"> <input type="text" name="start_time" value="{{$time}}" id="start_time" style="width: 250px" lay-verify="required" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">
......
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