Commit 99abdc334d73ff348b91d5f0b3085a3ab1bd41a5
1 parent
a257c2cb
update...
Showing
3 changed files
with
6 additions
and
4 deletions
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
| @@ -78,6 +78,7 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Lon | @@ -78,6 +78,7 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Lon | ||
| 78 | ccServiceSch.setZdzName(t.getEndStationName()); | 78 | ccServiceSch.setZdzName(t.getEndStationName()); |
| 79 | ccServiceSch.setFcsjActual(ccServiceSch.getDfsj()); | 79 | ccServiceSch.setFcsjActual(ccServiceSch.getDfsj()); |
| 80 | ccServiceSch.setZdsjActual(ccServiceSch.getZdsj()); | 80 | ccServiceSch.setZdsjActual(ccServiceSch.getZdsj()); |
| 81 | + ccServiceSch.setRemarks(t.getRemarks()); | ||
| 81 | if("1".equals(t.getType2())){ | 82 | if("1".equals(t.getType2())){ |
| 82 | ccServiceSch.setBcType("normal"); | 83 | ccServiceSch.setBcType("normal"); |
| 83 | } | 84 | } |
src/main/resources/static/pages/history_sch/edit/wrap.html
0 → 100644
src/main/resources/static/pages/summary/fast_and_slow/main.html
| @@ -91,18 +91,19 @@ | @@ -91,18 +91,19 @@ | ||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | .ct_rq_left{ | 93 | .ct_rq_left{ |
| 94 | - width: 200px; | 94 | + width: 130px; |
| 95 | display: inline-block; | 95 | display: inline-block; |
| 96 | vertical-align: top; | 96 | vertical-align: top; |
| 97 | height: calc(100% - 184px); | 97 | height: calc(100% - 184px); |
| 98 | position: fixed; | 98 | position: fixed; |
| 99 | left: 25px; | 99 | left: 25px; |
| 100 | + padding: 40px 15px; | ||
| 100 | } | 101 | } |
| 101 | 102 | ||
| 102 | .ct_right_tables{ | 103 | .ct_right_tables{ |
| 103 | width: calc(100% - 220px); | 104 | width: calc(100% - 220px); |
| 104 | display: inline-block; | 105 | display: inline-block; |
| 105 | - margin-left: 232px; | 106 | + margin-left: 152px; |
| 106 | padding: 25px; | 107 | padding: 25px; |
| 107 | margin-bottom: 18px; | 108 | margin-bottom: 18px; |
| 108 | } | 109 | } |
| @@ -117,7 +118,7 @@ | @@ -117,7 +118,7 @@ | ||
| 117 | width: 15px; | 118 | width: 15px; |
| 118 | border-top: 1px solid #1e87f0; | 119 | border-top: 1px solid #1e87f0; |
| 119 | z-index: 9; | 120 | z-index: 9; |
| 120 | - right: 60px; | 121 | + right: 40px; |
| 121 | top: 15px; | 122 | top: 15px; |
| 122 | } | 123 | } |
| 123 | .uk-nav-default>li.uk-active>a { | 124 | .uk-nav-default>li.uk-active>a { |
| @@ -126,7 +127,7 @@ | @@ -126,7 +127,7 @@ | ||
| 126 | } | 127 | } |
| 127 | 128 | ||
| 128 | .data_table_wrap{ | 129 | .data_table_wrap{ |
| 129 | - min-width: 1170px; | 130 | + min-width: 1070px; |
| 130 | } | 131 | } |
| 131 | 132 | ||
| 132 | .ct_right_tables table{ | 133 | .ct_right_tables table{ |