webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 fc308c1b72ab13ceee9738bcae8e420ab0af0a81 1 个父辈 008343cc

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 120 行增加 和 122 行删除
... ... @@ -2,16 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/css/lxwm_6.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/html/lxwm_6.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.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/lxwm_5.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/lxwm_5.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.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/lxwm_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_5.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -146,14 +138,14 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="3720" />
<entry key="css" value="3768" />
<entry key="html" value="8547" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="3720" />
<entry key="CSS" value="3768" />
<entry key="HTML" value="8548" />
<entry key="JavaScript" value="72" />
</counts>
... ... @@ -162,11 +154,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="227" lean-forward="true" selection-start-line="227" selection-end-line="227" />
<state relative-caret-position="303">
<caret line="210" column="20" lean-forward="true" selection-start-line="210" selection-start-column="20" selection-end-line="218" selection-end-column="26" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -175,6 +167,9 @@
<element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#2;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -202,17 +197,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="117">
<caret line="443" column="17" selection-start-line="443" selection-start-column="17" selection-end-line="443" selection-end-column="17" />
<state relative-caret-position="441">
<caret line="415" column="27" lean-forward="true" selection-start-line="415" selection-start-column="27" selection-end-line="415" selection-end-column="27" />
</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="297">
<caret line="339" selection-start-line="339" selection-end-line="339" />
<state relative-caret-position="378">
<caret line="14" column="47" lean-forward="true" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
<folding>
<element signature="e#1258#1304#0" />
<element signature="e#1323#1807#0" />
... ... @@ -267,8 +262,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4077">
<caret line="280" column="6" selection-start-line="280" selection-start-column="6" selection-end-line="280" selection-end-column="6" />
<state relative-caret-position="466">
<caret line="382" column="18" lean-forward="true" selection-start-line="382" selection-start-column="18" selection-end-line="382" selection-end-column="18" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -284,9 +279,8 @@
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#10249#10591#0" />
<element signature="e#10898#17058#0" />
<element signature="e#11143#11619#0" />
<element signature="e#11455#11461#0" />
<element signature="e#11586#17046#0" />
<element signature="e#11649#11975#0" />
</folding>
</state>
... ... @@ -440,15 +434,15 @@
<find>pic4_banner_mid</find>
<find>sw</find>
<find>banner</find>
<find>pic4</find>
<find>mid_map</find>
<find>bottom</find>
<find>pic4_banner</find>
<find>allmap</find>
<find>swiper</find>
<find>mid_company_banner</find>
<find>查看更多</find>
<find>mid_company_a</find>
<find>查看更多</find>
<find>swiper</find>
<find>pic4_banner</find>
<find>pic4</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -503,10 +497,10 @@
<option value="$PROJECT_DIR$/css/lxwm_6.css" />
<option value="$PROJECT_DIR$/css/lxwm_5.css" />
<option value="$PROJECT_DIR$/html/lxwm_5.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/index.css" />
</list>
</option>
</component>
... ... @@ -517,8 +511,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="787" />
<option name="y" value="83" />
<option name="x" value="261" />
<option name="y" value="47" />
<option name="width" value="1630" />
<option name="height" value="1100" />
</component>
... ... @@ -627,15 +621,15 @@
<workItem from="1548289565644" duration="30059000" />
<workItem from="1548376254799" duration="35479000" />
<workItem from="1548635475488" duration="30286000" />
<workItem from="1548722046541" duration="18550000" />
<workItem from="1548722046541" duration="20456000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="283783000" />
<option name="totallyTimeSpent" value="285689000" />
</component>
<component name="ToolWindowManager">
<frame x="637" y="80" width="1630" height="1100" extended-state="0" />
<frame x="261" y="47" width="1630" height="1100" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.13756281" />
... ... @@ -1067,33 +1061,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4077">
<caret line="280" column="6" selection-start-line="280" selection-start-column="6" selection-end-line="280" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#10249#10591#0" />
<element signature="e#10898#17058#0" />
<element signature="e#11455#11461#0" />
<element signature="e#11586#17046#0" />
<element signature="e#11649#11975#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/dtxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
... ... @@ -1106,13 +1073,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="443" column="17" selection-start-line="443" selection-start-column="17" selection-end-line="443" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lxwm_5.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6602">
... ... @@ -1157,10 +1117,79 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="266" column="18" lean-forward="true" selection-start-line="266" selection-start-column="18" selection-end-line="266" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="303">
<caret line="210" column="20" lean-forward="true" selection-start-line="210" selection-start-column="20" selection-end-line="218" selection-end-column="26" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#2;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#15787#15827#0" />
<element signature="e#18496#18549#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="415" column="27" lean-forward="true" selection-start-line="415" selection-start-column="27" selection-end-line="415" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="466">
<caret line="382" column="18" lean-forward="true" selection-start-line="382" selection-start-column="18" selection-end-line="382" selection-end-column="18" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#10249#10591#0" />
<element signature="e#11143#11619#0" />
<element signature="e#11455#11461#0" />
<element signature="e#11649#11975#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="339" selection-start-line="339" selection-end-line="339" />
<state relative-caret-position="378">
<caret line="14" column="47" lean-forward="true" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
<folding>
<element signature="e#1258#1304#0" />
<element signature="e#1323#1807#0" />
... ... @@ -1197,38 +1226,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="266" column="18" lean-forward="true" selection-start-line="266" selection-start-column="18" selection-end-line="266" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="227" lean-forward="true" selection-start-line="227" selection-end-line="227" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#15787#15827#0" />
<element signature="e#18496#18549#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -417,7 +417,8 @@
color: #ffffff;
/*filter: blur(0.02rem);*/
overflow-x: hidden;
background: url("../images/aicon_102.png");
background-size: cover;
}
.pic4_dynamic{
... ... @@ -438,8 +439,9 @@
width: 100%;
height: 4.2rem;
display: flex;
/*justify-content: space-between;*/
flex-flow: wrap;
align-items: center;
justify-content: space-between;
}
.pic4_banner_mid{
width: 3.1rem;
... ...
... ... @@ -332,27 +332,27 @@
<!--图片轮播-->
<div class="pic4_banner">
<div class="swiper-container2">
<div class="swiper-wrapper">
<div class="swiper-slide ">
<img src="../images/bicon_08@2x.png">
</div>
<!--<div class="swiper-container2">-->
<!--<div class="swiper-wrapper">-->
<!--<div class="swiper-slide ">-->
<!--<img src="../images/bicon_08@2x.png">-->
<!--</div>-->
</div>
</div>
<!--</div>-->
<!--</div>-->
<!--<div class="pic4_banner_left">-->
<!--<img src="../images/bicon_09@2x.png">-->
<!--</div>-->
<!--<div class="pic4_banner_mid">-->
<!--<img src="../images/bicon_08@2x.png">-->
<!--</div>-->
<!--<div class="pic4_banner_right">-->
<!--<img src="../images/bicon_09@2x.png">-->
<!--</div>-->
<div class="pic4_banner_left">
<img src="../images/bicon_09@2x.png">
</div>
<div class="pic4_banner_mid">
<img src="../images/bicon_08@2x.png">
</div>
<div class="pic4_banner_right">
<img src="../images/bicon_09@2x.png">
</div>
</div>
<!--查看更多-->
... ...