正在显示
3 个修改的文件
包含
127 行增加
和
261 行删除
@@ -2,7 +2,9 @@ | @@ -2,7 +2,9 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> | 4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ActiveController.php" afterPath="$PROJECT_DIR$/api/index/controller/ActiveController.php" /> | 5 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
6 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/FinancsendController.php" afterPath="$PROJECT_DIR$/app/admin/controller/FinancsendController.php" /> | ||
7 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html" /> | ||
6 | </list> | 8 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 10 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -12,41 +14,7 @@ | @@ -12,41 +14,7 @@ | ||
12 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 14 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
13 | </component> | 15 | </component> |
14 | <component name="FileEditorManager"> | 16 | <component name="FileEditorManager"> |
15 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | ||
16 | - <file leaf-file-name="ActiveController.php" pinned="false" current-in-tab="true"> | ||
17 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php"> | ||
18 | - <provider selected="true" editor-type-id="text-editor"> | ||
19 | - <state relative-caret-position="205"> | ||
20 | - <caret line="362" column="18" lean-forward="true" selection-start-line="362" selection-start-column="18" selection-end-line="362" selection-end-column="18" /> | ||
21 | - <folding> | ||
22 | - <element signature="e#129#167#0#PHP" expanded="true" /> | ||
23 | - <element signature="e#373#959#0#PHP" expanded="false" /> | ||
24 | - <element signature="e#964#1855#0#PHP" expanded="false" /> | ||
25 | - <element signature="e#1861#2461#0#PHP" expanded="false" /> | ||
26 | - <element signature="e#2466#3609#0#PHP" expanded="false" /> | ||
27 | - <element signature="e#3615#4607#0#PHP" expanded="false" /> | ||
28 | - <element signature="e#4612#5847#0#PHP" expanded="false" /> | ||
29 | - <element signature="e#5853#6462#0#PHP" expanded="false" /> | ||
30 | - <element signature="e#6467#7653#0#PHP" expanded="false" /> | ||
31 | - <element signature="e#7659#8182#0#PHP" expanded="false" /> | ||
32 | - <element signature="e#8187#8720#0#PHP" expanded="false" /> | ||
33 | - <element signature="e#8726#9246#0#PHP" expanded="false" /> | ||
34 | - <element signature="e#9251#9784#0#PHP" expanded="false" /> | ||
35 | - <element signature="e#9790#10057#0#PHP" expanded="false" /> | ||
36 | - <element signature="e#15408#15672#0#PHP" expanded="false" /> | ||
37 | - <element signature="e#15677#18039#0#PHP" expanded="false" /> | ||
38 | - <element signature="e#16884#17290#0#PHP" expanded="false" /> | ||
39 | - <element signature="e#17304#17697#0#PHP" expanded="false" /> | ||
40 | - <element signature="e#17707#18033#0#PHP" expanded="false" /> | ||
41 | - <element signature="e#18046#18490#0#PHP" expanded="false" /> | ||
42 | - <element signature="e#18495#18929#0#PHP" expanded="false" /> | ||
43 | - <element signature="e#18934#19194#0#PHP" expanded="false" /> | ||
44 | - </folding> | ||
45 | - </state> | ||
46 | - </provider> | ||
47 | - </entry> | ||
48 | - </file> | ||
49 | - </leaf> | 17 | + <leaf /> |
50 | </component> | 18 | </component> |
51 | <component name="FileTemplateManagerImpl"> | 19 | <component name="FileTemplateManagerImpl"> |
52 | <option name="RECENT_TEMPLATES"> | 20 | <option name="RECENT_TEMPLATES"> |
@@ -73,8 +41,6 @@ | @@ -73,8 +41,6 @@ | ||
73 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> | 41 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> |
74 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> | 42 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> |
75 | <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> | 43 | <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> |
76 | - <option value="$PROJECT_DIR$/app/admin/controller/FinancsendController.php" /> | ||
77 | - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html" /> | ||
78 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> | 44 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> |
79 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" /> | 45 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" /> |
80 | <option value="$PROJECT_DIR$/app/admin/controller/StatisticController.php" /> | 46 | <option value="$PROJECT_DIR$/app/admin/controller/StatisticController.php" /> |
@@ -97,6 +63,8 @@ | @@ -97,6 +63,8 @@ | ||
97 | <option value="$PROJECT_DIR$/api/config.php" /> | 63 | <option value="$PROJECT_DIR$/api/config.php" /> |
98 | <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | 64 | <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> |
99 | <option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" /> | 65 | <option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" /> |
66 | + <option value="$PROJECT_DIR$/app/admin/controller/FinancsendController.php" /> | ||
67 | + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html" /> | ||
100 | </list> | 68 | </list> |
101 | </option> | 69 | </option> |
102 | </component> | 70 | </component> |
@@ -115,8 +83,8 @@ | @@ -115,8 +83,8 @@ | ||
115 | </component> | 83 | </component> |
116 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 84 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
117 | <component name="ProjectFrameBounds"> | 85 | <component name="ProjectFrameBounds"> |
118 | - <option name="x" value="354" /> | ||
119 | - <option name="y" value="48" /> | 86 | + <option name="x" value="260" /> |
87 | + <option name="y" value="93" /> | ||
120 | <option name="width" value="1717" /> | 88 | <option name="width" value="1717" /> |
121 | <option name="height" value="940" /> | 89 | <option name="height" value="940" /> |
122 | </component> | 90 | </component> |
@@ -135,8 +103,6 @@ | @@ -135,8 +103,6 @@ | ||
135 | <foldersAlwaysOnTop value="true" /> | 103 | <foldersAlwaysOnTop value="true" /> |
136 | </navigator> | 104 | </navigator> |
137 | <panes> | 105 | <panes> |
138 | - <pane id="Scratches" /> | ||
139 | - <pane id="Scope" /> | ||
140 | <pane id="ProjectPane"> | 106 | <pane id="ProjectPane"> |
141 | <subPane> | 107 | <subPane> |
142 | <expand> | 108 | <expand> |
@@ -144,46 +110,12 @@ | @@ -144,46 +110,12 @@ | ||
144 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | 110 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> |
145 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | 111 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> |
146 | </path> | 112 | </path> |
147 | - <path> | ||
148 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
149 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
150 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
151 | - </path> | ||
152 | - <path> | ||
153 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
154 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
155 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
156 | - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
157 | - </path> | ||
158 | - <path> | ||
159 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
160 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
161 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
162 | - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
163 | - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
164 | - </path> | ||
165 | - <path> | ||
166 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
167 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
168 | - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
169 | - </path> | ||
170 | - <path> | ||
171 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
172 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
173 | - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
174 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
175 | - </path> | ||
176 | - <path> | ||
177 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
178 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
179 | - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
180 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
181 | - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
182 | - </path> | ||
183 | </expand> | 113 | </expand> |
184 | <select /> | 114 | <select /> |
185 | </subPane> | 115 | </subPane> |
186 | </pane> | 116 | </pane> |
117 | + <pane id="Scratches" /> | ||
118 | + <pane id="Scope" /> | ||
187 | </panes> | 119 | </panes> |
188 | </component> | 120 | </component> |
189 | <component name="PropertiesComponent"> | 121 | <component name="PropertiesComponent"> |
@@ -239,18 +171,18 @@ | @@ -239,18 +171,18 @@ | ||
239 | <workItem from="1568852246741" duration="7527000" /> | 171 | <workItem from="1568852246741" duration="7527000" /> |
240 | <workItem from="1568861318343" duration="14697000" /> | 172 | <workItem from="1568861318343" duration="14697000" /> |
241 | <workItem from="1568881010503" duration="9880000" /> | 173 | <workItem from="1568881010503" duration="9880000" /> |
242 | - <workItem from="1568938332139" duration="11165000" /> | 174 | + <workItem from="1568938332139" duration="12331000" /> |
175 | + <workItem from="1568958569115" duration="71000" /> | ||
243 | </task> | 176 | </task> |
244 | <servers /> | 177 | <servers /> |
245 | </component> | 178 | </component> |
246 | <component name="TimeTrackingManager"> | 179 | <component name="TimeTrackingManager"> |
247 | - <option name="totallyTimeSpent" value="274368000" /> | 180 | + <option name="totallyTimeSpent" value="275605000" /> |
248 | </component> | 181 | </component> |
249 | <component name="ToolWindowManager"> | 182 | <component name="ToolWindowManager"> |
250 | - <frame x="354" y="48" width="1717" height="940" extended-state="0" /> | ||
251 | - <editor active="true" /> | 183 | + <frame x="260" y="93" width="1717" height="940" extended-state="0" /> |
252 | <layout> | 184 | <layout> |
253 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15932408" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 185 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16113459" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
254 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 186 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
255 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" /> | 187 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" /> |
256 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 188 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
@@ -282,41 +214,6 @@ | @@ -282,41 +214,6 @@ | ||
282 | <watches-manager /> | 214 | <watches-manager /> |
283 | </component> | 215 | </component> |
284 | <component name="editorHistoryManager"> | 216 | <component name="editorHistoryManager"> |
285 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/index.html"> | ||
286 | - <provider selected="true" editor-type-id="text-editor"> | ||
287 | - <state relative-caret-position="-1361"> | ||
288 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
289 | - </state> | ||
290 | - </provider> | ||
291 | - </entry> | ||
292 | - <entry file="file://$PROJECT_DIR$/app/admin/controller/ProvideController.php"> | ||
293 | - <provider selected="true" editor-type-id="text-editor"> | ||
294 | - <state relative-caret-position="850"> | ||
295 | - <caret line="68" column="12" lean-forward="true" selection-start-line="68" selection-start-column="12" selection-end-line="70" selection-end-column="13" /> | ||
296 | - </state> | ||
297 | - </provider> | ||
298 | - </entry> | ||
299 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/comment.html"> | ||
300 | - <provider selected="true" editor-type-id="text-editor"> | ||
301 | - <state relative-caret-position="0"> | ||
302 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
303 | - </state> | ||
304 | - </provider> | ||
305 | - </entry> | ||
306 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html"> | ||
307 | - <provider selected="true" editor-type-id="text-editor"> | ||
308 | - <state relative-caret-position="50"> | ||
309 | - <caret line="17" column="52" lean-forward="true" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" /> | ||
310 | - </state> | ||
311 | - </provider> | ||
312 | - </entry> | ||
313 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html"> | ||
314 | - <provider selected="true" editor-type-id="text-editor"> | ||
315 | - <state relative-caret-position="1700"> | ||
316 | - <caret line="71" column="48" lean-forward="true" selection-start-line="71" selection-start-column="48" selection-end-line="71" selection-end-column="48" /> | ||
317 | - </state> | ||
318 | - </provider> | ||
319 | - </entry> | ||
320 | <entry file="file://$PROJECT_DIR$/app/admin/controller/DemandController.php"> | 217 | <entry file="file://$PROJECT_DIR$/app/admin/controller/DemandController.php"> |
321 | <provider selected="true" editor-type-id="text-editor"> | 218 | <provider selected="true" editor-type-id="text-editor"> |
322 | <state relative-caret-position="425"> | 219 | <state relative-caret-position="425"> |
@@ -332,7 +229,6 @@ | @@ -332,7 +229,6 @@ | ||
332 | <provider selected="true" editor-type-id="text-editor"> | 229 | <provider selected="true" editor-type-id="text-editor"> |
333 | <state relative-caret-position="75"> | 230 | <state relative-caret-position="75"> |
334 | <caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" /> | 231 | <caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" /> |
335 | - <folding /> | ||
336 | </state> | 232 | </state> |
337 | </provider> | 233 | </provider> |
338 | </entry> | 234 | </entry> |
@@ -355,7 +251,6 @@ | @@ -355,7 +251,6 @@ | ||
355 | <provider selected="true" editor-type-id="text-editor"> | 251 | <provider selected="true" editor-type-id="text-editor"> |
356 | <state relative-caret-position="6"> | 252 | <state relative-caret-position="6"> |
357 | <caret line="95" column="7" lean-forward="true" selection-start-line="95" selection-start-column="7" selection-end-line="95" selection-end-column="7" /> | 253 | <caret line="95" column="7" lean-forward="true" selection-start-line="95" selection-start-column="7" selection-end-line="95" selection-end-column="7" /> |
358 | - <folding /> | ||
359 | </state> | 254 | </state> |
360 | </provider> | 255 | </provider> |
361 | </entry> | 256 | </entry> |
@@ -405,14 +300,6 @@ | @@ -405,14 +300,6 @@ | ||
405 | <provider selected="true" editor-type-id="text-editor"> | 300 | <provider selected="true" editor-type-id="text-editor"> |
406 | <state relative-caret-position="375"> | 301 | <state relative-caret-position="375"> |
407 | <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> | 302 | <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> |
408 | - <folding> | ||
409 | - <element signature="e#299#762#0#PHP" expanded="false" /> | ||
410 | - <element signature="e#767#1496#0#PHP" expanded="false" /> | ||
411 | - <element signature="e#1502#2191#0#PHP" expanded="false" /> | ||
412 | - <element signature="e#2196#4102#0#PHP" expanded="false" /> | ||
413 | - <element signature="e#4108#4373#0#PHP" expanded="false" /> | ||
414 | - <element signature="e#4378#4728#0#PHP" expanded="false" /> | ||
415 | - </folding> | ||
416 | </state> | 303 | </state> |
417 | </provider> | 304 | </provider> |
418 | </entry> | 305 | </entry> |
@@ -420,13 +307,6 @@ | @@ -420,13 +307,6 @@ | ||
420 | <provider selected="true" editor-type-id="text-editor"> | 307 | <provider selected="true" editor-type-id="text-editor"> |
421 | <state relative-caret-position="-71"> | 308 | <state relative-caret-position="-71"> |
422 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 309 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
423 | - <folding> | ||
424 | - <element signature="e#264#1922#0#PHP" expanded="false" /> | ||
425 | - <element signature="e#1937#4063#0#PHP" expanded="false" /> | ||
426 | - <element signature="e#4078#4931#0#PHP" expanded="false" /> | ||
427 | - <element signature="e#4946#5282#0#PHP" expanded="false" /> | ||
428 | - <element signature="e#5297#5738#0#PHP" expanded="false" /> | ||
429 | - </folding> | ||
430 | </state> | 310 | </state> |
431 | </provider> | 311 | </provider> |
432 | </entry> | 312 | </entry> |
@@ -434,32 +314,6 @@ | @@ -434,32 +314,6 @@ | ||
434 | <provider selected="true" editor-type-id="text-editor"> | 314 | <provider selected="true" editor-type-id="text-editor"> |
435 | <state relative-caret-position="-225"> | 315 | <state relative-caret-position="-225"> |
436 | <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" /> | 316 | <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" /> |
437 | - <folding> | ||
438 | - <element signature="e#129#167#0#PHP" expanded="false" /> | ||
439 | - <element signature="e#330#805#0#PHP" expanded="false" /> | ||
440 | - <element signature="e#810#1537#0#PHP" expanded="false" /> | ||
441 | - <element signature="e#1543#2147#0#PHP" expanded="false" /> | ||
442 | - <element signature="e#2152#3064#0#PHP" expanded="false" /> | ||
443 | - <element signature="e#3070#3509#0#PHP" expanded="false" /> | ||
444 | - <element signature="e#3514#4196#0#PHP" expanded="false" /> | ||
445 | - <element signature="e#4202#4799#0#PHP" expanded="false" /> | ||
446 | - <element signature="e#4804#5860#0#PHP" expanded="false" /> | ||
447 | - <element signature="e#5866#6634#0#PHP" expanded="false" /> | ||
448 | - <element signature="e#6639#7862#0#PHP" expanded="false" /> | ||
449 | - <element signature="e#7868#8655#0#PHP" expanded="false" /> | ||
450 | - <element signature="e#8660#10021#0#PHP" expanded="false" /> | ||
451 | - <element signature="e#10027#11145#0#PHP" expanded="false" /> | ||
452 | - <element signature="e#11150#12681#0#PHP" expanded="false" /> | ||
453 | - <element signature="e#12687#13251#0#PHP" expanded="false" /> | ||
454 | - <element signature="e#13256#14338#0#PHP" expanded="false" /> | ||
455 | - <element signature="e#14344#15103#0#PHP" expanded="false" /> | ||
456 | - <element signature="e#15108#16316#0#PHP" expanded="false" /> | ||
457 | - <element signature="e#16322#16959#0#PHP" expanded="false" /> | ||
458 | - <element signature="e#16964#17482#0#PHP" expanded="false" /> | ||
459 | - <element signature="e#17488#18373#0#PHP" expanded="false" /> | ||
460 | - <element signature="e#18378#19510#0#PHP" expanded="false" /> | ||
461 | - <element signature="e#20735#21301#0#PHP" expanded="false" /> | ||
462 | - </folding> | ||
463 | </state> | 317 | </state> |
464 | </provider> | 318 | </provider> |
465 | </entry> | 319 | </entry> |
@@ -467,10 +321,6 @@ | @@ -467,10 +321,6 @@ | ||
467 | <provider selected="true" editor-type-id="text-editor"> | 321 | <provider selected="true" editor-type-id="text-editor"> |
468 | <state relative-caret-position="375"> | 322 | <state relative-caret-position="375"> |
469 | <caret line="68" column="5" lean-forward="true" selection-start-line="68" selection-start-column="5" selection-end-line="68" selection-end-column="5" /> | 323 | <caret line="68" column="5" lean-forward="true" selection-start-line="68" selection-start-column="5" selection-end-line="68" selection-end-column="5" /> |
470 | - <folding> | ||
471 | - <element signature="e#300#1179#0#PHP" expanded="false" /> | ||
472 | - <element signature="e#1184#2062#0#PHP" expanded="false" /> | ||
473 | - </folding> | ||
474 | </state> | 324 | </state> |
475 | </provider> | 325 | </provider> |
476 | </entry> | 326 | </entry> |
@@ -492,7 +342,6 @@ | @@ -492,7 +342,6 @@ | ||
492 | <provider selected="true" editor-type-id="text-editor"> | 342 | <provider selected="true" editor-type-id="text-editor"> |
493 | <state relative-caret-position="297"> | 343 | <state relative-caret-position="297"> |
494 | <caret line="454" column="9" lean-forward="false" selection-start-line="454" selection-start-column="9" selection-end-line="454" selection-end-column="9" /> | 344 | <caret line="454" column="9" lean-forward="false" selection-start-line="454" selection-start-column="9" selection-end-line="454" selection-end-column="9" /> |
495 | - <folding /> | ||
496 | </state> | 345 | </state> |
497 | </provider> | 346 | </provider> |
498 | </entry> | 347 | </entry> |
@@ -514,10 +363,6 @@ | @@ -514,10 +363,6 @@ | ||
514 | <provider selected="true" editor-type-id="text-editor"> | 363 | <provider selected="true" editor-type-id="text-editor"> |
515 | <state relative-caret-position="350"> | 364 | <state relative-caret-position="350"> |
516 | <caret line="24" column="23" lean-forward="false" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" /> | 365 | <caret line="24" column="23" lean-forward="false" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" /> |
517 | - <folding> | ||
518 | - <element signature="e#616#1692#0#PHP" expanded="false" /> | ||
519 | - <element signature="e#2440#3295#0#PHP" expanded="false" /> | ||
520 | - </folding> | ||
521 | </state> | 366 | </state> |
522 | </provider> | 367 | </provider> |
523 | </entry> | 368 | </entry> |
@@ -530,7 +375,6 @@ | @@ -530,7 +375,6 @@ | ||
530 | <provider selected="true" editor-type-id="text-editor"> | 375 | <provider selected="true" editor-type-id="text-editor"> |
531 | <state relative-caret-position="1225"> | 376 | <state relative-caret-position="1225"> |
532 | <caret line="58" column="39" lean-forward="false" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" /> | 377 | <caret line="58" column="39" lean-forward="false" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" /> |
533 | - <folding /> | ||
534 | </state> | 378 | </state> |
535 | </provider> | 379 | </provider> |
536 | </entry> | 380 | </entry> |
@@ -573,18 +417,6 @@ | @@ -573,18 +417,6 @@ | ||
573 | <provider selected="true" editor-type-id="text-editor"> | 417 | <provider selected="true" editor-type-id="text-editor"> |
574 | <state relative-caret-position="600"> | 418 | <state relative-caret-position="600"> |
575 | <caret line="215" column="5" lean-forward="true" selection-start-line="215" selection-start-column="5" selection-end-line="215" selection-end-column="5" /> | 419 | <caret line="215" column="5" lean-forward="true" selection-start-line="215" selection-start-column="5" selection-end-line="215" selection-end-column="5" /> |
576 | - <folding> | ||
577 | - <element signature="e#296#1043#0#PHP" expanded="false" /> | ||
578 | - <element signature="e#1049#2092#0#PHP" expanded="false" /> | ||
579 | - <element signature="e#2098#2282#0#PHP" expanded="false" /> | ||
580 | - <element signature="e#2287#2481#0#PHP" expanded="false" /> | ||
581 | - <element signature="e#2487#3661#0#PHP" expanded="false" /> | ||
582 | - <element signature="e#3666#5038#0#PHP" expanded="false" /> | ||
583 | - <element signature="e#5044#5976#0#PHP" expanded="false" /> | ||
584 | - <element signature="e#5981#7115#0#PHP" expanded="false" /> | ||
585 | - <element signature="e#7121#7930#0#PHP" expanded="false" /> | ||
586 | - <element signature="e#7935#8984#0#PHP" expanded="false" /> | ||
587 | - </folding> | ||
588 | </state> | 420 | </state> |
589 | </provider> | 421 | </provider> |
590 | </entry> | 422 | </entry> |
@@ -593,7 +425,6 @@ | @@ -593,7 +425,6 @@ | ||
593 | <provider selected="true" editor-type-id="text-editor"> | 425 | <provider selected="true" editor-type-id="text-editor"> |
594 | <state relative-caret-position="544"> | 426 | <state relative-caret-position="544"> |
595 | <caret line="252" column="62" lean-forward="false" selection-start-line="252" selection-start-column="62" selection-end-line="252" selection-end-column="62" /> | 427 | <caret line="252" column="62" lean-forward="false" selection-start-line="252" selection-start-column="62" selection-end-line="252" selection-end-column="62" /> |
596 | - <folding /> | ||
597 | </state> | 428 | </state> |
598 | </provider> | 429 | </provider> |
599 | </entry> | 430 | </entry> |
@@ -601,64 +432,14 @@ | @@ -601,64 +432,14 @@ | ||
601 | <provider selected="true" editor-type-id="text-editor"> | 432 | <provider selected="true" editor-type-id="text-editor"> |
602 | <state relative-caret-position="1122"> | 433 | <state relative-caret-position="1122"> |
603 | <caret line="104" column="33" lean-forward="true" selection-start-line="104" selection-start-column="33" selection-end-line="104" selection-end-column="33" /> | 434 | <caret line="104" column="33" lean-forward="true" selection-start-line="104" selection-start-column="33" selection-end-line="104" selection-end-column="33" /> |
604 | - <folding> | ||
605 | - <element signature="e#295#463#0#PHP" expanded="false" /> | ||
606 | - <element signature="e#468#777#0#PHP" expanded="false" /> | ||
607 | - <element signature="e#783#949#0#PHP" expanded="false" /> | ||
608 | - <element signature="e#954#1257#0#PHP" expanded="false" /> | ||
609 | - <element signature="e#2999#3363#0#PHP" expanded="false" /> | ||
610 | - <element signature="e#3368#3842#0#PHP" expanded="false" /> | ||
611 | - <element signature="e#3848#4119#0#PHP" expanded="false" /> | ||
612 | - <element signature="e#4124#5057#0#PHP" expanded="false" /> | ||
613 | - <element signature="e#5063#5372#0#PHP" expanded="false" /> | ||
614 | - <element signature="e#5377#5677#0#PHP" expanded="false" /> | ||
615 | - <element signature="e#5687#5966#0#PHP" expanded="false" /> | ||
616 | - <element signature="e#5971#6897#0#PHP" expanded="false" /> | ||
617 | - </folding> | ||
618 | - </state> | ||
619 | - </provider> | ||
620 | - </entry> | ||
621 | - <entry file="file://$PROJECT_DIR$/api/index/controller/CommonController.php"> | ||
622 | - <provider selected="true" editor-type-id="text-editor"> | ||
623 | - <state relative-caret-position="75"> | ||
624 | - <caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> | ||
625 | - <folding /> | ||
626 | </state> | 435 | </state> |
627 | </provider> | 436 | </provider> |
628 | </entry> | 437 | </entry> |
438 | + <entry file="file://$PROJECT_DIR$/api/index/controller/CommonController.php" /> | ||
629 | <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | 439 | <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> |
630 | <provider selected="true" editor-type-id="text-editor"> | 440 | <provider selected="true" editor-type-id="text-editor"> |
631 | <state relative-caret-position="92"> | 441 | <state relative-caret-position="92"> |
632 | <caret line="722" column="29" lean-forward="true" selection-start-line="722" selection-start-column="29" selection-end-line="722" selection-end-column="29" /> | 442 | <caret line="722" column="29" lean-forward="true" selection-start-line="722" selection-start-column="29" selection-end-line="722" selection-end-column="29" /> |
633 | - <folding> | ||
634 | - <element signature="e#346#543#0#PHP" expanded="false" /> | ||
635 | - <element signature="e#548#924#0#PHP" expanded="false" /> | ||
636 | - <element signature="e#930#1221#0#PHP" expanded="false" /> | ||
637 | - <element signature="e#1226#2883#0#PHP" expanded="false" /> | ||
638 | - <element signature="e#2889#3141#0#PHP" expanded="false" /> | ||
639 | - <element signature="e#3146#3601#0#PHP" expanded="false" /> | ||
640 | - <element signature="e#3607#4162#0#PHP" expanded="false" /> | ||
641 | - <element signature="e#4169#5444#0#PHP" expanded="false" /> | ||
642 | - <element signature="e#5450#6170#0#PHP" expanded="false" /> | ||
643 | - <element signature="e#6175#7593#0#PHP" expanded="false" /> | ||
644 | - <element signature="e#7599#8271#0#PHP" expanded="false" /> | ||
645 | - <element signature="e#9868#10726#0#PHP" expanded="false" /> | ||
646 | - <element signature="e#10731#12492#0#PHP" expanded="false" /> | ||
647 | - <element signature="e#15454#16101#0#PHP" expanded="false" /> | ||
648 | - <element signature="e#16106#17544#0#PHP" expanded="false" /> | ||
649 | - <element signature="e#17550#17966#0#PHP" expanded="false" /> | ||
650 | - <element signature="e#17971#18790#0#PHP" expanded="false" /> | ||
651 | - <element signature="e#18795#19473#0#PHP" expanded="false" /> | ||
652 | - <element signature="e#19479#19933#0#PHP" expanded="false" /> | ||
653 | - <element signature="e#19938#20712#0#PHP" expanded="false" /> | ||
654 | - <element signature="e#20718#21224#0#PHP" expanded="false" /> | ||
655 | - <element signature="e#21229#22660#0#PHP" expanded="false" /> | ||
656 | - <element signature="e#22666#22945#0#PHP" expanded="false" /> | ||
657 | - <element signature="e#23398#23632#0#PHP" expanded="false" /> | ||
658 | - <element signature="e#23637#24030#0#PHP" expanded="false" /> | ||
659 | - <element signature="e#24036#24267#0#PHP" expanded="false" /> | ||
660 | - <element signature="e#24272#24630#0#PHP" expanded="false" /> | ||
661 | - </folding> | ||
662 | </state> | 443 | </state> |
663 | </provider> | 444 | </provider> |
664 | </entry> | 445 | </entry> |
@@ -666,30 +447,41 @@ | @@ -666,30 +447,41 @@ | ||
666 | <provider selected="true" editor-type-id="text-editor"> | 447 | <provider selected="true" editor-type-id="text-editor"> |
667 | <state relative-caret-position="205"> | 448 | <state relative-caret-position="205"> |
668 | <caret line="362" column="18" lean-forward="true" selection-start-line="362" selection-start-column="18" selection-end-line="362" selection-end-column="18" /> | 449 | <caret line="362" column="18" lean-forward="true" selection-start-line="362" selection-start-column="18" selection-end-line="362" selection-end-column="18" /> |
669 | - <folding> | ||
670 | - <element signature="e#129#167#0#PHP" expanded="true" /> | ||
671 | - <element signature="e#373#959#0#PHP" expanded="false" /> | ||
672 | - <element signature="e#964#1855#0#PHP" expanded="false" /> | ||
673 | - <element signature="e#1861#2461#0#PHP" expanded="false" /> | ||
674 | - <element signature="e#2466#3609#0#PHP" expanded="false" /> | ||
675 | - <element signature="e#3615#4607#0#PHP" expanded="false" /> | ||
676 | - <element signature="e#4612#5847#0#PHP" expanded="false" /> | ||
677 | - <element signature="e#5853#6462#0#PHP" expanded="false" /> | ||
678 | - <element signature="e#6467#7653#0#PHP" expanded="false" /> | ||
679 | - <element signature="e#7659#8182#0#PHP" expanded="false" /> | ||
680 | - <element signature="e#8187#8720#0#PHP" expanded="false" /> | ||
681 | - <element signature="e#8726#9246#0#PHP" expanded="false" /> | ||
682 | - <element signature="e#9251#9784#0#PHP" expanded="false" /> | ||
683 | - <element signature="e#9790#10057#0#PHP" expanded="false" /> | ||
684 | - <element signature="e#15408#15672#0#PHP" expanded="false" /> | ||
685 | - <element signature="e#15677#18039#0#PHP" expanded="false" /> | ||
686 | - <element signature="e#16884#17290#0#PHP" expanded="false" /> | ||
687 | - <element signature="e#17304#17697#0#PHP" expanded="false" /> | ||
688 | - <element signature="e#17707#18033#0#PHP" expanded="false" /> | ||
689 | - <element signature="e#18046#18490#0#PHP" expanded="false" /> | ||
690 | - <element signature="e#18495#18929#0#PHP" expanded="false" /> | ||
691 | - <element signature="e#18934#19194#0#PHP" expanded="false" /> | ||
692 | - </folding> | 450 | + </state> |
451 | + </provider> | ||
452 | + </entry> | ||
453 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/FinanceController.php"> | ||
454 | + <provider selected="true" editor-type-id="text-editor"> | ||
455 | + <state relative-caret-position="-1125"> | ||
456 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
457 | + </state> | ||
458 | + </provider> | ||
459 | + </entry> | ||
460 | + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"> | ||
461 | + <provider selected="true" editor-type-id="text-editor"> | ||
462 | + <state relative-caret-position="126"> | ||
463 | + <caret line="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="209" selection-end-column="9" /> | ||
464 | + </state> | ||
465 | + </provider> | ||
466 | + </entry> | ||
467 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php"> | ||
468 | + <provider selected="true" editor-type-id="text-editor"> | ||
469 | + <state relative-caret-position="153"> | ||
470 | + <caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" /> | ||
471 | + </state> | ||
472 | + </provider> | ||
473 | + </entry> | ||
474 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/FinancsendController.php"> | ||
475 | + <provider selected="true" editor-type-id="text-editor"> | ||
476 | + <state relative-caret-position="725"> | ||
477 | + <caret line="38" column="63" lean-forward="true" selection-start-line="38" selection-start-column="63" selection-end-line="45" selection-end-column="87" /> | ||
478 | + </state> | ||
479 | + </provider> | ||
480 | + </entry> | ||
481 | + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html"> | ||
482 | + <provider selected="true" editor-type-id="text-editor"> | ||
483 | + <state relative-caret-position="628"> | ||
484 | + <caret line="73" column="31" lean-forward="true" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" /> | ||
693 | </state> | 485 | </state> |
694 | </provider> | 486 | </provider> |
695 | </entry> | 487 | </entry> |
@@ -41,6 +41,81 @@ | @@ -41,6 +41,81 @@ | ||
41 | <div class="pagination">{$page}</div> | 41 | <div class="pagination">{$page}</div> |
42 | </form> | 42 | </form> |
43 | </div> | 43 | </div> |
44 | +<div class="wrap js-check-wrap"> | ||
45 | + <ul class="nav nav-tabs"> | ||
46 | + <li class="active"><a href="#">每日发布数据</a></li> | ||
47 | + </ul> | ||
48 | + <form class="well form-inline margin-top-20" method="post" action="{:url('Financsend/index')}"> | ||
49 | + 时间: | ||
50 | + <input type="text" class="form-control js-bootstrap-date" name="start_time" | ||
51 | + value="{$start_time|default=''}" | ||
52 | + style="width: 140px;" autocomplete="off">- | ||
53 | + <input type="text" class="form-control js-bootstrap-date" name="end_time" | ||
54 | + value="{$end_time|default=''}" | ||
55 | + style="width: 140px;" autocomplete="off"> | ||
56 | + <input type="submit" class="btn btn-primary" value="搜索" /> | ||
57 | + <a class="btn btn-danger" href="{:url('Financsend/index')}">清空</a> | ||
58 | + </form> | ||
59 | + <form class="js-ajax-form" action="" method="post"> | ||
60 | + <div id="main" style="width: 100%;height:400px;"></div> | ||
61 | + </form> | ||
62 | +</div> | ||
44 | <script src="__STATIC__/js/admin.js"></script> | 63 | <script src="__STATIC__/js/admin.js"></script> |
64 | +<script src="__STATIC__/js/echarts/echarts.min.js"></script> | ||
45 | </body> | 65 | </body> |
46 | -</html> | ||
66 | +</html> | ||
67 | +<script> | ||
68 | + var arr = '<?php echo json_encode($list["data"])?>'; | ||
69 | + var data = JSON.parse(arr).reverse(); | ||
70 | + var arr_time = []; | ||
71 | + var num = []; | ||
72 | + $.each(data,function(index,value){ | ||
73 | + arr_time.push(value['create_time']); | ||
74 | + num.push(value['num']); | ||
75 | + }) | ||
76 | + var myChart = echarts.init(document.getElementById('main')); | ||
77 | + var option = { | ||
78 | + title: { | ||
79 | + text: '每日数据' | ||
80 | + }, | ||
81 | + tooltip: { | ||
82 | + trigger: 'axis' | ||
83 | + }, | ||
84 | + legend: { | ||
85 | + data:['融资发布'] | ||
86 | + }, | ||
87 | + grid: { | ||
88 | + left: '3%', | ||
89 | + right: '4%', | ||
90 | + bottom: '3%', | ||
91 | + containLabel: true | ||
92 | + }, | ||
93 | + toolbox: { | ||
94 | + feature: { | ||
95 | + saveAsImage: {} | ||
96 | + } | ||
97 | + }, | ||
98 | + dataZoom: [{ | ||
99 | + type: 'slider', | ||
100 | + show: true, | ||
101 | + xAxisIndex: [0], | ||
102 | + left: '9%', | ||
103 | + bottom: -5, | ||
104 | + start: 10, | ||
105 | + end: 90 //初始化滚动条 | ||
106 | + }], | ||
107 | + xAxis: { | ||
108 | + type: 'category', | ||
109 | + data: arr_time | ||
110 | + }, | ||
111 | + yAxis: { | ||
112 | + type: 'value' | ||
113 | + }, | ||
114 | + series: [{ | ||
115 | + name:'融资发布', | ||
116 | + data:num, | ||
117 | + type: 'line' | ||
118 | + }] | ||
119 | + }; | ||
120 | + myChart.setOption(option); | ||
121 | +</script> |
-
请 注册 或 登录 后发表评论