| xqd
@@ -2,7 +2,6 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="48d0ff53-55ef-4dc1-b933-ea0452e70874" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change beforePath="$PROJECT_DIR$/pages/Engineering/creat_goods.html" afterPath="$PROJECT_DIR$/pages/Engineering/creat_goods.html" />
|
|
|
<change beforePath="$PROJECT_DIR$/pages/Engineering/creat_table.html" afterPath="$PROJECT_DIR$/pages/Engineering/creat_table.html" />
|
| xqd
@@ -74,8 +73,8 @@
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/pages/home/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1623">
|
|
|
- <caret line="120" column="15" lean-forward="true" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
|
|
|
+ <state relative-caret-position="2760">
|
|
|
+ <caret line="120" column="15" lean-forward="false" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -84,7 +83,7 @@
|
|
|
<file leaf-file-name="creat_table.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/pages/Engineering/creat_table.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
+ <state relative-caret-position="4899">
|
|
|
<caret line="213" column="82" lean-forward="false" selection-start-line="213" selection-start-column="82" selection-end-line="213" selection-end-column="82" />
|
|
|
<folding />
|
|
|
</state>
|
| xqd
@@ -94,8 +93,8 @@
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/pages/Engineering/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-86">
|
|
|
- <caret line="207" column="32" lean-forward="true" selection-start-line="207" selection-start-column="32" selection-end-line="207" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="4761">
|
|
|
+ <caret line="207" column="32" lean-forward="false" selection-start-line="207" selection-start-column="32" selection-end-line="207" selection-end-column="32" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -104,8 +103,8 @@
|
|
|
<file leaf-file-name="creat_goods.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/pages/Engineering/creat_goods.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="397">
|
|
|
- <caret line="368" column="77" lean-forward="false" selection-start-line="368" selection-start-column="77" selection-end-line="368" selection-end-column="77" />
|
|
|
+ <state relative-caret-position="1712">
|
|
|
+ <caret line="373" column="0" lean-forward="true" selection-start-line="373" selection-start-column="0" selection-end-line="373" selection-end-column="0" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
| xqd
@@ -134,10 +133,12 @@
|
|
|
<findStrings>
|
|
|
<find>物机部</find>
|
|
|
<find>/creat_goods.html</find>
|
|
|
+ <find>物资部</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>物资部</replace>
|
|
|
<replace>creat_goods.html</replace>
|
|
|
+ <replace>物机部</replace>
|
|
|
</replaceStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
| xqd
@@ -167,10 +168,10 @@
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="1911" />
|
|
|
+ <option name="x" value="-9" />
|
|
|
<option name="y" value="-9" />
|
|
|
- <option name="width" value="2578" />
|
|
|
- <option name="height" value="1408" />
|
|
|
+ <option name="width" value="1938" />
|
|
|
+ <option name="height" value="1048" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
| xqd
@@ -188,6 +189,7 @@
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
<pane id="Scope" />
|
|
|
+ <pane id="Scratches" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
| xqd
@@ -233,11 +235,10 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scratches" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../s1/xcx" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="js.buildTools.grunt.grunt-cli.package" value="" />
|
|
|
<property name="HbShouldOpenHtmlAsHb" value="" />
|
| xqd
@@ -322,12 +323,13 @@
|
|
|
<workItem from="1519354827055" duration="272000" />
|
|
|
<workItem from="1519355131731" duration="701000" />
|
|
|
<workItem from="1529560185275" duration="3723000" />
|
|
|
- <workItem from="1529633170514" duration="2390000" />
|
|
|
+ <workItem from="1529633170514" duration="2987000" />
|
|
|
+ <workItem from="1529889162420" duration="1914000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="7602000" />
|
|
|
+ <option name="totallyTimeSpent" value="10113000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
| xqd
@@ -339,15 +341,16 @@
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="1911" y="-9" width="2578" height="1408" extended-state="6" />
|
|
|
+ <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
|
|
|
<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.15390626" sideWeight="0.4978701" order="0" side_tool="true" content_ui="combo" x="1949" y="69" width="935" height="137" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20520833" sideWeight="0.4978701" order="0" side_tool="true" content_ui="combo" x="1949" y="69" width="935" height="137" />
|
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.4978701" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Grunt " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960597" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.21283785" sideWeight="0.5021299" order="7" side_tool="true" content_ui="tabs" x="1408" y="502" width="1878" height="189" />
|
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24453124" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Version Control" 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="false" content_ui="tabs" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" x="2052" y="204" width="469" height="751" />
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.4978701" order="7" side_tool="false" content_ui="tabs" />
|
| xqd
@@ -358,7 +361,6 @@
|
|
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
|
- <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
</layout>
|
| xqd
@@ -382,6 +384,53 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
+ <entry file="file://$PROJECT_DIR$/pages/home/index.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="2760">
|
|
|
+ <caret line="120" column="15" lean-forward="true" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/pages/Engineering/creat_table.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="4899">
|
|
|
+ <caret line="213" column="82" lean-forward="false" selection-start-line="213" selection-start-column="82" selection-end-line="213" selection-end-column="82" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/pages/Engineering/index.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="4761">
|
|
|
+ <caret line="207" column="32" lean-forward="true" selection-start-line="207" selection-start-column="32" selection-end-line="207" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/pages/header/header.html">
|
|
|
+ <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>
|
|
|
+ <entry file="file://$PROJECT_DIR$/pages/Engineering/creat_goods.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="8464">
|
|
|
+ <caret line="368" column="77" lean-forward="false" selection-start-line="368" selection-start-column="77" selection-end-line="368" selection-end-column="77" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#input#0;n#td#9;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#input#0;n#td#9;n#tr#2;n#tbody#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#input#0;n#td#9;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#input#0;n#td#9;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/pages/home/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
| xqd
@@ -422,7 +471,7 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/pages/Engineering/creat_table.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
+ <state relative-caret-position="4899">
|
|
|
<caret line="213" column="82" lean-forward="false" selection-start-line="213" selection-start-column="82" selection-end-line="213" selection-end-column="82" />
|
|
|
<folding />
|
|
|
</state>
|
| xqd
@@ -430,24 +479,24 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/pages/Engineering/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-86">
|
|
|
- <caret line="207" column="32" lean-forward="true" selection-start-line="207" selection-start-column="32" selection-end-line="207" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="4761">
|
|
|
+ <caret line="207" column="32" lean-forward="false" selection-start-line="207" selection-start-column="32" selection-end-line="207" selection-end-column="32" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/pages/home/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1623">
|
|
|
- <caret line="120" column="15" lean-forward="true" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
|
|
|
+ <state relative-caret-position="2760">
|
|
|
+ <caret line="120" column="15" lean-forward="false" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/pages/Engineering/creat_goods.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="397">
|
|
|
- <caret line="368" column="77" lean-forward="false" selection-start-line="368" selection-start-column="77" selection-end-line="368" selection-end-column="77" />
|
|
|
+ <state relative-caret-position="1712">
|
|
|
+ <caret line="373" column="0" lean-forward="true" selection-start-line="373" selection-start-column="0" selection-end-line="373" selection-end-column="0" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#0;n#section#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|