|
@@ -3,7 +3,7 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<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$/h_news/news_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_news/news_list.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/h_exam/exam_detail_img.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_detail_img.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/js/new_list.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/new_list.js" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -16,45 +16,48 @@
|
|
|
<session id="739377457">
|
|
|
<usages-collector id="statistics.lifecycle.project">
|
|
|
<counts>
|
|
|
- <entry key="project.closed" value="10" />
|
|
|
+ <entry key="project.closed" value="11" />
|
|
|
<entry key="project.open.time.0" value="2" />
|
|
|
<entry key="project.open.time.1" value="2" />
|
|
|
+ <entry key="project.open.time.11" value="1" />
|
|
|
<entry key="project.open.time.2" value="1" />
|
|
|
<entry key="project.open.time.6" value="1" />
|
|
|
<entry key="project.open.time.8" value="2" />
|
|
|
<entry key="project.open.time.9" value="1" />
|
|
|
- <entry key="project.opened" value="9" />
|
|
|
+ <entry key="project.opened" value="10" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
<usages-collector id="statistics.file.extensions.open">
|
|
|
<counts>
|
|
|
<entry key="33" value="1" />
|
|
|
<entry key="gitignore" value="2" />
|
|
|
- <entry key="html" value="20" />
|
|
|
+ <entry key="html" value="22" />
|
|
|
<entry key="ico" value="1" />
|
|
|
- <entry key="js" value="1" />
|
|
|
- <entry key="png" value="11" />
|
|
|
+ <entry key="js" value="2" />
|
|
|
+ <entry key="png" value="14" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
<usages-collector id="statistics.file.types.open">
|
|
|
<counts>
|
|
|
- <entry key="HTML" value="20" />
|
|
|
- <entry key="Image" value="12" />
|
|
|
- <entry key="JavaScript" value="1" />
|
|
|
+ <entry key="HTML" value="22" />
|
|
|
+ <entry key="Image" value="15" />
|
|
|
+ <entry key="JavaScript" value="2" />
|
|
|
<entry key="PLAIN_TEXT" value="3" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
<usages-collector id="statistics.file.extensions.edit">
|
|
|
<counts>
|
|
|
<entry key="gitignore" value="7" />
|
|
|
- <entry key="html" value="186" />
|
|
|
- <entry key="txt" value="54" />
|
|
|
+ <entry key="html" value="195" />
|
|
|
+ <entry key="js" value="8" />
|
|
|
+ <entry key="txt" value="68" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
<usages-collector id="statistics.file.types.edit">
|
|
|
<counts>
|
|
|
- <entry key="HTML" value="186" />
|
|
|
- <entry key="PLAIN_TEXT" value="61" />
|
|
|
+ <entry key="HTML" value="195" />
|
|
|
+ <entry key="JavaScript" value="8" />
|
|
|
+ <entry key="PLAIN_TEXT" value="75" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
</session>
|
|
@@ -92,92 +95,86 @@
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
</session>
|
|
|
- <session id="-1918643531">
|
|
|
- <usages-collector id="statistics.lifecycle.project">
|
|
|
- <counts>
|
|
|
- <entry key="project.open.time.23" value="1" />
|
|
|
- <entry key="project.opened" value="1" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.file.extensions.edit">
|
|
|
- <counts>
|
|
|
- <entry key="txt" value="14" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.file.types.edit">
|
|
|
- <counts>
|
|
|
- <entry key="PLAIN_TEXT" value="14" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- </session>
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="99">
|
|
|
- <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
|
|
|
+ <state relative-caret-position="1647">
|
|
|
+ <caret line="61" column="16" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#i#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#5;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/imgs/msg.png">
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="4104">
|
|
|
+ <caret line="152" column="16" selection-start-line="152" selection-start-column="16" selection-end-line="152" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#i#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#0;n#p#0;n#div#0;n#div#5;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/h_news/news_list.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_img.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="297">
|
|
|
- <caret line="9" column="75" selection-start-line="9" selection-start-column="75" selection-end-line="9" selection-end-column="75" />
|
|
|
+ <state relative-caret-position="227">
|
|
|
+ <caret line="77" column="23" lean-forward="true" selection-start-line="77" selection-start-column="23" selection-end-line="77" selection-end-column="23" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#3921#3927#0" expanded="true" />
|
|
|
+ <element signature="e#3927#3933#0" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#4;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_news/news_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="198">
|
|
|
- <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
|
|
|
+ <state relative-caret-position="189">
|
|
|
+ <caret line="59" column="52" lean-forward="true" selection-start-line="59" selection-start-column="52" selection-end-line="59" selection-end-column="52" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/css/components.less">
|
|
|
+ <entry file="file://$PROJECT_DIR$/js/new_list.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="561">
|
|
|
- <caret line="761" column="45" selection-start-line="761" selection-start-column="45" selection-end-line="761" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="108">
|
|
|
+ <caret line="25" column="53" lean-forward="true" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_detail.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_img.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state relative-caret-position="405">
|
|
|
+ <caret line="15" column="57" selection-start-line="15" selection-start-column="57" selection-end-line="15" selection-end-column="57" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -204,6 +201,7 @@
|
|
|
<find>郑州燎原计算机技术有限公司</find>
|
|
|
<find>_blank</find>
|
|
|
<find>zzliaoyuan.com</find>
|
|
|
+ <find>评论</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>http://gaokaoapp.net</replace>
|
|
@@ -223,11 +221,13 @@
|
|
|
<option value="$PROJECT_DIR$/33" />
|
|
|
<option value="$PROJECT_DIR$/xgk/xgk.html" />
|
|
|
<option value="$PROJECT_DIR$/.gitignore" />
|
|
|
- <option value="$PROJECT_DIR$/h_news/news_list.html" />
|
|
|
<option value="$PROJECT_DIR$/index.html" />
|
|
|
<option value="$PROJECT_DIR$/h_exam/404.html" />
|
|
|
- <option value="$PROJECT_DIR$/h_exam/exam_detail.html" />
|
|
|
<option value="$PROJECT_DIR$/h_news/news_detail.html" />
|
|
|
+ <option value="$PROJECT_DIR$/h_exam/exam_detail.html" />
|
|
|
+ <option value="$PROJECT_DIR$/h_news/news_list.html" />
|
|
|
+ <option value="$PROJECT_DIR$/js/new_list.js" />
|
|
|
+ <option value="$PROJECT_DIR$/h_exam/exam_detail_img.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -237,11 +237,11 @@
|
|
|
<detection-done>true</detection-done>
|
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds">
|
|
|
- <option name="x" value="-17" />
|
|
|
- <option name="y" value="57" />
|
|
|
+ <component name="ProjectFrameBounds" extendedState="6">
|
|
|
+ <option name="x" value="-7" />
|
|
|
+ <option name="y" value="1" />
|
|
|
<option name="width" value="1933" />
|
|
|
- <option name="height" value="899" />
|
|
|
+ <option name="height" value="1046" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
@@ -249,28 +249,38 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
|
<path>
|
|
|
- <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
- <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="h_exam" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
- <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="h_exam" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="h_news" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="imgs" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="js" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
@@ -282,13 +292,133 @@
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
- <recent name="E:\examwin\examwin_web\h_exam" />
|
|
|
- <recent name="E:\examwin\examwin_web" />
|
|
|
<recent name="E:\examwin\examwin_web\imgs" />
|
|
|
<recent name="E:\examwin\examwin_web\h_news" />
|
|
|
+ <recent name="E:\examwin\examwin_web\h_exam" />
|
|
|
+ <recent name="E:\examwin\examwin_web" />
|
|
|
<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$/css/components.css</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/css/components.less</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_detail_img.css</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_detail_img.less</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/h_exam/exam_detail_img.html</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/components.js</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/exam_detail_img.js</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/js/new_list.js</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/back.png</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/jia.png</PATH>
|
|
|
+ <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/jian.png</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>
|
|
@@ -452,34 +582,49 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1629344284315</updated>
|
|
|
</task>
|
|
|
- <task id="LOCAL-00021" summary="footer">
|
|
|
- <created>1629362402814</created>
|
|
|
+ <task id="LOCAL-00021" summary="评论">
|
|
|
+ <created>1629352713427</created>
|
|
|
<option name="number" value="00021" />
|
|
|
<option name="presentableId" value="LOCAL-00021" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
- <updated>1629362402815</updated>
|
|
|
+ <updated>1629352713427</updated>
|
|
|
</task>
|
|
|
- <task id="LOCAL-00022" summary="footer">
|
|
|
- <created>1629426817219</created>
|
|
|
+ <task id="LOCAL-00022" summary="评论">
|
|
|
+ <created>1629353050541</created>
|
|
|
<option name="number" value="00022" />
|
|
|
<option name="presentableId" value="LOCAL-00022" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
- <updated>1629426817219</updated>
|
|
|
+ <updated>1629353050541</updated>
|
|
|
</task>
|
|
|
- <task id="LOCAL-00023" summary="20210820 11-30">
|
|
|
- <created>1629430176437</created>
|
|
|
+ <task id="LOCAL-00023" summary="试卷图片页,删除多余功能">
|
|
|
+ <created>1629356799091</created>
|
|
|
<option name="number" value="00023" />
|
|
|
<option name="presentableId" value="LOCAL-00023" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
- <updated>1629430176437</updated>
|
|
|
+ <updated>1629356799091</updated>
|
|
|
+ </task>
|
|
|
+ <task id="LOCAL-00024" summary="试卷图片页">
|
|
|
+ <created>1629360268479</created>
|
|
|
+ <option name="number" value="00024" />
|
|
|
+ <option name="presentableId" value="LOCAL-00024" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1629360268479</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="24" />
|
|
|
+ <task id="LOCAL-00025" summary="试卷图片页">
|
|
|
+ <created>1629425698609</created>
|
|
|
+ <option name="number" value="00025" />
|
|
|
+ <option name="presentableId" value="LOCAL-00025" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1629425698609</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="26" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-17" y="57" width="1933" height="899" extended-state="0" />
|
|
|
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
+ <editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16390817" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14285715" />
|
|
|
<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" />
|
|
@@ -490,7 +635,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 active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.3124183" />
|
|
|
+ <window_info active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.4370933" />
|
|
|
<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" />
|
|
@@ -578,8 +723,10 @@
|
|
|
<MESSAGE value="index 暂时删除热门专题" />
|
|
|
<MESSAGE value="index 资讯专题" />
|
|
|
<MESSAGE value="footer" />
|
|
|
- <MESSAGE value="20210820 11-30" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="20210820 11-30" />
|
|
|
+ <MESSAGE value="评论" />
|
|
|
+ <MESSAGE value="试卷图片页,删除多余功能" />
|
|
|
+ <MESSAGE value="试卷图片页" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="试卷图片页" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/h_news/new_detail.html" />
|
|
@@ -598,10 +745,20 @@
|
|
|
<entry file="file://$PROJECT_DIR$/imgs/app_dowload.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/33" />
|
|
|
<entry file="file://$PROJECT_DIR$/imgs/bg.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="2646">
|
|
|
+ <caret line="98" column="83" selection-start-line="98" selection-start-column="83" selection-end-line="98" selection-end-column="83" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/js/components.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="108">
|
|
@@ -609,6 +766,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1647">
|
|
|
+ <caret line="61" column="30" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="108">
|
|
@@ -616,9 +780,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/imgs/app.png">
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/imgs/404.png" />
|
|
|
<entry file="file://$PROJECT_DIR$/h_exam/404.html" />
|
|
|
<entry file="file://$PROJECT_DIR$/404.html">
|
|
@@ -628,57 +789,73 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1647">
|
|
|
+ <caret line="61" column="16" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#i#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#5;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/imgs/msg.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="99">
|
|
|
- <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
|
|
|
+ <state relative-caret-position="4104">
|
|
|
+ <caret line="152" column="16" selection-start-line="152" selection-start-column="16" selection-end-line="152" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#i#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#0;n#p#0;n#div#0;n#div#5;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
|
|
|
+ <state relative-caret-position="405">
|
|
|
+ <caret line="15" column="57" selection-start-line="15" selection-start-column="57" selection-end-line="15" selection-end-column="57" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
|
|
|
+ <entry file="file://$PROJECT_DIR$/imgs/app.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/h_news/news_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="297">
|
|
|
- <caret line="9" column="75" selection-start-line="9" selection-start-column="75" selection-end-line="9" selection-end-column="75" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="198">
|
|
|
- <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
|
|
|
+ <state relative-caret-position="189">
|
|
|
+ <caret line="59" column="52" lean-forward="true" selection-start-line="59" selection-start-column="52" selection-end-line="59" selection-end-column="52" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;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$/h_exam/exam_detail.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_detail_img.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state relative-caret-position="227">
|
|
|
+ <caret line="77" column="23" lean-forward="true" selection-start-line="77" selection-start-column="23" selection-end-line="77" selection-end-column="23" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#3921#3927#0" expanded="true" />
|
|
|
+ <element signature="e#3927#3933#0" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#4;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/css/components.less">
|
|
|
+ <entry file="file://$PROJECT_DIR$/js/new_list.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="561">
|
|
|
- <caret line="761" column="45" selection-start-line="761" selection-start-column="45" selection-end-line="761" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="108">
|
|
|
+ <caret line="25" column="53" lean-forward="true" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|