wms / wms_sichuanzhongmi · Commits

Commit 58512df5dd88926360ab3628667d4e734f40c9bf

Authored by 魏娟
1 parent 08a919ab

修改搜索样式bug

Inline Side-by-side
Showing 2 changed files with 52 additions and 55 deletions
.idea/workspace.xml
  View file @58512df
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
  4 + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="增加搜索框边距，两端对齐...">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6 <change beforePath="$PROJECT_DIR$/src/main/resources/static/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/style.css" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
8   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" afterDir="false" />
9 7 </list>
10 8 <ignored path="$PROJECT_DIR$/target/" />
11 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -43,8 +41,8 @@
43 41 <file pinned="false" current-in-tab="true">
44 42 <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
45 43 <provider selected="true" editor-type-id="text-editor">
46   - <state relative-caret-position="326">
47   - <caret line="3339" column="8" selection-start-line="3339" selection-start-column="8" selection-end-line="3339" selection-end-column="8" />
  44 + <state relative-caret-position="130">
  45 + <caret line="7448" column="6" selection-start-line="7448" selection-start-column="4" selection-end-line="7448" selection-end-column="33" />
48 46 </state>
49 47 </provider>
50 48 </entry>
... ... @@ -52,7 +50,7 @@
52 50 <file pinned="false" current-in-tab="false">
53 51 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
54 52 <provider selected="true" editor-type-id="text-editor">
55   - <state relative-caret-position="426">
  53 + <state relative-caret-position="2420">
56 54 <caret line="110" column="32" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
57 55 <folding>
58 56 <element signature="n#style#0;n#ul#0;n#div#0;n#li#0;n#ul#0;n#div#1;n#nav#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -81,12 +79,8 @@
81 79 <file pinned="false" current-in-tab="false">
82 80 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
83 81 <provider selected="true" editor-type-id="text-editor">
84   - <state relative-caret-position="344">
85   - <caret line="81" column="56" selection-start-line="81" selection-start-column="56" selection-end-line="81" selection-end-column="56" />
86   - <folding>
87   - <element signature="n#li#17;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
88   - <element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
89   - </folding>
  82 + <state relative-caret-position="1980">
  83 + <caret line="90" column="56" selection-start-line="90" selection-start-column="56" selection-end-line="90" selection-end-column="56" />
90 84 </state>
91 85 </provider>
92 86 </entry>
... ... @@ -99,7 +93,7 @@
99 93 <file pinned="false" current-in-tab="false">
100 94 <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
101 95 <provider selected="true" editor-type-id="text-editor">
102   - <state relative-caret-position="-9525">
  96 + <state relative-caret-position="13992">
103 97 <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
104 98 </state>
105 99 </provider>
... ... @@ -269,6 +263,11 @@
269 263 <path>
270 264 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
271 265 <item name="wms2" type="462c0819:PsiDirectoryNode" />
  266 + <item name=".idea" type="462c0819:PsiDirectoryNode" />
  267 + </path>
  268 + <path>
  269 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  270 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
272 271 <item name="src" type="462c0819:PsiDirectoryNode" />
273 272 </path>
274 273 <path>
... ... @@ -489,6 +488,8 @@
489 488 <workItem from="1594341144169" duration="826000" />
490 489 <workItem from="1594775914845" duration="1878000" />
491 490 <workItem from="1594948791275" duration="6675000" />
  491 + <workItem from="1594971304528" duration="1570000" />
  492 + <workItem from="1594973288945" duration="72000" />
492 493 </task>
493 494 <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
494 495 <created>1565226427512</created>
... ... @@ -529,7 +530,7 @@
529 530 <servers />
530 531 </component>
531 532 <component name="TimeTrackingManager">
532   - <option name="totallyTimeSpent" value="173124000" />
  533 + <option name="totallyTimeSpent" value="174891000" />
533 534 </component>
534 535 <component name="TodoView">
535 536 <todo-panel id="selected-file">
... ... @@ -544,7 +545,7 @@
544 545 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
545 546 <editor active="true" />
546 547 <layout>
547   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.26066098" />
  548 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.26599148" />
548 549 <window_info id="Structure" order="1" sideWeight="0.5011442" side_tool="true" weight="0.27680966" />
549 550 <window_info id="Designer" order="2" />
550 551 <window_info id="Image Layers" order="3" />
... ... @@ -565,7 +566,7 @@
565 566 <window_info anchor="bottom" id="Statistic" order="10" />
566 567 <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.32952926" />
567 568 <window_info anchor="bottom" id="Database Changes" order="12" />
568   - <window_info anchor="bottom" id="Version Control" order="13" weight="0.13867822" />
  569 + <window_info anchor="bottom" id="Version Control" order="13" weight="0.24186552" />
569 570 <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49865952" weight="0.32952926" />
570 571 <window_info anchor="bottom" id="Docker" order="15" show_stripe_button="false" />
571 572 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
... ... @@ -999,71 +1000,67 @@
999 1000 </state>
1000 1001 </provider>
1001 1002 </entry>
1002   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
1003   - <provider selected="true" editor-type-id="text-editor" />
1004   - </entry>
1005   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
  1003 + <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
1006 1004 <provider selected="true" editor-type-id="text-editor">
1007   - <state relative-caret-position="2354">
1008   - <caret line="107" column="35" selection-start-line="107" selection-start-column="35" selection-end-line="107" selection-end-column="35" />
  1005 + <state relative-caret-position="225">
  1006 + <caret line="165" column="4" lean-forward="true" selection-start-line="165" selection-start-column="4" selection-end-line="167" selection-end-column="16" />
1009 1007 </state>
1010 1008 </provider>
1011 1009 </entry>
1012   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
  1010 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
1013 1011 <provider selected="true" editor-type-id="text-editor" />
1014 1012 </entry>
1015   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
  1013 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
1016 1014 <provider selected="true" editor-type-id="text-editor">
1017   - <state relative-caret-position="77990">
1018   - <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
  1015 + <state relative-caret-position="2420">
  1016 + <caret line="110" column="32" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
  1017 + <folding>
  1018 + <element signature="n#style#0;n#ul#0;n#div#0;n#li#0;n#ul#0;n#div#1;n#nav#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1019 + <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1020 + <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1021 + <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#4;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1022 + </folding>
1019 1023 </state>
1020 1024 </provider>
1021 1025 </entry>
1022   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
  1026 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
  1027 + <provider selected="true" editor-type-id="text-editor" />
  1028 + </entry>
  1029 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
1023 1030 <provider selected="true" editor-type-id="text-editor">
1024   - <state relative-caret-position="-9525">
1025   - <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
  1031 + <state relative-caret-position="2354">
  1032 + <caret line="107" column="35" selection-start-line="107" selection-start-column="35" selection-end-line="107" selection-end-column="35" />
1026 1033 </state>
1027 1034 </provider>
1028 1035 </entry>
1029 1036 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
1030 1037 <provider selected="true" editor-type-id="text-editor">
1031   - <state relative-caret-position="344">
1032   - <caret line="81" column="56" selection-start-line="81" selection-start-column="56" selection-end-line="81" selection-end-column="56" />
1033   - <folding>
1034   - <element signature="n#li#17;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1035   - <element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1036   - </folding>
  1038 + <state relative-caret-position="1980">
  1039 + <caret line="90" column="56" selection-start-line="90" selection-start-column="56" selection-end-line="90" selection-end-column="56" />
1037 1040 </state>
1038 1041 </provider>
1039 1042 </entry>
1040   - <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
  1043 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
  1044 + <provider selected="true" editor-type-id="text-editor" />
  1045 + </entry>
  1046 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
1041 1047 <provider selected="true" editor-type-id="text-editor">
1042   - <state relative-caret-position="225">
1043   - <caret line="165" column="4" lean-forward="true" selection-start-line="165" selection-start-column="4" selection-end-line="167" selection-end-column="16" />
  1048 + <state relative-caret-position="13992">
  1049 + <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
1044 1050 </state>
1045 1051 </provider>
1046 1052 </entry>
1047   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
1048   - <provider selected="true" editor-type-id="text-editor" />
1049   - </entry>
1050   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
  1053 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
1051 1054 <provider selected="true" editor-type-id="text-editor">
1052   - <state relative-caret-position="426">
1053   - <caret line="110" column="32" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
1054   - <folding>
1055   - <element signature="n#style#0;n#ul#0;n#div#0;n#li#0;n#ul#0;n#div#1;n#nav#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1056   - <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1057   - <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1058   - <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#4;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1059   - </folding>
  1055 + <state relative-caret-position="77990">
  1056 + <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
1060 1057 </state>
1061 1058 </provider>
1062 1059 </entry>
1063 1060 <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
1064 1061 <provider selected="true" editor-type-id="text-editor">
1065   - <state relative-caret-position="326">
1066   - <caret line="3339" column="8" selection-start-line="3339" selection-start-column="8" selection-end-line="3339" selection-end-column="8" />
  1062 + <state relative-caret-position="130">
  1063 + <caret line="7448" column="6" selection-start-line="7448" selection-start-column="4" selection-end-line="7448" selection-end-column="33" />
1067 1064 </state>
1068 1065 </provider>
1069 1066 </entry>
... ...
src/main/resources/static/css/style.css
  View file @58512df
... ... @@ -7446,10 +7446,10 @@ body.skin-yellow {
7446 7446  
7447 7447 .boxdown{
7448 7448 cursor:pointer;
7449   - border:1px solid #EEEEEE;
  7449 + /*border:1px solid #EEEEEE;*/
7450 7450 width:60px;
7451 7451 height:14px;
7452   - background: #FFFFFF url(static/img/down.png) no-repeat 20px;
  7452 + background: #FFFFFF url(../img/down.png) no-repeat 20px;
7453 7453 margin-left:150px;
7454 7454 margin-top:-2px;
7455 7455 border-top: none;
... ... @@ -7461,7 +7461,7 @@ body.skin-yellow {
7461 7461 border:1px solid #EEEEEE;
7462 7462 width:60px;
7463 7463 height:14px;
7464   - background: #FFFFFF url(static/img/up.png) no-repeat 20px;
  7464 + background: #FFFFFF url(../img/up.png) no-repeat 20px;
7465 7465 margin-left:150px;
7466 7466 margin-top:-2px;
7467 7467 border-top: none;
... ...