webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 e33dfffa8b990ae03a1c5879b6600e3e82ee49d7 1 个父辈 b1825694

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 61 行增加 和 62 行删除
... ... @@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" 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/gonggao.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gonggao.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gonggao.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -65,13 +63,13 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="3487" />
<entry key="html" value="2214" />
<entry key="html" value="2293" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="3487" />
<entry key="HTML" value="2214" />
<entry key="HTML" value="2293" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -97,17 +95,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<state relative-caret-position="432">
<caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
<state relative-caret-position="243">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
</state>
</provider>
</entry>
... ... @@ -121,14 +119,13 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
<state relative-caret-position="243">
<caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -155,8 +152,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<state relative-caret-position="243">
<caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -196,8 +193,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/last.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3753">
<caret line="139" column="24" lean-forward="true" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" />
<state relative-caret-position="162">
<caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
</state>
</provider>
</entry>
... ... @@ -268,9 +265,9 @@
<option value="$PROJECT_DIR$/zhuye.html" />
<option value="$PROJECT_DIR$/css/index2.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/gonggao.css" />
<option value="$PROJECT_DIR$/gonggao.html" />
<option value="$PROJECT_DIR$/index.html" />
</list>
</option>
</component>
... ... @@ -281,10 +278,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="399" />
<option name="y" value="134" />
<option name="x" value="390" />
<option name="y" value="298" />
<option name="width" value="1714" />
<option name="height" value="873" />
<option name="height" value="885" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -358,12 +355,12 @@
<workItem from="1547857140175" duration="1455000" />
<workItem from="1547863520730" duration="3049000" />
<workItem from="1547866625675" duration="2102000" />
<workItem from="1547868960136" duration="801000" />
<workItem from="1547868960136" duration="2258000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55348000" />
<option name="totallyTimeSpent" value="56805000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -375,7 +372,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="507" y="176" width="1714" height="873" extended-state="0" />
<frame x="390" y="298" width="1714" height="885" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12708831" />
... ... @@ -390,7 +387,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 anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29674795" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29066667" />
<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" />
... ... @@ -422,10 +419,33 @@
<entry file="file://$PROJECT_DIR$/css/dropload.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/images/bg_1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<state relative-caret-position="243">
<caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -446,29 +466,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/bg_1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/js/base.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="3753">
<caret line="139" column="24" lean-forward="true" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" />
<state relative-caret-position="162">
<caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
<state relative-caret-position="243">
<caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -486,26 +503,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -18,7 +18,7 @@
<div class="top_anno">
最新公告
</div>
<div class="top_text">
<div class="top_text" onclick="btn_gonggao()">
<p>通知通知通知通知通知通知通通知通知通知通知通知通知通
通知通知通知通知通知通知通通知通知通知通知通知通知通
</p>
... ... @@ -212,6 +212,9 @@
function btn_next() {
window.location.href = "last.html"
}
function btn_gonggao(){
window.location.href = "gonggao.html"
}
// JavaScript Document
//上拉加载
... ...