作者 乔爽

update

@@ -2,9 +2,7 @@ @@ -2,9 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment=""> 4 <list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">
5 - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/css/gonggao.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gonggao.css" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/gonggao.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
8 </list> 6 </list>
9 <ignored path="$PROJECT_DIR$/.tmp/" /> 7 <ignored path="$PROJECT_DIR$/.tmp/" />
10 <ignored path="$PROJECT_DIR$/temp/" /> 8 <ignored path="$PROJECT_DIR$/temp/" />
@@ -65,13 +63,13 @@ @@ -65,13 +63,13 @@
65 <usages-collector id="statistics.file.extensions.edit"> 63 <usages-collector id="statistics.file.extensions.edit">
66 <counts> 64 <counts>
67 <entry key="css" value="3487" /> 65 <entry key="css" value="3487" />
68 - <entry key="html" value="2214" /> 66 + <entry key="html" value="2293" />
69 </counts> 67 </counts>
70 </usages-collector> 68 </usages-collector>
71 <usages-collector id="statistics.file.types.edit"> 69 <usages-collector id="statistics.file.types.edit">
72 <counts> 70 <counts>
73 <entry key="CSS" value="3487" /> 71 <entry key="CSS" value="3487" />
74 - <entry key="HTML" value="2214" /> 72 + <entry key="HTML" value="2293" />
75 </counts> 73 </counts>
76 </usages-collector> 74 </usages-collector>
77 <usages-collector id="statistics.file.extensions.open"> 75 <usages-collector id="statistics.file.extensions.open">
@@ -97,17 +95,17 @@ @@ -97,17 +95,17 @@
97 <file pinned="false" current-in-tab="false"> 95 <file pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/gonggao.html"> 96 <entry file="file://$PROJECT_DIR$/gonggao.html">
99 <provider selected="true" editor-type-id="text-editor"> 97 <provider selected="true" editor-type-id="text-editor">
100 - <state relative-caret-position="108"> 98 + <state relative-caret-position="432">
101 <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" /> 99 <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
102 </state> 100 </state>
103 </provider> 101 </provider>
104 </entry> 102 </entry>
105 </file> 103 </file>
106 - <file pinned="false" current-in-tab="true"> 104 + <file pinned="false" current-in-tab="false">
107 <entry file="file://$PROJECT_DIR$/css/gonggao.css"> 105 <entry file="file://$PROJECT_DIR$/css/gonggao.css">
108 <provider selected="true" editor-type-id="text-editor"> 106 <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="216">  
110 - <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" /> 107 + <state relative-caret-position="243">
  108 + <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
111 </state> 109 </state>
112 </provider> 110 </provider>
113 </entry> 111 </entry>
@@ -121,14 +119,13 @@ @@ -121,14 +119,13 @@
121 </provider> 119 </provider>
122 </entry> 120 </entry>
123 </file> 121 </file>
124 - <file pinned="false" current-in-tab="false"> 122 + <file pinned="false" current-in-tab="true">
125 <entry file="file://$PROJECT_DIR$/index.html"> 123 <entry file="file://$PROJECT_DIR$/index.html">
126 <provider selected="true" editor-type-id="text-editor"> 124 <provider selected="true" editor-type-id="text-editor">
127 - <state relative-caret-position="54">  
128 - <caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" /> 125 + <state relative-caret-position="243">
  126 + <caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
129 <folding> 127 <folding>
130 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 128 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
131 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
132 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 129 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
133 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 130 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
134 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 131 <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 @@ @@ -155,8 +152,8 @@
155 <file pinned="false" current-in-tab="false"> 152 <file pinned="false" current-in-tab="false">
156 <entry file="file://$PROJECT_DIR$/last.html"> 153 <entry file="file://$PROJECT_DIR$/last.html">
157 <provider selected="true" editor-type-id="text-editor"> 154 <provider selected="true" editor-type-id="text-editor">
158 - <state relative-caret-position="405">  
159 - <caret line="15" selection-start-line="15" selection-end-line="16" /> 155 + <state relative-caret-position="243">
  156 + <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
160 <folding> 157 <folding>
161 <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" /> 158 <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" />
162 <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" /> 159 <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 @@ @@ -196,8 +193,8 @@
196 <file pinned="false" current-in-tab="false"> 193 <file pinned="false" current-in-tab="false">
197 <entry file="file://$PROJECT_DIR$/css/last.css"> 194 <entry file="file://$PROJECT_DIR$/css/last.css">
198 <provider selected="true" editor-type-id="text-editor"> 195 <provider selected="true" editor-type-id="text-editor">
199 - <state relative-caret-position="3753">  
200 - <caret line="139" column="24" lean-forward="true" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" /> 196 + <state relative-caret-position="162">
  197 + <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
201 </state> 198 </state>
202 </provider> 199 </provider>
203 </entry> 200 </entry>
@@ -268,9 +265,9 @@ @@ -268,9 +265,9 @@
268 <option value="$PROJECT_DIR$/zhuye.html" /> 265 <option value="$PROJECT_DIR$/zhuye.html" />
269 <option value="$PROJECT_DIR$/css/index2.css" /> 266 <option value="$PROJECT_DIR$/css/index2.css" />
270 <option value="$PROJECT_DIR$/css/index.css" /> 267 <option value="$PROJECT_DIR$/css/index.css" />
271 - <option value="$PROJECT_DIR$/index.html" />  
272 <option value="$PROJECT_DIR$/css/gonggao.css" /> 268 <option value="$PROJECT_DIR$/css/gonggao.css" />
273 <option value="$PROJECT_DIR$/gonggao.html" /> 269 <option value="$PROJECT_DIR$/gonggao.html" />
  270 + <option value="$PROJECT_DIR$/index.html" />
274 </list> 271 </list>
275 </option> 272 </option>
276 </component> 273 </component>
@@ -281,10 +278,10 @@ @@ -281,10 +278,10 @@
281 <sorting>DEFINITION_ORDER</sorting> 278 <sorting>DEFINITION_ORDER</sorting>
282 </component> 279 </component>
283 <component name="ProjectFrameBounds"> 280 <component name="ProjectFrameBounds">
284 - <option name="x" value="399" />  
285 - <option name="y" value="134" /> 281 + <option name="x" value="390" />
  282 + <option name="y" value="298" />
286 <option name="width" value="1714" /> 283 <option name="width" value="1714" />
287 - <option name="height" value="873" /> 284 + <option name="height" value="885" />
288 </component> 285 </component>
289 <component name="ProjectView"> 286 <component name="ProjectView">
290 <navigator proportions="" version="1"> 287 <navigator proportions="" version="1">
@@ -358,12 +355,12 @@ @@ -358,12 +355,12 @@
358 <workItem from="1547857140175" duration="1455000" /> 355 <workItem from="1547857140175" duration="1455000" />
359 <workItem from="1547863520730" duration="3049000" /> 356 <workItem from="1547863520730" duration="3049000" />
360 <workItem from="1547866625675" duration="2102000" /> 357 <workItem from="1547866625675" duration="2102000" />
361 - <workItem from="1547868960136" duration="801000" /> 358 + <workItem from="1547868960136" duration="2258000" />
362 </task> 359 </task>
363 <servers /> 360 <servers />
364 </component> 361 </component>
365 <component name="TimeTrackingManager"> 362 <component name="TimeTrackingManager">
366 - <option name="totallyTimeSpent" value="55348000" /> 363 + <option name="totallyTimeSpent" value="56805000" />
367 </component> 364 </component>
368 <component name="TodoView"> 365 <component name="TodoView">
369 <todo-panel id="selected-file"> 366 <todo-panel id="selected-file">
@@ -375,7 +372,7 @@ @@ -375,7 +372,7 @@
375 </todo-panel> 372 </todo-panel>
376 </component> 373 </component>
377 <component name="ToolWindowManager"> 374 <component name="ToolWindowManager">
378 - <frame x="507" y="176" width="1714" height="873" extended-state="0" /> 375 + <frame x="390" y="298" width="1714" height="885" extended-state="0" />
379 <editor active="true" /> 376 <editor active="true" />
380 <layout> 377 <layout>
381 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12708831" /> 378 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12708831" />
@@ -390,7 +387,7 @@ @@ -390,7 +387,7 @@
390 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" /> 387 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
391 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 388 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
392 <window_info anchor="bottom" id="Version Control" order="8" /> 389 <window_info anchor="bottom" id="Version Control" order="8" />
393 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29674795" /> 390 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29066667" />
394 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 391 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
395 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 392 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
396 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 393 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -422,10 +419,33 @@ @@ -422,10 +419,33 @@
422 <entry file="file://$PROJECT_DIR$/css/dropload.css"> 419 <entry file="file://$PROJECT_DIR$/css/dropload.css">
423 <provider selected="true" editor-type-id="text-editor" /> 420 <provider selected="true" editor-type-id="text-editor" />
424 </entry> 421 </entry>
  422 + <entry file="file://$PROJECT_DIR$/images/bg_1.png">
  423 + <provider selected="true" editor-type-id="images" />
  424 + </entry>
  425 + <entry file="file://$PROJECT_DIR$/js/base.js">
  426 + <provider selected="true" editor-type-id="text-editor" />
  427 + </entry>
  428 + <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
  429 + <provider selected="true" editor-type-id="images" />
  430 + </entry>
  431 + <entry file="file://$PROJECT_DIR$/css/index.css">
  432 + <provider selected="true" editor-type-id="text-editor">
  433 + <state relative-caret-position="189">
  434 + <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
  435 + </state>
  436 + </provider>
  437 + </entry>
  438 + <entry file="file://$PROJECT_DIR$/css/gonggao.css">
  439 + <provider selected="true" editor-type-id="text-editor">
  440 + <state relative-caret-position="243">
  441 + <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
  442 + </state>
  443 + </provider>
  444 + </entry>
425 <entry file="file://$PROJECT_DIR$/last.html"> 445 <entry file="file://$PROJECT_DIR$/last.html">
426 <provider selected="true" editor-type-id="text-editor"> 446 <provider selected="true" editor-type-id="text-editor">
427 - <state relative-caret-position="405">  
428 - <caret line="15" selection-start-line="15" selection-end-line="16" /> 447 + <state relative-caret-position="243">
  448 + <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
429 <folding> 449 <folding>
430 <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" /> 450 <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" />
431 <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" /> 451 <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 @@ @@ -446,29 +466,26 @@
446 </state> 466 </state>
447 </provider> 467 </provider>
448 </entry> 468 </entry>
449 - <entry file="file://$PROJECT_DIR$/images/bg_1.png">  
450 - <provider selected="true" editor-type-id="images" />  
451 - </entry>  
452 - <entry file="file://$PROJECT_DIR$/js/base.js">  
453 - <provider selected="true" editor-type-id="text-editor" />  
454 - </entry>  
455 <entry file="file://$PROJECT_DIR$/css/last.css"> 469 <entry file="file://$PROJECT_DIR$/css/last.css">
456 <provider selected="true" editor-type-id="text-editor"> 470 <provider selected="true" editor-type-id="text-editor">
457 - <state relative-caret-position="3753">  
458 - <caret line="139" column="24" lean-forward="true" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" /> 471 + <state relative-caret-position="162">
  472 + <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
459 </state> 473 </state>
460 </provider> 474 </provider>
461 </entry> 475 </entry>
462 - <entry file="file://$PROJECT_DIR$/images/bg2_2.png">  
463 - <provider selected="true" editor-type-id="images" /> 476 + <entry file="file://$PROJECT_DIR$/gonggao.html">
  477 + <provider selected="true" editor-type-id="text-editor">
  478 + <state relative-caret-position="432">
  479 + <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
  480 + </state>
  481 + </provider>
464 </entry> 482 </entry>
465 <entry file="file://$PROJECT_DIR$/index.html"> 483 <entry file="file://$PROJECT_DIR$/index.html">
466 <provider selected="true" editor-type-id="text-editor"> 484 <provider selected="true" editor-type-id="text-editor">
467 - <state relative-caret-position="54">  
468 - <caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" /> 485 + <state relative-caret-position="243">
  486 + <caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
469 <folding> 487 <folding>
470 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 488 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
471 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
472 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 489 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
473 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 490 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
474 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 491 <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 @@ @@ -486,26 +503,5 @@
486 </state> 503 </state>
487 </provider> 504 </provider>
488 </entry> 505 </entry>
489 - <entry file="file://$PROJECT_DIR$/css/index.css">  
490 - <provider selected="true" editor-type-id="text-editor">  
491 - <state relative-caret-position="189">  
492 - <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />  
493 - </state>  
494 - </provider>  
495 - </entry>  
496 - <entry file="file://$PROJECT_DIR$/gonggao.html">  
497 - <provider selected="true" editor-type-id="text-editor">  
498 - <state relative-caret-position="108">  
499 - <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />  
500 - </state>  
501 - </provider>  
502 - </entry>  
503 - <entry file="file://$PROJECT_DIR$/css/gonggao.css">  
504 - <provider selected="true" editor-type-id="text-editor">  
505 - <state relative-caret-position="216">  
506 - <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />  
507 - </state>  
508 - </provider>  
509 - </entry>  
510 </component> 506 </component>
511 </project> 507 </project>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="top_anno"> 18 <div class="top_anno">
19 最新公告 19 最新公告
20 </div> 20 </div>
21 - <div class="top_text"> 21 + <div class="top_text" onclick="btn_gonggao()">
22 <p>通知通知通知通知通知通知通通知通知通知通知通知通知通 22 <p>通知通知通知通知通知通知通通知通知通知通知通知通知通
23 通知通知通知通知通知通知通通知通知通知通知通知通知通 23 通知通知通知通知通知通知通通知通知通知通知通知通知通
24 </p> 24 </p>
@@ -212,6 +212,9 @@ @@ -212,6 +212,9 @@
212 function btn_next() { 212 function btn_next() {
213 window.location.href = "last.html" 213 window.location.href = "last.html"
214 } 214 }
  215 + function btn_gonggao(){
  216 + window.location.href = "gonggao.html"
  217 + }
215 218
216 // JavaScript Document 219 // JavaScript Document
217 //上拉加载 220 //上拉加载