webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 9280486a72530abba756c84d9f76c9caf8aa03c2 1 个父辈 4d024201

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 53 行增加 和 53 行删除
... ... @@ -2,30 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" 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/fwcx_4.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwcx_4.css" 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/alxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/alxq.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpxq_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpxq_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/dtxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/dtxq.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwcx_4_1result.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4_1result.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwcx_4_2result.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4_2result.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwxc_4_3result_none.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwxc_4_3result_none.html" 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/jm_3.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jm_3.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/jpal.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jpal.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/lxwm_6.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_6.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/qqrz.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/qqrz.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/search_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/search_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/search_no_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/search_no_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/zxdt.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/zxdt.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -162,14 +139,14 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4234" />
<entry key="html" value="9385" />
<entry key="html" value="9456" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4234" />
<entry key="HTML" value="9386" />
<entry key="HTML" value="9457" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -246,11 +223,17 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="241" column="42" lean-forward="true" selection-start-line="241" selection-start-column="42" selection-end-line="241" selection-end-column="42" />
<state relative-caret-position="206">
<caret line="421" column="12" selection-start-line="421" selection-start-column="12" selection-end-line="421" selection-end-column="12" />
<folding>
<element signature="n#style#0;n#div#3;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="e#13943#14499#0" />
<element signature="e#14537#14689#0" />
</folding>
</state>
</provider>
</entry>
... ... @@ -258,17 +241,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="305" column="18" selection-start-line="305" selection-start-column="18" selection-end-line="305" selection-end-column="18" />
<state relative-caret-position="207">
<caret line="371" column="4" selection-start-line="371" selection-start-column="4" selection-end-line="371" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/lxwm_5.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="344" column="25" lean-forward="true" selection-start-line="344" selection-start-column="25" selection-end-line="344" selection-end-column="25" />
<state relative-caret-position="123">
<caret line="333" column="17" lean-forward="true" selection-start-line="333" selection-start-column="17" selection-end-line="333" selection-end-column="17" />
</state>
</provider>
</entry>
... ... @@ -328,9 +311,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>mid_</find>
<find>mid_company_banner_left</find>
<find>swiper-slide</find>
<find>margin</find>
<find>margin-left</find>
<find>pic4_banner_mid</find>
... ... @@ -357,7 +337,10 @@
<find>最新动态</find>
<find>select_color</find>
<find>input</find>
<find>.mid_opinion_textarea</find>
<find>iconfont</find>
<find>.mid_count_number</find>
<find>sanjiaoright</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -413,9 +396,9 @@
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/fwcx_4.html" />
<option value="$PROJECT_DIR$/css/fwcx_4.css" />
<option value="$PROJECT_DIR$/css/lxwm_5.css" />
<option value="$PROJECT_DIR$/html/fwcx_4.html" />
</list>
</option>
</component>
... ... @@ -426,9 +409,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="1033" />
<option name="width" value="904" />
<option name="height" value="1047" />
<option name="x" value="779" />
<option name="y" value="31" />
<option name="width" value="1348" />
<option name="height" value="941" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -539,18 +523,18 @@
<workItem from="1548748173198" duration="12444000" />
<workItem from="1548807911154" duration="1663000" />
<workItem from="1548894777879" duration="7107000" />
<workItem from="1548985599234" duration="14321000" />
<workItem from="1548985599234" duration="14995000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="321306000" />
<option name="totallyTimeSpent" value="321980000" />
</component>
<component name="ToolWindowManager">
<frame x="830" y="0" width="1107" height="1047" extended-state="0" />
<frame x="779" y="31" width="1348" height="941" 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.21983162" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.17938931" />
<window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -562,7 +546,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<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.3223684" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.14640199" />
<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" />
... ... @@ -966,24 +950,30 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<entry file="file://$PROJECT_DIR$/css/lxwm_5.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="241" column="42" lean-forward="true" selection-start-line="241" selection-start-column="42" selection-end-line="241" selection-end-column="42" />
<state relative-caret-position="123">
<caret line="333" column="17" lean-forward="true" selection-start-line="333" selection-start-column="17" selection-end-line="333" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="305" column="18" selection-start-line="305" selection-start-column="18" selection-end-line="305" selection-end-column="18" />
<state relative-caret-position="207">
<caret line="371" column="4" selection-start-line="371" selection-start-column="4" selection-end-line="371" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/lxwm_5.css">
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="344" column="25" lean-forward="true" selection-start-line="344" selection-start-column="25" selection-end-line="344" selection-end-column="25" />
<state relative-caret-position="206">
<caret line="421" column="12" selection-start-line="421" selection-start-column="12" selection-end-line="421" selection-end-column="12" />
<folding>
<element signature="n#style#0;n#div#3;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="e#13943#14499#0" />
<element signature="e#14537#14689#0" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -53,6 +53,11 @@
.select_color{
color: #666666;
}
.xiabiao{
color: #999999;
position: absolute;
right: 0.2rem;
}
</style>
</head>
<body>
... ... @@ -306,6 +311,8 @@
与油性漆相比水性漆的优缺点分别有哪些？
</div>
<div class="iconfont icon-sanjiaoright"></div>
<!--默认隐藏，当点击时触发-->
<div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
</div>
<!--点击下拉功能-->
... ... @@ -327,6 +334,8 @@
与油性漆相比水性漆的优缺点分别有哪些？
</div>
<div class="iconfont icon-sanjiaoright"></div>
<!--默认隐藏，当点击时触发-->
<div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
</div>
<!--点击下拉功能-->
... ... @@ -410,6 +419,7 @@
if($(".a_1").css('display')=='none'){
$('.a_1').css('display','flex');
}else{
$('.a_1').css('display','none');
}
... ...