郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 b4e42e90f16c2faea766e9cd77607ade1b039218 1 个父辈 6a407aae
1 个管道 的构建 通过 耗费 10 秒

修改图片列表

内嵌 并排对比
正在显示 1 个修改的文件 包含 13 行增加 和 227 行删除
... ... @@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PointController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PointController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -28,8 +27,8 @@
<file leaf-file-name="PointController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="62" column="31" lean-forward="true" selection-start-line="62" selection-start-column="31" selection-end-line="62" selection-end-column="31" />
<state relative-caret-position="200">
<caret line="63" column="16" lean-forward="true" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2477#4124#0#PHP" expanded="false" />
... ... @@ -42,7 +41,7 @@
<file leaf-file-name="add.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<state relative-caret-position="75">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
... ... @@ -138,8 +137,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="221" />
<option name="y" value="103" />
<option name="x" value="194" />
<option name="y" value="71" />
<option name="width" value="1618" />
<option name="height" value="1008" />
</component>
... ... @@ -228,7 +227,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -329,17 +328,18 @@
<workItem from="1575543830603" duration="2980000" />
<workItem from="1575592067577" duration="15900000" />
<workItem from="1575615529386" duration="15578000" />
<workItem from="1575679046292" duration="1048000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="526975000" />
<option name="totallyTimeSpent" value="528023000" />
</component>
<component name="ToolWindowManager">
<frame x="221" y="103" width="1618" height="1008" extended-state="0" />
<frame x="194" y="71" width="1618" height="1008" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23299101" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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" />
<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.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -530,7 +530,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -573,7 +572,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="124" column="20" lean-forward="false" selection-start-line="124" selection-start-column="20" selection-end-line="124" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -581,31 +579,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-82">
<caret line="396" column="31" lean-forward="true" selection-start-line="396" selection-start-column="31" selection-end-line="396" selection-end-column="31" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6248#0#PHP" expanded="false" />
<element signature="e#6254#6572#0#PHP" expanded="false" />
<element signature="e#6577#6953#0#PHP" expanded="false" />
<element signature="e#6959#7314#0#PHP" expanded="false" />
<element signature="e#7319#7728#0#PHP" expanded="false" />
<element signature="e#7734#8119#0#PHP" expanded="false" />
<element signature="e#8124#8795#0#PHP" expanded="false" />
<element signature="e#8801#9247#0#PHP" expanded="false" />
<element signature="e#9252#10103#0#PHP" expanded="false" />
<element signature="e#10109#10379#0#PHP" expanded="false" />
<element signature="e#10384#10860#0#PHP" expanded="false" />
<element signature="e#10866#11496#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -613,7 +586,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -621,7 +593,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -629,7 +600,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
... ... @@ -637,7 +607,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="35" column="31" lean-forward="true" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
... ... @@ -645,7 +614,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="77" column="6" lean-forward="false" selection-start-line="77" selection-start-column="6" selection-end-line="77" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -653,7 +621,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-689">
<caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -661,7 +628,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="686">
<caret line="265" column="0" lean-forward="true" selection-start-line="265" selection-start-column="0" selection-end-line="265" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -669,11 +635,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<folding>
<element signature="e#4053#4327#0#PHP" expanded="false" />
<element signature="e#4346#4809#0#PHP" expanded="false" />
<element signature="e#4839#5271#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -681,20 +642,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
<folding>
<element signature="e#40#78#0#PHP" expanded="true" />
<element signature="e#324#941#0#PHP" expanded="false" />
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
<element signature="e#1855#1936#0#PHP" expanded="false" />
<element signature="e#1941#3993#0#PHP" expanded="false" />
<element signature="e#4000#4023#0#PHP" expanded="false" />
<element signature="e#4028#4287#0#PHP" expanded="false" />
<element signature="e#4294#4343#0#PHP" expanded="false" />
<element signature="e#4348#4776#0#PHP" expanded="false" />
<element signature="e#4783#4847#0#PHP" expanded="false" />
<element signature="e#4852#5588#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -702,19 +649,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="479">
<caret line="125" column="29" lean-forward="false" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
<folding>
<element signature="e#131#162#0#PHP" expanded="true" />
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#2268#3059#0#PHP" expanded="false" />
<element signature="e#3065#3374#0#PHP" expanded="false" />
<element signature="e#3379#5269#0#PHP" expanded="false" />
<element signature="e#5277#5756#0#PHP" expanded="false" />
<element signature="e#5761#6328#0#PHP" expanded="false" />
<element signature="e#6334#6587#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -730,7 +664,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="48" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -738,7 +671,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -757,34 +689,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4637#0#PHP" expanded="false" />
<element signature="e#4643#4956#0#PHP" expanded="false" />
<element signature="e#4961#5336#0#PHP" expanded="false" />
<element signature="e#5342#5694#0#PHP" expanded="false" />
<element signature="e#5699#6107#0#PHP" expanded="false" />
<element signature="e#6113#6495#0#PHP" expanded="false" />
<element signature="e#6500#7170#0#PHP" expanded="false" />
<element signature="e#7176#7619#0#PHP" expanded="false" />
<element signature="e#7624#8474#0#PHP" expanded="false" />
<element signature="e#8480#8747#0#PHP" expanded="false" />
<element signature="e#8752#9227#0#PHP" expanded="false" />
<element signature="e#9233#9783#0#PHP" expanded="false" />
<element signature="e#9788#11648#0#PHP" expanded="false" />
<element signature="e#10208#10435#1#PHP" expanded="false" />
<element signature="e#10465#10696#1#PHP" expanded="false" />
<element signature="e#11654#12021#0#PHP" expanded="false" />
<element signature="e#12026#12466#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -792,72 +696,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="999" column="28" lean-forward="true" selection-start-line="999" selection-start-column="28" selection-end-line="999" selection-end-column="28" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29407#0#PHP" expanded="false" />
<element signature="e#29413#29837#0#PHP" expanded="false" />
<element signature="e#29842#30453#0#PHP" expanded="false" />
<element signature="e#30459#30955#0#PHP" expanded="false" />
<element signature="e#33769#34053#0#PHP" expanded="false" />
<element signature="e#34058#34694#0#PHP" expanded="false" />
<element signature="e#34715#35034#0#PHP" expanded="false" />
<element signature="e#35040#35448#0#PHP" expanded="false" />
<element signature="e#35454#36213#0#PHP" expanded="false" />
<element signature="e#36232#37096#0#PHP" expanded="false" />
<element signature="e#37122#37522#0#PHP" expanded="false" />
<element signature="e#37545#38118#0#PHP" expanded="false" />
<element signature="e#38141#38951#0#PHP" expanded="false" />
<element signature="e#38957#39556#0#PHP" expanded="false" />
<element signature="e#39561#40525#0#PHP" expanded="false" />
<element signature="e#40531#41198#0#PHP" expanded="false" />
<element signature="e#41203#42244#0#PHP" expanded="false" />
<element signature="e#42250#42913#0#PHP" expanded="false" />
<element signature="e#42918#43945#0#PHP" expanded="false" />
<element signature="e#43952#44383#0#PHP" expanded="false" />
<element signature="e#44388#44966#0#PHP" expanded="false" />
<element signature="e#44972#45401#0#PHP" expanded="false" />
<element signature="e#45406#46008#0#PHP" expanded="false" />
<element signature="e#46014#46441#0#PHP" expanded="false" />
<element signature="e#46446#47012#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -865,16 +703,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -882,41 +710,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-89">
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4849#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -924,9 +717,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-593">
<caret line="6" column="18" lean-forward="true" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="18" />
<folding>
<marker date="1536653205906" expanded="true" signature="3029:3053" ph="..." />
</folding>
</state>
</provider>
</entry>
... ... @@ -934,15 +724,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="40" column="34" lean-forward="false" selection-start-line="40" selection-start-column="34" selection-end-line="40" selection-end-column="34" />
<folding>
<element signature="e#1252#1658#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<state relative-caret-position="75">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
... ... @@ -952,14 +739,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="42" column="0" lean-forward="false" selection-start-line="42" selection-start-column="0" selection-end-line="137" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="62" column="31" lean-forward="true" selection-start-line="62" selection-start-column="31" selection-end-line="62" selection-end-column="31" />
<state relative-caret-position="200">
<caret line="63" column="16" lean-forward="true" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2477#4124#0#PHP" expanded="false" />
... ...