|
@@ -1,8 +1,10 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="">
|
|
|
+ <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="20210821 8-37 修改">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/js/exam_detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/exam_detail.js" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/js/exam_list.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/exam_list.js" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -293,6 +295,117 @@
|
|
|
<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$/h_exam/exam_detail.html</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/h_news/news_detail.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" />
|
|
|
+ </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>
|
|
@@ -596,7 +709,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1629679058696</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="41" />
|
|
|
+ <task id="LOCAL-00041" summary="20210821 8-37 修改">
|
|
|
+ <created>1629691379090</created>
|
|
|
+ <option name="number" value="00041" />
|
|
|
+ <option name="presentableId" value="LOCAL-00041" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1629691379090</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="42" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|