|
@@ -1,10 +1,12 @@
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
- <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="20210826 15-26">
|
|
|
|
- <change beforePath="$PROJECT_DIR$/css/components.less" beforeDir="false" afterPath="$PROJECT_DIR$/css/components.less" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/index.js" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/js/search.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/search.js" afterDir="false" />
|
|
|
|
|
|
+ <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="">
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/css/search.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/search.css" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/h_exam/exam_detail_s_img.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_detail_s_img.html" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/js/exam_detail_img.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/exam_detail_img.js" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/search.html" beforeDir="false" afterPath="$PROJECT_DIR$/search.html" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -116,8 +118,8 @@
|
|
</usages-collector>
|
|
</usages-collector>
|
|
<usages-collector id="statistics.lifecycle.project">
|
|
<usages-collector id="statistics.lifecycle.project">
|
|
<counts>
|
|
<counts>
|
|
- <entry key="project.open.time.6" value="1" />
|
|
|
|
- <entry key="project.opened" value="1" />
|
|
|
|
|
|
+ <entry key="project.open.time.6" value="2" />
|
|
|
|
+ <entry key="project.opened" value="2" />
|
|
</counts>
|
|
</counts>
|
|
</usages-collector>
|
|
</usages-collector>
|
|
</session>
|
|
</session>
|
|
@@ -168,8 +170,8 @@
|
|
<file pinned="false" current-in-tab="true">
|
|
<file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/css/components.less">
|
|
<entry file="file://$PROJECT_DIR$/css/components.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="231">
|
|
|
|
- <caret line="747" column="7" lean-forward="true" selection-start-line="747" selection-start-column="7" selection-end-line="747" selection-end-column="7" />
|
|
|
|
|
|
+ <state relative-caret-position="198">
|
|
|
|
+ <caret line="746" column="9" lean-forward="true" selection-start-line="746" selection-start-column="9" selection-end-line="746" selection-end-column="9" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -188,7 +190,7 @@
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="231">
|
|
<state relative-caret-position="231">
|
|
- <caret line="7" column="75" lean-forward="true" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
|
|
|
|
+ <caret line="7" column="75" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -264,8 +266,8 @@
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
</component>
|
|
</component>
|
|
<component name="ProjectFrameBounds">
|
|
<component name="ProjectFrameBounds">
|
|
- <option name="x" value="-75" />
|
|
|
|
- <option name="y" value="205" />
|
|
|
|
|
|
+ <option name="x" value="-57" />
|
|
|
|
+ <option name="y" value="121" />
|
|
<option name="width" value="1933" />
|
|
<option name="width" value="1933" />
|
|
<option name="height" value="884" />
|
|
<option name="height" value="884" />
|
|
</component>
|
|
</component>
|
|
@@ -275,7 +277,6 @@
|
|
<foldersAlwaysOnTop value="true" />
|
|
<foldersAlwaysOnTop value="true" />
|
|
</navigator>
|
|
</navigator>
|
|
<panes>
|
|
<panes>
|
|
- <pane id="Scope" />
|
|
|
|
<pane id="ProjectPane">
|
|
<pane id="ProjectPane">
|
|
<subPane>
|
|
<subPane>
|
|
<expand>
|
|
<expand>
|
|
@@ -297,6 +298,7 @@
|
|
<select />
|
|
<select />
|
|
</subPane>
|
|
</subPane>
|
|
</pane>
|
|
</pane>
|
|
|
|
+ <pane id="Scope" />
|
|
</panes>
|
|
</panes>
|
|
</component>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
@@ -316,116 +318,6 @@
|
|
<recent name="E:\examwin\examwin_web\ngk" />
|
|
<recent name="E:\examwin\examwin_web\ngk" />
|
|
</key>
|
|
</key>
|
|
</component>
|
|
</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$/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" />
|
|
|
|
- </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">
|
|
<component name="RunDashboard">
|
|
<option name="ruleStates">
|
|
<option name="ruleStates">
|
|
<list>
|
|
<list>
|
|
@@ -743,14 +635,21 @@
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1629962946597</updated>
|
|
<updated>1629962946597</updated>
|
|
</task>
|
|
</task>
|
|
- <option name="localTasksCounter" value="43" />
|
|
|
|
|
|
+ <task id="LOCAL-00043" summary="20210826 15-26">
|
|
|
|
+ <created>1630031107689</created>
|
|
|
|
+ <option name="number" value="00043" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00043" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1630031107689</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <option name="localTasksCounter" value="44" />
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
- <frame x="-168" y="156" width="1933" height="884" extended-state="0" />
|
|
|
|
|
|
+ <frame x="-57" y="121" width="1933" height="884" extended-state="0" />
|
|
<editor active="true" />
|
|
<editor active="true" />
|
|
<layout>
|
|
<layout>
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17191671" />
|
|
|
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17351842" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -984,14 +883,14 @@
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="231">
|
|
<state relative-caret-position="231">
|
|
- <caret line="7" column="75" lean-forward="true" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
|
|
|
|
+ <caret line="7" column="75" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/components.less">
|
|
<entry file="file://$PROJECT_DIR$/css/components.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="231">
|
|
|
|
- <caret line="747" column="7" lean-forward="true" selection-start-line="747" selection-start-column="7" selection-end-line="747" selection-end-column="7" />
|
|
|
|
|
|
+ <state relative-caret-position="198">
|
|
|
|
+ <caret line="746" column="9" lean-forward="true" selection-start-line="746" selection-start-column="9" selection-end-line="746" selection-end-column="9" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|