webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 8227ad3200e70666b0d87975e95a75712891e96d 1 个父辈 69e2fe2a

update

内嵌 并排对比
正在显示 7 个修改的文件 包含 75 行增加 和 76 行删除
... ... @@ -2,16 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/js/jquery.combo.select.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/dksm.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/dksm.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/dkxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/dkxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/xyjc.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/xyjc.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/dkxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/last.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/xyjc.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/first.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/dksm.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/dksm.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/dkxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/dkxq.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/dkxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/last.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/xyjc.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/xyjc.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/xyjc.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/first.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -62,29 +59,32 @@
<counts>
<entry key="project.closed" value="2" />
<entry key="project.open.time.0" value="1" />
<entry key="project.open.time.14" value="1" />
<entry key="project.open.time.18" value="1" />
<entry key="project.opened" value="2" />
<entry key="project.opened" value="3" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="3215" />
<entry key="html" value="1849" />
<entry key="html" value="1853" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="3215" />
<entry key="HTML" value="1849" />
<entry key="HTML" value="1853" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="1" />
<entry key="js" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="1" />
<entry key="JavaScript" value="1" />
</counts>
</usages-collector>
... ... @@ -92,11 +92,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/xyjc.html">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
<state relative-caret-position="81">
<caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
... ... @@ -105,15 +105,6 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/xyjc.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="51" column="28" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/dksm.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
... ... @@ -125,17 +116,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/dksm.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<state relative-caret-position="621">
<caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="92" column="22" lean-forward="true" selection-start-line="92" selection-start-column="22" selection-end-line="92" selection-end-column="22" />
<state relative-caret-position="164">
<caret line="210" column="36" selection-start-line="210" selection-start-column="36" selection-end-line="210" selection-end-column="36" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -162,17 +153,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<state relative-caret-position="3807">
<caret line="141" column="42" lean-forward="true" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/dkxq.html">
<entry file="file://$PROJECT_DIR$/html/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="44" column="60" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="60" />
<state relative-caret-position="189">
<caret line="64" column="22" lean-forward="true" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -194,9 +185,9 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/dkxq.css">
<entry file="file://$PROJECT_DIR$/css/last.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<state relative-caret-position="2187">
<caret line="81" column="4" selection-start-line="81" selection-start-column="4" selection-end-line="83" selection-end-column="21" />
</state>
</provider>
... ... @@ -254,6 +245,9 @@
<option value="$PROJECT_DIR$/css/dkxq.css" />
<option value="$PROJECT_DIR$/css/xyjc.css" />
<option value="$PROJECT_DIR$/html/xyjc.html" />
<option value="$PROJECT_DIR$/css/first.css" />
<option value="$PROJECT_DIR$/html/first.html" />
<option value="$PROJECT_DIR$/html/last.html" />
<option value="$PROJECT_DIR$/html/index.html" />
</list>
</option>
... ... @@ -265,9 +259,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="292" />
<option name="y" value="79" />
<option name="width" value="1075" />
<option name="x" value="235" />
<option name="y" value="85" />
<option name="width" value="1354" />
<option name="height" value="878" />
</component>
<component name="ProjectView">
... ... @@ -275,7 +269,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -297,6 +290,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -339,11 +333,12 @@
<workItem from="1547702489388" duration="15192000" />
<workItem from="1547718617124" duration="4272000" />
<workItem from="1547771777103" duration="22455000" />
<workItem from="1547799045567" duration="191000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="41919000" />
<option name="totallyTimeSpent" value="42110000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -355,9 +350,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="292" y="79" width="1075" height="878" extended-state="0" />
<frame x="235" y="85" width="1354" height="878" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2054002" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" />
<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" />
... ... @@ -369,7 +365,7 @@
<window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32974428" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32974428" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -390,8 +386,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/css/first.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1377">
<caret line="51" column="28" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/dksm.css">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -400,41 +400,50 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/jquery.combo.select.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<entry file="file://$PROJECT_DIR$/html/dksm.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="141" column="42" lean-forward="true" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" />
<state relative-caret-position="621">
<caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/dksm.html">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
<state relative-caret-position="3807">
<caret line="141" column="42" lean-forward="true" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/dkxq.css">
<entry file="file://$PROJECT_DIR$/js/jquery.combo.select.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/css/last.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<state relative-caret-position="2187">
<caret line="81" column="4" selection-start-line="81" selection-start-column="4" selection-end-line="83" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/xyjc.css">
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/css/first.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/html/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="51" column="28" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
<state relative-caret-position="81">
<caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/dkxq.html">
<entry file="file://$PROJECT_DIR$/html/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="44" column="60" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="60" />
<state relative-caret-position="189">
<caret line="64" column="22" lean-forward="true" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -451,8 +460,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="92" column="22" lean-forward="true" selection-start-line="92" selection-start-column="22" selection-end-line="92" selection-end-column="22" />
<state relative-caret-position="164">
<caret line="210" column="36" selection-start-line="210" selection-start-column="36" selection-end-line="210" selection-end-column="36" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -475,15 +484,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/xyjc.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
<link rel="stylesheet" type="text/css" href="../css/xyjc.css">
<link rel="stylesheet" type="text/css" href="../css/first.css">
<script src="../js/base.js"></script>
<script src="../js/jquery.min.js"></script>
</head>
... ...
... ... @@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
<link rel="stylesheet" type="text/css" href="../css/xyjc.css">
<link rel="stylesheet" type="text/css" href="../css/first.css">
<script src="../js/base.js"></script>
<script src="../js/jquery.min.js"></script>
</head>
... ...
... ... @@ -208,7 +208,7 @@
</body>
<script>
function btn_next() {
window.location.href = "dkxq.html"
window.location.href = "last.html"
}
</script>
</html>
... ...
... ... @@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
<link rel="stylesheet" href="//at.alicdn.com/t/font_1022306_gfurfu6tnqq.css">
<link rel="stylesheet" type="text/css" href="../css/dkxq.css">
<link rel="stylesheet" type="text/css" href="../css/last.css">
<script src="../js/base.js"></script>
<script src="../js/jquery.min.js"></script>
<script src="../js/jquery.combo.select.js"></script>
... ...