|
@@ -119,8 +119,8 @@
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="194">
|
|
|
- <caret line="75" column="26" selection-start-line="75" selection-start-column="26" selection-end-line="75" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="275">
|
|
|
+ <caret line="78" column="61" lean-forward="true" selection-start-line="78" selection-start-column="61" selection-end-line="78" selection-end-column="61" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -288,6 +288,121 @@
|
|
|
<recent name="E:\examwin\examwin_web\ngk" />
|
|
|
</key>
|
|
|
</component>
|
|
|
+ <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
|
|
|
+ <UpdatedFiles>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Updated from server" />
|
|
|
+ <option name="myStatusName" value="Changed on server" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="CHANGED_ON_SERVER" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Updated" />
|
|
|
+ <option name="myStatusName" value="Changed" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="UPDATED" />
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/exam_detail.js</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/new_detail.js</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/new_list.js</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/xgk/xgk.html</PATH>
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Created" />
|
|
|
+ <option name="myStatusName" value="Created" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="CREATED" />
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/user_face.png</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/xgk.js</PATH>
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Deleted" />
|
|
|
+ <option name="myStatusName" value="Deleted" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="true" />
|
|
|
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Restored" />
|
|
|
+ <option name="myStatusName" value="Will be restored" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="RESTORED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Modified" />
|
|
|
+ <option name="myStatusName" value="Modified" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MODIFIED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Skipped" />
|
|
|
+ <option name="myStatusName" value="Skipped" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="SKIPPED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged with conflicts" />
|
|
|
+ <option name="myStatusName" value="Will be merged with conflicts" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged with tree conflicts" />
|
|
|
+ <option name="myStatusName" value="Merged with tree conflicts" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged with property conflicts" />
|
|
|
+ <option name="myStatusName" value="Will be merged with property conflicts" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged" />
|
|
|
+ <option name="myStatusName" value="Will be merged" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Not in repository" />
|
|
|
+ <option name="myStatusName" value="Not in repository" />
|
|
|
+ <option name="mySupportsDeletion" value="true" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="UNKNOWN" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Locally added" />
|
|
|
+ <option name="myStatusName" value="Locally added" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="LOCALLY_ADDED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Locally removed" />
|
|
|
+ <option name="myStatusName" value="Locally removed" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="LOCALLY_REMOVED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Switched" />
|
|
|
+ <option name="myStatusName" value="Switched" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="SWITCHED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ </UpdatedFiles>
|
|
|
+ </component>
|
|
|
<component name="RunDashboard">
|
|
|
<option name="ruleStates">
|
|
|
<list>
|
|
@@ -535,14 +650,21 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1629532549107</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="33" />
|
|
|
+ <task id="LOCAL-00033" summary="试卷图片页">
|
|
|
+ <created>1629536288115</created>
|
|
|
+ <option name="number" value="00033" />
|
|
|
+ <option name="presentableId" value="LOCAL-00033" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1629536288115</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="34" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14765458" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14765458" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -553,7 +675,7 @@
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
|
- <window_info anchor="bottom" id="Version Control" order="8" weight="0.29392624" />
|
|
|
+ <window_info active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.29392624" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="11" weight="0.3264642" />
|
|
@@ -769,8 +891,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="194">
|
|
|
- <caret line="75" column="26" selection-start-line="75" selection-start-column="26" selection-end-line="75" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="275">
|
|
|
+ <caret line="78" column="61" lean-forward="true" selection-start-line="78" selection-start-column="61" selection-end-line="78" selection-end-column="61" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|